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

Refactor

Browse source
This commit is contained in:
Victor Shcherb 2015-07-10 08:36:33 +02:00
parent 918c4dae85
commit f42b66aeb4
3 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ public class BinaryInspector {
// "-zoom=16",
// "-bbox=1.74,51.17,1.75,51.16",
// "-vstats",
"/Users/victorshcherb/osmand/osm-gen/Andorra-latest.obf"
"/Users/victorshcherb/osmand/osm-gen/Synthetic_test_rendering.obf"
});
} else {
in.inspector(args);

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

@ -162,7 +162,7 @@ public class MapPoiTypes {
addIf(tm, pt, matcher);
}
for (PoiType pt : pc.getPoiTypes()) {
if (pt.isReference()) {
if (pt.isReference() || pt.isNameOnly()) {
continue;
}
addIf(tm, pt, matcher);
@ -383,7 +383,6 @@ public class MapPoiTypes {
tp.setText("text".equals(parser.getAttributeValue("", "type")));
tp.setNameOnly("true".equals(parser.getAttributeValue("", "name_only")));
tp.setRelation("true".equals(parser.getAttributeValue("", "relation")));
tp.setMap("true".equals(parser.getAttributeValue("", "map")));
if (lastFilter != null) {
lastFilter.addPoiType(tp);
}
@ -549,7 +548,7 @@ public class MapPoiTypes {
return null;
}
}
if(pt.isMap()) {
if(pt.getCategory() == getOtherMapCategory()) {
return null;
}
if(!hasName && pt.isNameOnly()) {

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

@ -14,7 +14,6 @@ public class PoiType extends AbstractPoiType {
private String osmValue2;
private boolean text;
private boolean map;
private boolean nameOnly;
private boolean relation;
@ -120,16 +119,6 @@ public class PoiType extends AbstractPoiType {
this.text = text;
}
public boolean isMap() {
return map;
}
public void setMap(boolean map) {
this.map = map;
}
public boolean isNameOnly() {
return nameOnly;
}