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 2018-03-26 05:39:57 +02:00
commit 1860090c33
3 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java
View file

@ -119,8 +119,12 @@ public class GeocodingUtilities {
public String toString() {
StringBuilder bld = new StringBuilder();
if (building != null) {
if(buildingInterpolation != null) {
bld.append(buildingInterpolation);
} else {
bld.append(building.getName());
}
}
if (street != null) {
bld.append(" str. ").append(street.getName()).append(" city ").append(city.getName());
} else if (streetName != null) {
@ -320,26 +324,12 @@ public class GeocodingUtilities {
if (MapUtils.getDistance(road.searchPoint, plat, plon) < DISTANCE_BUILDING_PROXIMITY) {
GeocodingResult bld = new GeocodingResult(street);
bld.building = b;
bld.connectionPoint = b.getLocation();
//bld.connectionPoint = b.getLocation();
bld.connectionPoint = new LatLon(plat, plon);
streetBuildings.add(bld);
if (!Algorithms.isEmpty(b.getName2())) {
int fi = Algorithms.extractFirstIntegerNumber(b.getName());
int si = Algorithms.extractFirstIntegerNumber(b.getName2());
if (si != 0 && fi != 0) {
int num = (int) (fi + (si - fi) * coeff);
BuildingInterpolation type = b.getInterpolationType();
if (type == BuildingInterpolation.EVEN || type == BuildingInterpolation.ODD) {
if (num % 2 == (type == BuildingInterpolation.EVEN ? 1 : 0)) {
num--;
}
} else if (b.getInterpolationInterval() > 0) {
int intv = b.getInterpolationInterval();
if ((num - fi) % intv != 0) {
num = ((num - fi) / intv) * intv + fi;
}
}
bld.buildingInterpolation = num + "";
}
String nm = b.getInterpolationName(coeff);
if(!Algorithms.isEmpty(nm)) {
bld.buildingInterpolation = nm;
}
}

23
OsmAnd-java/src/net/osmand/data/Building.java
View file

@ -193,4 +193,27 @@ public class Building extends MapObject {
return res;
}
public String getInterpolationName(double coeff) {
if (!Algorithms.isEmpty(getName2())) {
int fi = Algorithms.extractFirstIntegerNumber(getName());
int si = Algorithms.extractFirstIntegerNumber(getName2());
if (si != 0 && fi != 0) {
int num = (int) (fi + (si - fi) * coeff);
BuildingInterpolation type = getInterpolationType();
if (type == BuildingInterpolation.EVEN || type == BuildingInterpolation.ODD) {
if (num % 2 == (type == BuildingInterpolation.EVEN ? 1 : 0)) {
num--;
}
} else if (getInterpolationInterval() > 0) {
int intv = getInterpolationInterval();
if ((num - fi) % intv != 0) {
num = ((num - fi) / intv) * intv + fi;
}
}
return num + "";
}
}
return "";
}
}

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

@ -1043,7 +1043,6 @@ public class SearchCoreFactory {
|| !phrase.isSearchTypeAllowed(ObjectType.HOUSE)) {
continue;
}
res.localeName = b.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
res.otherNames = b.getAllNames(true);
res.object = b;
@ -1055,6 +1054,7 @@ public class SearchCoreFactory {
res.objectType = ObjectType.HOUSE;
if(interpolation) {
res.location = b.getLocation(b.interpolation(lw));
res.localeName = lw;
} else {
res.location = b.getLocation();
}