Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-25 20:13:27 +02:00
commit 60b66c8fa5

View file

@ -2038,7 +2038,7 @@ public class BinaryMapIndexReader {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
// File fl = new File(System.getProperty("maps") + /Synthetic_test_rendering.obf"); // File fl = new File(System.getProperty("maps") + /Synthetic_test_rendering.obf");
File fl = new File(System.getProperty("maps") + "/Netherlands_noord-holland_europe_merge.obf"); File fl = new File(System.getProperty("maps") + "/Map.obf");
RandomAccessFile raf = new RandomAccessFile(fl, "r"); RandomAccessFile raf = new RandomAccessFile(fl, "r");
BinaryMapIndexReader reader = new BinaryMapIndexReader(raf, fl); BinaryMapIndexReader reader = new BinaryMapIndexReader(raf, fl);
@ -2326,7 +2326,7 @@ public class BinaryMapIndexReader {
public boolean isCancelled() { public boolean isCancelled() {
return false; return false;
} }
}, "Benelux", StringMatcherMode.CHECK_ONLY_STARTS_WITH); }, "Красноарм", StringMatcherMode.CHECK_ONLY_STARTS_WITH);
// req.setBBoxRadius(52.276142, 4.8608723, 15000); // req.setBBoxRadius(52.276142, 4.8608723, 15000);
reader.searchAddressDataByName(req); reader.searchAddressDataByName(req);
} }