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

Fix atm amenity

Browse source
This commit is contained in:
Victor Shcherb 2016-08-12 22:54:33 +02:00
parent 43cee4239f
commit b73e912e23
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -71,15 +71,15 @@ public class BinaryInspector {
// test cases show info // test cases show info
if ("test".equals(args[0])) { if ("test".equals(args[0])) {
in.inspector(new String[]{ in.inspector(new String[]{
// "-vpoi", "-vpoi",
// "-vmap", "-vmapobjects", // "-vmapcoordinates", // "-vmap", "-vmapobjects", // "-vmapcoordinates",
// "-vrouting", "-vrouting",
// "-vaddress", "-vcities","-vstreetgroups", // "-vaddress", "-vcities","-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections", // "-vstreets", "-vbuildings", "-vintersections",
// "-lang=ru", // "-lang=ru",
// "-bbox=4.8486,52.3084,4.8747,52.2970", // "-bbox=4.8486,52.3084,4.8747,52.2970",
// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm", // "-osm="+System.getProperty("maps.dir")+"/map.obf.osm",
System.getProperty("maps.dir")+"/Gb_england_europe_simple.obf" System.getProperty("maps.dir")+"/Map.obf"
}); });
} else { } else {
in.inspector(args); in.inspector(args);

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

@ -575,10 +575,10 @@ public class MapPoiTypes {
if (!p.isReference()) { if (!p.isReference()) {
String key = null; String key = null;
if (p.isAdditional()) { if (p.isAdditional()) {
key = p.isText() ? p.getOsmTag() : key = p.isText() ? p.getRawOsmTag() :
(p.getOsmTag() + "/" + p.getOsmValue()); (p.getRawOsmTag() + "/" + p.getOsmValue());
} else { } else {
key = p.getOsmTag() + "/" + p.getOsmValue(); key = p.getRawOsmTag() + "/" + p.getOsmValue();
} }
if (poiTypesByTag.containsKey(key)) { if (poiTypesByTag.containsKey(key)) {
throw new UnsupportedOperationException("!! Duplicate poi type " + key); throw new UnsupportedOperationException("!! Duplicate poi type " + key);

7
OsmAnd-java/src/net/osmand/osm/PoiType.java
View file

@ -48,6 +48,13 @@ public class PoiType extends AbstractPoiType {
return osmTag; return osmTag;
} }
public String getRawOsmTag() {
if(isReference()) {
return referenceType.getOsmTag();
}
return osmTag;
}
public void setOsmTag(String osmTag) { public void setOsmTag(String osmTag) {
this.osmTag = osmTag; this.osmTag = osmTag;
} }