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

Fix creation of old maps

Browse source
This commit is contained in:
vshcherb 2013-11-24 17:36:38 +01:00
parent 6ff89eff04
commit 105beb6976
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,10 +54,11 @@ public class BinaryInspector {
BinaryInspector in = new BinaryInspector();
in.inspector(args);
// test cases show info
in.inspector(new String[]{"-vpoi",/*"-vmap", "-vmapobjects", *//*"-vstreets", "-bbox=14.4,50.1,14.5,50.01", */"/home/victor/projects/osmand/osm-gen/Map.obf"});
// test case extract parts
// test case
/*in.inspector(new String[]{
//"-vpoi",
"-vmap", "-vmapobjects",
//"-vstreets", "-bbox=14.4,50.1,14.5,50.01",
"/home/victor/projects/osmand/osm-gen/Map.obf"});*/
}
private void printToFile(String s) throws IOException {

14
OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
View file

@ -169,12 +169,16 @@ public class MapRenderingTypes {
}
public MapRulType getAmenityRuleType(String tag, String val) {
return getRuleType(tag, val, true);
}
protected MapRulType getRuleType(String tag, String val, boolean poi) {
Map<String, MapRulType> types = getEncodingRuleTypes();
MapRulType rType = types.get(constructRuleKey(tag, val));
if (rType == null || !rType.isPOI()) {
if (rType == null || (!rType.isPOI() && poi) || (!rType.isMap() && !poi)) {
rType = types.get(constructRuleKey(tag, null));
}
if(rType == null || !rType.isPOI()) {
if(rType == null || (!rType.isPOI() && poi) || (!rType.isMap() && !poi)) {
return null;
} else if(rType.isAdditional() && rType.tagValuePattern.value == null) {
MapRulType parent = rType;
@ -186,6 +190,8 @@ public class MapRenderingTypes {
rType.onlyPoint = parent.onlyPoint;
rType.poiSpecified = parent.poiSpecified;
rType.poiCategory = parent.poiCategory;
rType.poiPrefix = parent.poiPrefix;
rType.namePrefix = parent.namePrefix;
registerRuleType(rType);
}
return rType;
@ -604,6 +610,8 @@ public class MapRenderingTypes {
public static MapRulType createText(String tag) {
MapRulType rt = new MapRulType();
rt.additionalText = true;
rt.minzoom = 5;
rt.maxzoom = 31;
rt.tagValuePattern = new TagValuePattern(tag, null);
return rt;
}
@ -611,6 +619,8 @@ public class MapRenderingTypes {
public static MapRulType createAdditional(String tag, String value) {
MapRulType rt = new MapRulType();
rt.additional = true;
rt.minzoom = 5;
rt.maxzoom = 31;
rt.tagValuePattern = new TagValuePattern(tag, value);
return rt;
}