This commit is contained in:
Victor Shcherb 2018-06-16 22:17:28 +02:00
parent c8687b1bae
commit 9c843d1030
4 changed files with 47 additions and 4 deletions

View file

@ -25,6 +25,8 @@ public interface IProgress {
public boolean isInterrupted(); public boolean isInterrupted();
public void setGeneralProgress(String genProgress);
public IProgress EMPTY_PROGRESS = new IProgress() { public IProgress EMPTY_PROGRESS = new IProgress() {
@Override @Override
@ -47,6 +49,11 @@ public interface IProgress {
@Override @Override
public void finishTask() {} public void finishTask() {}
@Override
public void setGeneralProgress(String genProgress) {}
}; };
} }

View file

@ -87,6 +87,10 @@ public class BinaryMapAddressReaderAdapter {
public static class CitiesBlock extends BinaryIndexPart { public static class CitiesBlock extends BinaryIndexPart {
int type; int type;
public int getType() {
return type;
}
public String getPartName() { public String getPartName() {
return "City"; return "City";
} }

View file

@ -1625,6 +1625,9 @@ public class BinaryMapIndexReader {
int numberOfAcceptedSubtrees = 0; int numberOfAcceptedSubtrees = 0;
boolean interrupted = false; boolean interrupted = false;
public MapObjectStat getStat() {
return stat;
}
protected SearchRequest() { protected SearchRequest() {
} }

View file

@ -43,10 +43,10 @@ public class BinaryMapPoiReaderAdapter {
private static final int BUCKET_SEARCH_BY_NAME = 5; private static final int BUCKET_SEARCH_BY_NAME = 5;
public static class PoiSubType { public static class PoiSubType {
boolean text; public boolean text;
String name; public String name;
//int estiatedSize; //int estiatedSize;
List<String> possibleValues = null; public List<String> possibleValues = null;
} }
public static class PoiRegion extends BinaryIndexPart { public static class PoiRegion extends BinaryIndexPart {
@ -60,10 +60,39 @@ public class BinaryMapPoiReaderAdapter {
int top31; int top31;
int bottom31; int bottom31;
public int getLeft31() {
return left31;
}
public int getRight31() {
return right31;
}
public int getTop31() {
return top31;
}
public int getBottom31() {
return bottom31;
}
public String getPartName() { public String getPartName() {
return "POI"; return "POI";
} }
public List<String> getCategories() {
return categories;
}
public List<List<String>> getSubcategories() {
return subcategories;
}
public List<PoiSubType> getSubTypes() {
return subTypes;
}
public int getFieldNumber() { public int getFieldNumber() {
return OsmandOdb.OsmAndStructure.POIINDEX_FIELD_NUMBER; return OsmandOdb.OsmAndStructure.POIINDEX_FIELD_NUMBER;
} }