Merge branch 'master' into issue_7076

# Conflicts:
#	OsmAnd/res/values/strings.xml

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

@@ -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;

OsmAnd/build.gradle

@@ -46,10 +46,10 @@ android {
 	defaultConfig {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
 		targetSdkVersion 26
-		versionCode 330
+		versionCode 340
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
 		multiDexEnabled true
-		versionName "3.3.0"
+		versionName "3.4.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
 	}