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 2015-11-07 23:16:04 +01:00
commit bd385da94e
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
View file

@ -545,8 +545,6 @@ public class MapPoiTypes {
public Amenity parseAmenity(String tag, String val, boolean relation, Map<String, String> otherTags) { public Amenity parseAmenity(String tag, String val, boolean relation, Map<String, String> otherTags) {
initPoiTypesByTag(); initPoiTypesByTag();
PoiType pt = poiTypesByTag.get(tag+"/"+val); PoiType pt = poiTypesByTag.get(tag+"/"+val);
if(pt == null) { if(pt == null) {
@ -586,7 +584,7 @@ public class MapPoiTypes {
while(it.hasNext()) { while(it.hasNext()) {
Entry<String, String> e = it.next(); Entry<String, String> e = it.next();
String otag = e.getKey(); String otag = e.getKey();
if(!otag.equals(tag)) { if(!otag.equals(tag) && !otag.equals("name")) {
PoiType pat = poiTypesByTag.get(otag+"/"+e.getValue()); PoiType pat = poiTypesByTag.get(otag+"/"+e.getValue());
if(pat == null) { if(pat == null) {
pat = poiTypesByTag.get(otag); pat = poiTypesByTag.get(otag);