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

Fix processing error

Browse source
This commit is contained in:
Victor Shcherb 2016-08-10 22:03:22 +02:00
parent 4bcd363a53
commit 1129316ff6
1 changed files with 8 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -818,14 +818,20 @@ public class BinaryMapIndexReader {
} }
} }
public List<BinaryMapDataObject> searchMapIndex(SearchRequest<BinaryMapDataObject> req) throws IOException { public List<BinaryMapDataObject> searchMapIndex(SearchRequest<BinaryMapDataObject> req) throws IOException {
return searchMapIndex(req, null);
}
public List<BinaryMapDataObject> searchMapIndex(SearchRequest<BinaryMapDataObject> req, MapIndex filterMapIndex) throws IOException {
req.numberOfVisitedObjects = 0; req.numberOfVisitedObjects = 0;
req.numberOfAcceptedObjects = 0; req.numberOfAcceptedObjects = 0;
req.numberOfAcceptedSubtrees = 0; req.numberOfAcceptedSubtrees = 0;
req.numberOfReadSubtrees = 0; req.numberOfReadSubtrees = 0;
List<MapTree> foundSubtrees = new ArrayList<MapTree>(); List<MapTree> foundSubtrees = new ArrayList<MapTree>();
for (MapIndex mapIndex : mapIndexes) { for (MapIndex mapIndex : mapIndexes) {
if(filterMapIndex == null || mapIndex == filterMapIndex) {
continue;
}
// lazy initializing rules // lazy initializing rules
if (mapIndex.encodingRules.isEmpty()) { if (mapIndex.encodingRules.isEmpty()) {
codedIS.seek(mapIndex.filePointer); codedIS.seek(mapIndex.filePointer);
@ -885,73 +891,7 @@ public class BinaryMapIndexReader {
return req.getSearchResults(); return req.getSearchResults();
} }
public List<BinaryMapDataObject> searchMapIndex(SearchRequest<BinaryMapDataObject> req, MapIndex mapIndex) throws IOException {
req.numberOfVisitedObjects = 0;
req.numberOfAcceptedObjects = 0;
req.numberOfAcceptedSubtrees = 0;
req.numberOfReadSubtrees = 0;
List<MapTree> foundSubtrees = new ArrayList<MapTree>();
// lazy initializing rules
if (mapIndex.encodingRules.isEmpty()) {
codedIS.seek(mapIndex.filePointer);
int oldLimit = codedIS.pushLimit(mapIndex.length);
readMapIndex(mapIndex, true);
codedIS.popLimit(oldLimit);
}
for (MapRoot level : mapIndex.getRoots()) {
if ((level.minZoom <= req.zoom && level.maxZoom >= req.zoom) || req.zoom == -1) {
if (level.right < req.left || level.left > req.right || level.top > req.bottom || level.bottom < req.top) {
continue;
}
// lazy initializing trees
if (level.trees == null) {
level.trees = new ArrayList<MapTree>();
codedIS.seek(level.filePointer);
int oldLimit = codedIS.pushLimit(level.length);
readMapLevel(level);
codedIS.popLimit(oldLimit);
}
for (MapTree tree : level.trees) {
if (tree.right < req.left || tree.left > req.right || tree.top > req.bottom || tree.bottom < req.top) {
continue;
}
codedIS.seek(tree.filePointer);
int oldLimit = codedIS.pushLimit(tree.length);
searchMapTreeBounds(tree, level, req, foundSubtrees);
codedIS.popLimit(oldLimit);
}
Collections.sort(foundSubtrees, new Comparator<MapTree>() {
@Override
public int compare(MapTree o1, MapTree o2) {
return o1.mapDataBlock < o2.mapDataBlock ? -1 : (o1.mapDataBlock == o2.mapDataBlock ? 0 : 1);
}
});
for (MapTree tree : foundSubtrees) {
if (!req.isCancelled()) {
codedIS.seek(tree.mapDataBlock);
int length = codedIS.readRawVarint32();
int oldLimit = codedIS.pushLimit(length);
readMapDataBlocks(req, tree, mapIndex);
codedIS.popLimit(oldLimit);
}
}
foundSubtrees.clear();
}
}
if (req.numberOfVisitedObjects > 0) {
log.info("Search is done. Visit " + req.numberOfVisitedObjects + " objects. Read " + req.numberOfAcceptedObjects + " objects."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
log.info("Read " + req.numberOfReadSubtrees + " subtrees. Go through " + req.numberOfAcceptedSubtrees + " subtrees."); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
}
return req.getSearchResults();
}
protected void readMapDataBlocks(SearchRequest<BinaryMapDataObject> req, MapTree tree, MapIndex root) throws IOException { protected void readMapDataBlocks(SearchRequest<BinaryMapDataObject> req, MapTree tree, MapIndex root) throws IOException {
List<BinaryMapDataObject> tempResults = null; List<BinaryMapDataObject> tempResults = null;