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-30 01:00:02 +02:00
commit a4d3ca4576
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
OsmAnd-java/src/net/osmand/search/SearchUICore.java
View file

@ -251,33 +251,26 @@ public class SearchUICore {
} }
if (r1.localeName.equals(r2.localeName)) { if (r1.localeName.equals(r2.localeName)) {
double similarityRadius = 30; double similarityRadius = 30;
if(a1 != null && a2 != null) { if (a1 != null && a2 != null) {
if(a1.getType().getKeyName().equals("natural") && // here 2 points are amenity
a2.getType().getKeyName().equals("natural")) { String type1 = a1.getType().getKeyName();
similarityRadius = 10000; String type2 = a2.getType().getKeyName();
String subType1 = a1.getSubType();
String subType2 = a2.getSubType();
if (!type1.equals(type2)) {
return false;
} }
} if (type1.equals("natural")) {
if(ObjectType.isAddress(r1.objectType) && ObjectType.isAddress(r2.objectType)) { similarityRadius = 10000;
} else if (subType1.equals(subType2)) {
if (subType1.contains("cn_ref") || subType1.contains("wn_ref")
|| (subType1.startsWith("route_hiking_") && subType1.endsWith("n_poi"))) {
similarityRadius = 10000;
}
}
} else if(ObjectType.isAddress(r1.objectType) && ObjectType.isAddress(r2.objectType)) {
similarityRadius = 100; similarityRadius = 100;
} }
if (a1.getSubType().contains("cn_ref") && a2.getSubType().contains("cn_ref") && a1.getType().getKeyName().equals(a2.getType().getKeyName())) {
similarityRadius = 10000;
}
if (a1.getSubType().contains("wn_ref") && a2.getSubType().contains("wn_ref") && a1.getType().getKeyName().equals(a2.getType().getKeyName())) {
similarityRadius = 10000;
}
if (a1.getSubType().equals("route_hiking_iwn_poi") && a2.getSubType().equals("route_hiking_iwn_poi") && a1.getType().getKeyName().equals(a2.getType().getKeyName())) {
similarityRadius = 10000;
}
if (a1.getSubType().equals("route_hiking_nwn_poi") && a2.getSubType().equals("route_hiking_nwn_poi") && a1.getType().getKeyName().equals(a2.getType().getKeyName())) {
similarityRadius = 10000;
}
if (a1.getSubType().equals("route_hiking_rwn_poi") && a2.getSubType().equals("route_hiking_rwn_poi") && a1.getType().getKeyName().equals(a2.getType().getKeyName())) {
similarityRadius = 10000;
}
if (a1.getSubType().equals("route_hiking_lwn_poi") && a2.getSubType().equals("route_hiking_lwn_poi") && a1.getType().getKeyName().equals(a2.getType().getKeyName())) {
similarityRadius = 10000;
}
return MapUtils.getDistance(r1.location, r2.location) < similarityRadius; return MapUtils.getDistance(r1.location, r2.location) < similarityRadius;
} }
} }