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

Fix #7022

Browse source
This commit is contained in:
crimean 2019-06-27 14:51:06 +03:00
parent 8d36b64ad4
commit 651688b3af
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1225,7 +1225,9 @@ public class SearchCoreFactory {
public static class SearchLocationAndUrlAPI extends SearchBaseAPI {
private static final int OLC_RECALC_DISTANCE_THRESHOLD = 100000; // 100 km
private int olcPhraseHash;
private LatLon olcPhraseLocation;
private ParsedOpenLocationCode cachedParsedCode;
private final List<String> citySubTypes = Arrays.asList("city", "town", "village");
@ -1328,6 +1330,9 @@ public class SearchCoreFactory {
}
}
}
if (latLon == null && !parsedCode.isFull()) {
latLon = parsedCode.recover(phrase.getSettings().getOriginalLocation());
}
if (latLon != null) {
publishLocation(phrase, resultMatcher, lw, latLon);
}
@ -1386,8 +1391,15 @@ public class SearchCoreFactory {
return -1;
}
int olcPhraseHash = p.getUnknownSearchPhrase().hashCode();
if (this.olcPhraseHash == olcPhraseHash && this.olcPhraseLocation != null) {
double distance = MapUtils.getDistance(p.getSettings().getOriginalLocation(), this.olcPhraseLocation);
if (distance > OLC_RECALC_DISTANCE_THRESHOLD) {
olcPhraseHash++;
}
}
if (this.olcPhraseHash != olcPhraseHash) {
this.olcPhraseHash = olcPhraseHash;
this.olcPhraseLocation = p.getSettings().getOriginalLocation();
cachedParsedCode = LocationParser.parseOpenLocationCode(p.getUnknownSearchPhrase());
}
return cachedParsedCode == null ? SEARCH_LOCATION_PRIORITY : SEARCH_MAX_PRIORITY;