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-29 10:10:36 +02:00
commit d68566fac5
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -260,6 +260,24 @@ public class SearchUICore {
if(ObjectType.isAddress(r1.objectType) && ObjectType.isAddress(r2.objectType)) {
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;
}
}

2
OsmAnd/res/values-ru/phrases.xml
View file

@ -3014,4 +3014,6 @@
<string name="poi_toilets_disposal_pitlatrine">Выгребная яма</string>
<string name="poi_toilets_disposal_bucket">Утилизация отходов: контейнер</string>
<string name="poi_length">Длина</string>
</resources>

2
OsmAnd/res/values/phrases.xml
View file

@ -3019,4 +3019,6 @@
<string name="poi_toilets_disposal_chemical">Toilets disposal: chemical</string>
<string name="poi_toilets_disposal_bucket">Toilets disposal: bucket</string>
<string name="poi_length">Length</string>
</resources>