From 9c843d103035834a77cb6b7698ed12ce9951f7e8 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 16 Jun 2018 22:17:28 +0200
Subject: [PATCH] Deps

---
 .../src/main/java/net/osmand/IProgress.java   |  9 ++++-
 .../binary/BinaryMapAddressReaderAdapter.java |  4 +++
 .../osmand/binary/BinaryMapIndexReader.java   |  3 ++
 .../binary/BinaryMapPoiReaderAdapter.java     | 35 +++++++++++++++++--
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/IProgress.java b/OsmAnd-java/src/main/java/net/osmand/IProgress.java
index 69a0b16fbe..762dab727b 100644
--- a/OsmAnd-java/src/main/java/net/osmand/IProgress.java
+++ b/OsmAnd-java/src/main/java/net/osmand/IProgress.java
@@ -25,6 +25,8 @@ public interface IProgress {
 	
 	public boolean isInterrupted();
 	
+	public void setGeneralProgress(String genProgress);
+	
 	public IProgress EMPTY_PROGRESS = new IProgress() {
 		
 		@Override
@@ -47,6 +49,11 @@ public interface IProgress {
 		
 		@Override
 		public void finishTask() {}
-	};  
+
+		@Override
+		public void setGeneralProgress(String genProgress) {}
+	};
+
+	  
 
 }
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapAddressReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapAddressReaderAdapter.java
index 0034992cea..5d6f920802 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapAddressReaderAdapter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapAddressReaderAdapter.java
@@ -87,6 +87,10 @@ public class BinaryMapAddressReaderAdapter {
 	public static class CitiesBlock extends BinaryIndexPart {
 		int type;
 
+		public int getType() {
+			return type;
+		}
+		
 		public String getPartName() {
 			return "City";
 		}
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
index 069a5d9da1..db598b7d70 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
@@ -1625,6 +1625,9 @@ public class BinaryMapIndexReader {
 		int numberOfAcceptedSubtrees = 0;
 		boolean interrupted = false;
 
+		public MapObjectStat getStat() {
+			return stat;
+		}
 
 		protected SearchRequest() {
 		}
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java
index 87897cdbbb..81a4212d4d 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java
@@ -43,10 +43,10 @@ public class BinaryMapPoiReaderAdapter {
 	private static final int BUCKET_SEARCH_BY_NAME = 5;
 
 	public static class PoiSubType {
-		boolean text;
-		String name;
+		public boolean text;
+		public String name;
 		//int estiatedSize;
-		List<String> possibleValues = null;
+		public List<String> possibleValues = null;
 	}
 
 	public static class PoiRegion extends BinaryIndexPart {
@@ -59,11 +59,40 @@ public class BinaryMapPoiReaderAdapter {
 		int right31;
 		int top31;
 		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() {
 			return "POI";
 		}
 
+		
+		public List<String> getCategories() {
+			return categories;
+		}
+		
+		public List<List<String>> getSubcategories() {
+			return subcategories;
+		}
+		
+		public List<PoiSubType> getSubTypes() {
+			return subTypes;
+		}
+		
 		public int getFieldNumber() {
 			return OsmandOdb.OsmAndStructure.POIINDEX_FIELD_NUMBER;
 		}