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

Delete cyclemap

Browse source
This commit is contained in:
Victor Shcherb 2019-01-18 18:17:03 +01:00
parent e494048860
commit 403fc0403a
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
View file

@ -561,6 +561,9 @@ public class BinaryMapIndexReader {
|| index.bottom < req.top) { || index.bottom < req.top) {
continue; continue;
} }
if (req.stringTable != null) {
req.stringTable.clear();
}
codedIS.seek(index.stopsFileOffset); codedIS.seek(index.stopsFileOffset);
int oldLimit = codedIS.pushLimit(index.stopsFileLength); int oldLimit = codedIS.pushLimit(index.stopsFileLength);
int offset = req.searchResults.size(); int offset = req.searchResults.size();
@ -2074,14 +2077,14 @@ public class BinaryMapIndexReader {
private static boolean testAddressSearch = false; private static boolean testAddressSearch = false;
private static boolean testAddressSearchName = false; private static boolean testAddressSearchName = false;
private static boolean testAddressJustifySearch = false; private static boolean testAddressJustifySearch = false;
private static boolean testPoiSearch = true; private static boolean testPoiSearch = false;
private static boolean testPoiSearchOnPath = false; private static boolean testPoiSearchOnPath = false;
private static boolean testTransportSearch = true; private static boolean testTransportSearch = true;
private static int sleft = MapUtils.get31TileNumberX(4.7495); private static int sleft = MapUtils.get31TileNumberX(27.55079);
private static int sright = MapUtils.get31TileNumberX(4.8608); private static int sright = MapUtils.get31TileNumberX(27.55317);
private static int stop = MapUtils.get31TileNumberY(52.3395); private static int stop = MapUtils.get31TileNumberY(53.89378);
private static int sbottom = MapUtils.get31TileNumberY(52.2589); private static int sbottom = MapUtils.get31TileNumberY(53.89276);
private static int szoom = 15; private static int szoom = 15;
private static void println(String s) { private static void println(String s) {
@ -2090,7 +2093,7 @@ public class BinaryMapIndexReader {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
File fl = new File(System.getProperty("maps") + "/Synthetic_test_rendering.obf"); File fl = new File(System.getProperty("maps") + "/Synthetic_test_rendering.obf");
fl = new File(System.getProperty("maps") + "/Map.obf"); fl = new File(System.getProperty("maps") + "/Belarus_europe_2.obf");
RandomAccessFile raf = new RandomAccessFile(fl, "r"); RandomAccessFile raf = new RandomAccessFile(fl, "r");
@ -2280,6 +2283,9 @@ public class BinaryMapIndexReader {
println(" " + route.getRef() + " " + route.getName() + " " + route.getDistance() + " " println(" " + route.getRef() + " " + route.getName() + " " + route.getDistance() + " "
+ route.getAvgBothDistance()); + route.getAvgBothDistance());
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
if(route.getForwardWays() == null) {
continue;
}
for(Way w : route.getForwardWays()) { for(Way w : route.getForwardWays()) {
b.append(w.getNodes()).append(" "); b.append(w.getNodes()).append(" ");
} }

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

@ -472,7 +472,7 @@ public class BinaryMapTransportReaderAdapter {
Iterator<Map.Entry<String, String>> it = namesMap.entrySet().iterator(); Iterator<Map.Entry<String, String>> it = namesMap.entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry<String, String> e = it.next(); Map.Entry<String, String> e = it.next();
s.setName(stringTable.get(e.getKey().charAt(0)),stringTable.get(e.getValue().charAt(0))); s.setName(stringTable.get(e.getKey().charAt(0)), stringTable.get(e.getValue().charAt(0)));
} }
} }

4
OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java
View file

@ -435,7 +435,6 @@ public class TileSourceManager {
public static java.util.List<TileSourceTemplate> getKnownSourceTemplates() { public static java.util.List<TileSourceTemplate> getKnownSourceTemplates() {
java.util.List<TileSourceTemplate> list = new ArrayList<TileSourceTemplate>(); java.util.List<TileSourceTemplate> list = new ArrayList<TileSourceTemplate>();
list.add(getMapnikSource()); list.add(getMapnikSource());
list.add(getCycleMapSource());
list.add(getMapillaryRasterSource()); list.add(getMapillaryRasterSource());
list.add(getMapillaryVectorSource()); list.add(getMapillaryVectorSource());
return list; return list;
@ -445,9 +444,6 @@ public class TileSourceManager {
return MAPNIK_SOURCE; return MAPNIK_SOURCE;
} }
public static TileSourceTemplate getCycleMapSource(){
return CYCLE_MAP_SOURCE;
}
public static TileSourceTemplate getMapillaryRasterSource() { public static TileSourceTemplate getMapillaryRasterSource() {
return MAPILLARY_RASTER_SOURCE; return MAPILLARY_RASTER_SOURCE;