From 787daca3cd3e0f2a5db61d141dde2a7d0e43e7bb Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 30 May 2016 22:39:56 +0200 Subject: [PATCH] update general methods --- .../net/osmand/binary/BinaryMapIndexReader.java | 14 +++++++++++++- OsmAnd-java/src/net/osmand/util/Algorithms.java | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java index e4c1e544a7..45278020f1 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java +++ b/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; diff --git a/OsmAnd-java/src/net/osmand/util/Algorithms.java b/OsmAnd-java/src/net/osmand/util/Algorithms.java index 99bff0bc20..376ae1aa6e 100644 --- a/OsmAnd-java/src/net/osmand/util/Algorithms.java +++ b/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); + } + } \ No newline at end of file