Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2018-03-01 19:04:03 +01:00
commit 652d5a0d41
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="rendering_attr_whiteWaterSports_name">Whitewater sports</string>
<string name="distance_farthest">Distance: farthest first</string> <string name="distance_farthest">Distance: farthest first</string>
<string name="distance_nearest">Distance: nearest first</string> <string name="distance_nearest">Distance: nearest first</string>
<string name="enter_lon">Enter longitude</string> <string name="enter_lon">Enter longitude</string>

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
View file

@ -334,7 +334,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
String key = e.getKey(); String key = e.getKey();
String vl = e.getValue(); String vl = e.getValue();
if (key.equals("image") || key.equals("mapillary")) { if (key.equals("image") || key.equals("mapillary") || key.equals("subway_region")) {
continue; continue;
} }

15
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AmenityMenuController.java
View file

@ -1,5 +1,7 @@
package net.osmand.plus.mapcontextmenu.controllers; package net.osmand.plus.mapcontextmenu.controllers;
import android.graphics.drawable.Drawable;
import net.osmand.data.Amenity; import net.osmand.data.Amenity;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
@ -29,6 +31,7 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map;
public class AmenityMenuController extends MenuController { public class AmenityMenuController extends MenuController {
@ -185,6 +188,18 @@ public class AmenityMenuController extends MenuController {
} }
} }
@Override
public Drawable getRightIcon() {
Map<String, String> addTypes = amenity.getAdditionalInfo();
if (addTypes != null) {
String region = addTypes.get("subway_region");
if (region != null) {
return RenderingIcons.getBigIcon(getMapActivity(), "subway_" + region);
}
}
return null;
}
private void processTransportStop() { private void processTransportStop() {
routes = new ArrayList<>(); routes = new ArrayList<>();
List<TransportIndexRepository> reps = getMapActivity().getMyApplication() List<TransportIndexRepository> reps = getMapActivity().getMyApplication()