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-07-15 09:59:07 +02:00
commit 4123776efd
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd-java/src/net/osmand/search/core/ObjectType.java
View file

@ -1,10 +1,16 @@
package net.osmand.search.core; package net.osmand.search.core;
public enum ObjectType { public enum ObjectType {
CITY(true), VILLAGE(true), POSTCODE(true), STREET(true), HOUSE(true), // ADDRESS
STREET_INTERSECTION(true), POI_TYPE(false), POI(true), LOCATION(true), PARTIAL_LOCATION(false), FAVORITE(true), CITY(true), VILLAGE(true), POSTCODE(true), STREET(true), HOUSE(true),STREET_INTERSECTION(true),
SEARCH_API_FINISHED(false), // POI
REGION(true), RECENT_OBJ(true), WPT(true), UNKNOWN_NAME_FILTER(false); POI_TYPE(false), POI(true),
// LOCATION
LOCATION(true), PARTIAL_LOCATION(false),
// UI OBJECTS
FAVORITE(true), WPT(true), RECENT_OBJ(true),
REGION(true),
SEARCH_API_FINISHED(false), UNKNOWN_NAME_FILTER(false);
private boolean hasLocation; private boolean hasLocation;
private ObjectType(boolean location) { private ObjectType(boolean location) {
this.hasLocation = location; this.hasLocation = location;

3
OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
View file

@ -47,12 +47,9 @@ import com.jwetherell.openmap.common.UTMPoint;
public class SearchCoreFactory { public class SearchCoreFactory {
// TODO partial location (+)
// TODO add full text search with comma correct order // TODO add full text search with comma correct order
// TODO MED add full text search without comma and different word order // TODO MED add full text search without comma and different word order
// TODO MED edit in the middle (with words and comma)? // TODO MED edit in the middle (with words and comma)?
// TODO exclude duplicate streets/cities/pois... // TODO exclude duplicate streets/cities/pois...
// TODO UI support poi additional select type and search // TODO UI support poi additional select type and search

2
OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
View file

@ -47,7 +47,7 @@ public class AmenityIndexRepositoryBinary implements AmenityIndexRepository {
@Override @Override
public boolean checkContainsInt(int top31, int left31, int bottom31, int right31) { public boolean checkContainsInt(int top31, int left31, int bottom31, int right31) {
return index.containsPoiData(top31, left31, bottom31, right31); return index.containsPoiData(left31, top31, right31, bottom31);
} }