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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-05-30 22:44:31 +02:00
commit da3692177a
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -81,6 +80,19 @@ public class BinaryMapIndexReader {
public static final int SHIFT_COORDINATES = 5; public static final int SHIFT_COORDINATES = 5;
private final static Log log = PlatformUtil.getLog(BinaryMapIndexReader.class); private final static Log log = PlatformUtil.getLog(BinaryMapIndexReader.class);
public static boolean READ_STATS = false; 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; private final RandomAccessFile raf;

8
OsmAnd-java/src/net/osmand/util/Algorithms.java
View file

@ -595,4 +595,12 @@ public class Algorithms {
return 0xFFFF00FF; 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);
}
} }