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

Fix #5596

Browse source
This commit is contained in:
Alex Sytnyk 2018-07-25 12:13:40 +03:00
parent 1a5ea2448f
commit 55f01adf59
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,6 +344,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
AmenityInfoRow cuisineRow = null; AmenityInfoRow cuisineRow = null;
List<PoiType> collectedPoiTypes = new ArrayList<>(); List<PoiType> collectedPoiTypes = new ArrayList<>();
boolean osmEditingEnabled = OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class) != null;
for (Map.Entry<String, String> e : amenity.getAdditionalInfo().entrySet()) { for (Map.Entry<String, String> e : amenity.getAdditionalInfo().entrySet()) {
int iconId = 0; int iconId = 0;
Drawable icon = null; Drawable icon = null;
@ -351,7 +353,10 @@ 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") || key.equals("subway_region")) { if (key.equals("image")
|| key.equals("mapillary")
|| key.equals("subway_region")
|| (key.equals("note") && !osmEditingEnabled)) {
continue; continue;
} }
@ -632,7 +637,6 @@ public class AmenityMenuBuilder extends MenuBuilder {
buildAmenityRow(view, wikiInfo); buildAmenityRow(view, wikiInfo);
} }
boolean osmEditingEnabled = OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class) != null;
if (osmEditingEnabled && amenity.getId() != null if (osmEditingEnabled && amenity.getId() != null
&& amenity.getId() > 0 && && amenity.getId() > 0 &&
(amenity.getId() % 2 == 0 || (amenity.getId() >> 1) < Integer.MAX_VALUE)) { (amenity.getId() % 2 == 0 || (amenity.getId() >> 1) < Integer.MAX_VALUE)) {