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

Add street to base index

Browse source
This commit is contained in:
Victor Shcherb 2012-10-10 00:48:42 +02:00
parent 3d2e7afaf4
commit 305bf099b9
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
DataExtractionOSM/src/net/osmand/data/preparation/IndexRouteCreator.java
View file

@ -4,7 +4,6 @@ import gnu.trove.TIntCollection;
import gnu.trove.iterator.TIntIterator; import gnu.trove.iterator.TIntIterator;
import gnu.trove.list.array.TIntArrayList; import gnu.trove.list.array.TIntArrayList;
import gnu.trove.list.array.TLongArrayList; import gnu.trove.list.array.TLongArrayList;
import gnu.trove.map.hash.TIntObjectHashMap;
import gnu.trove.map.hash.TLongObjectHashMap; import gnu.trove.map.hash.TLongObjectHashMap;
import gnu.trove.set.hash.TIntHashSet; import gnu.trove.set.hash.TIntHashSet;
import gnu.trove.set.hash.TLongHashSet; import gnu.trove.set.hash.TLongHashSet;
@ -1009,6 +1008,17 @@ public class IndexRouteCreator extends AbstractIndexPartCreator {
return true; return true;
} }
private void mergeName(MapRouteType rt, GeneralizedWay from, GeneralizedWay to){
String rf = from.names.get(rt);
String rf2 = to.names.get(rt);
if(rf != null && rf2 != null && !rf.equals(rf2)){
to.names.remove(rt);
} else if(rf != null) {
to.names.put(rt, from.names.get(rt));
}
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private GeneralizedWay selectBestWay(GeneralizedCluster cluster, GeneralizedWay gw, int ind) { private GeneralizedWay selectBestWay(GeneralizedCluster cluster, GeneralizedWay gw, int ind) {
long loc = gw.getLocation(ind); long loc = gw.getLocation(ind);
@ -1062,7 +1072,15 @@ public class IndexRouteCreator extends AbstractIndexPartCreator {
cluster.replaceWayFromLocation(prev, i, gw); cluster.replaceWayFromLocation(prev, i, gw);
} }
gw.addtypes.addAll(prev.addtypes); gw.addtypes.addAll(prev.addtypes);
gw.names.putAll(prev.names); for(MapRouteType rt : new ArrayList<MapRouteType>(gw.names.keySet())) {
mergeName(rt, prev, gw);
}
for(MapRouteType rt : new ArrayList<MapRouteType>(prev.names.keySet())) {
if(!gw.names.containsKey(rt)){
mergeName(rt, prev, gw);
}
}
TIntArrayList ax = first? prev.px : gw.px; TIntArrayList ax = first? prev.px : gw.px;
TIntArrayList ay = first? prev.py : gw.py; TIntArrayList ay = first? prev.py : gw.py;
TIntArrayList bx = !first? prev.px : gw.px; TIntArrayList bx = !first? prev.px : gw.px;

1
DataExtractionOSM/src/net/osmand/osm/MapRoutingTypes.java
View file

@ -29,6 +29,7 @@ public class MapRoutingTypes {
TAGS_TO_ACCEPT.add("route"); TAGS_TO_ACCEPT.add("route");
BASE_TAGS_TEXT.add("int_ref"); BASE_TAGS_TEXT.add("int_ref");
BASE_TAGS_TEXT.add("name");
BASE_TAGS_TEXT.add("ref"); BASE_TAGS_TEXT.add("ref");
BASE_TAGS_TO_SAVE.add("toll"); BASE_TAGS_TO_SAVE.add("toll");