From 6c80487bfe3c7804bdb2008b45fc4c3c53b562bf Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 2 May 2015 20:37:56 +0200 Subject: [PATCH] Fix poi display with track --- .../osmand/binary/BinaryMapIndexReader.java | 46 +++++++++++-------- .../binary/BinaryMapPoiReaderAdapter.java | 8 ++-- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java index 37b64ce3a2..73d1fd2dbc 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java @@ -4,6 +4,7 @@ package net.osmand.binary; import gnu.trove.list.array.TIntArrayList; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.TIntObjectHashMap; +import gnu.trove.map.hash.TLongObjectHashMap; import gnu.trove.set.hash.TIntHashSet; import java.io.BufferedInputStream; @@ -1419,7 +1420,7 @@ public class BinaryMapIndexReader { SearchPoiTypeFilter poiTypeFilter, ResultMatcher resultMatcher) { SearchRequest request = new SearchRequest(); float coeff = (float) (radius / MapUtils.getTileDistanceWidth(SearchRequest.ZOOM_TO_SEARCH_POI)); - TIntObjectHashMap> zooms = new TIntObjectHashMap>(); + TLongObjectHashMap> zooms = new TLongObjectHashMap>(); for(int i = 1; i < route.size(); i++) { Location cr = route.get(i); Location pr = route.get(i - 1); @@ -1433,7 +1434,7 @@ public class BinaryMapIndexReader { double bottomRightY = Math.max(ty, py) + coeff; for(int x = (int) topLeftX; x <= bottomRightX; x++) { for(int y = (int) topLeftY; y <= bottomRightY; y++) { - int hash = (x << SearchRequest.ZOOM_TO_SEARCH_POI) + y; + long hash = (((long)x) << SearchRequest.ZOOM_TO_SEARCH_POI) + y; if(!zooms.containsKey(hash)) { zooms.put(hash, new LinkedList()); } @@ -1444,14 +1445,14 @@ public class BinaryMapIndexReader { } } - int sleft = 0, sright = Integer.MAX_VALUE, stop = 0, sbottom = Integer.MAX_VALUE; - for(int vl : zooms.keys()) { - int x = (vl >> SearchRequest.ZOOM_TO_SEARCH_POI) << (31 - SearchRequest.ZOOM_TO_SEARCH_POI); - int y = (vl & ((1 << SearchRequest.ZOOM_TO_SEARCH_POI) -1)) << (31 - SearchRequest.ZOOM_TO_SEARCH_POI); - sleft = Math.min(x, sleft); - stop = Math.min(y, stop); - sbottom = Math.max(y, sbottom); - sright = Math.max(x, sright); + int sleft = Integer.MAX_VALUE , sright = 0, stop = Integer.MAX_VALUE, sbottom = 0; + for(long vl : zooms.keys()) { + long x = (vl >> SearchRequest.ZOOM_TO_SEARCH_POI) << (31 - SearchRequest.ZOOM_TO_SEARCH_POI); + long y = (vl & ((1 << SearchRequest.ZOOM_TO_SEARCH_POI) -1)) << (31 - SearchRequest.ZOOM_TO_SEARCH_POI); + sleft = (int) Math.min(x, sleft); + stop = (int) Math.min(y, stop); + sbottom = (int) Math.max(y, sbottom); + sright = (int) Math.max(x, sright); } request.radius = radius; request.left = sleft; @@ -1601,7 +1602,7 @@ public class BinaryMapIndexReader { // search on the path // stores tile of 16 index and pairs (even length always) of points intersecting tile - TIntObjectHashMap> tiles = null; + TLongObjectHashMap> tiles = null; double radius = -1; @@ -1631,9 +1632,9 @@ public class BinaryMapIndexReader { protected SearchRequest(){ } - public int getTileHashOnPath(double lat, double lon) { - int x = (int) MapUtils.getTileNumberX(SearchRequest.ZOOM_TO_SEARCH_POI, lon); - int y = (int) MapUtils.getTileNumberY(SearchRequest.ZOOM_TO_SEARCH_POI, lat); + public long getTileHashOnPath(double lat, double lon) { + long x = (int) MapUtils.getTileNumberX(SearchRequest.ZOOM_TO_SEARCH_POI, lon); + long y = (int) MapUtils.getTileNumberY(SearchRequest.ZOOM_TO_SEARCH_POI, lat); return (x << SearchRequest.ZOOM_TO_SEARCH_POI) | y; } @@ -1940,6 +1941,7 @@ public class BinaryMapIndexReader { private static boolean testMapSearch = false; private static boolean testAddressSearch = false; private static boolean testPoiSearch = false; + private static boolean testPoiSearchOnPath = true; private static boolean testTransportSearch = false; private static int sleft = MapUtils.get31TileNumberX(6.3); private static int sright = MapUtils.get31TileNumberX(6.5); @@ -1952,7 +1954,7 @@ public class BinaryMapIndexReader { } public static void main(String[] args) throws IOException { - RandomAccessFile raf = new RandomAccessFile("", "r"); + RandomAccessFile raf = new RandomAccessFile("/Users/victorshcherb/osmand/maps/Netherlands_europe_2.obf", "r"); BinaryMapIndexReader reader = new BinaryMapIndexReader(raf); println("VERSION " + reader.getVersion()); //$NON-NLS-1$ @@ -1969,11 +1971,15 @@ public class BinaryMapIndexReader { testTransportSearch(reader); } - if (testPoiSearch) { + if (testPoiSearch || testPoiSearchOnPath) { PoiRegion poiRegion = reader.getPoiIndexes().get(0); - testPoiSearch(reader, poiRegion); - testPoiSearchByName(reader); - testSearchOnthePath(reader); + if(testPoiSearch) { + testPoiSearch(reader, poiRegion); + testPoiSearchByName(reader); + } + if(testPoiSearchOnPath) { + testSearchOnthePath(reader); + } } println("MEMORY " + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())); //$NON-NLS-1$ @@ -1986,7 +1992,7 @@ public class BinaryMapIndexReader { long now = System.currentTimeMillis(); println("Searching poi on the path..."); final List locations = readGPX(new File( - "")); + "/Users/victorshcherb/osmand/maps/2015-03-07_19-07_Sat.gpx")); SearchRequest req = buildSearchPoiRequest(locations, radius, new SearchPoiTypeFilter() { @Override public boolean accept(PoiCategory type, String subcategory) { diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java b/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java index a9b482b9ec..3e70018ccb 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java @@ -324,7 +324,7 @@ public class BinaryMapPoiReaderAdapter { LOG.info("Searched poi structure in "+(System.currentTimeMillis() - time) + - "ms. Found " + offKeys.length +" subtress"); + "ms. Found " + offKeys.length +" subtrees"); for (int j = 0; j < offKeys.length; j++) { codedIS.seek(offKeys[j] + indexOffset); int len = readInt(); @@ -482,7 +482,7 @@ public class BinaryMapPoiReaderAdapter { skipTiles.clear(); } LOG.info("Searched poi structure in "+(System.currentTimeMillis() - time) + - "ms. Found " + offsets.length +" subtress"); + "ms. Found " + offsets.length +" subtrees"); for (int j = 0; j < offsets.length; j++) { codedIS.seek(offsets[j] + indexOffset); int len = readInt(); @@ -866,8 +866,8 @@ public class BinaryMapPoiReaderAdapter { long l = ((((x << zoom) | y) << 5) | zoom); boolean read = true; if(req.tiles != null) { - int zx = x << (SearchRequest.ZOOM_TO_SEARCH_POI - zoom); - int zy = y << (SearchRequest.ZOOM_TO_SEARCH_POI - zoom); + long zx = x << (SearchRequest.ZOOM_TO_SEARCH_POI - zoom); + long zy = y << (SearchRequest.ZOOM_TO_SEARCH_POI - zoom); read = req.tiles.contains((zx << SearchRequest.ZOOM_TO_SEARCH_POI) + zy); } int offset = readInt();