Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java

@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -81,6 +80,19 @@ public class BinaryMapIndexReader {
 	public static final int SHIFT_COORDINATES = 5;
 	private final static Log log = PlatformUtil.getLog(BinaryMapIndexReader.class);
 	public static boolean READ_STATS = false;
+	public static final SearchPoiTypeFilter ACCEPT_ALL_POI_TYPE_FILTER = new SearchPoiTypeFilter() {
+		@Override
+		public boolean isEmpty() {
+			return false;
+		}
+		
+		@Override
+		public boolean accept(PoiCategory type, String subcategory) {
+			return true;
+		}
+	};
+	
+	
 	
 	
 	private final RandomAccessFile raf;

OsmAnd-java/src/net/osmand/util/Algorithms.java

@@ -595,4 +595,12 @@ public class Algorithms {
 		return 0xFFFF00FF;
 	}
 
+	public static int compare(int x, int y) {
+		return (x < y) ? -1 : ((x == y) ? 0 : 1);
+	}
+	
+	public static int compare(long x, long y) {
+		return (x < y) ? -1 : ((x == y) ? 0 : 1);
+	}
+
 }