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 2017-09-21 00:46:29 +02:00
commit 0c5c43c8a8
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,9 @@ public class Building extends MapObject {
public float interpolation(String hno) {
if(getInterpolationType() != null || getInterpolationInterval() > 0 || checkNameAsInterpolation()) {
if(getInterpolationType() != null || getInterpolationInterval() > 0
//|| checkNameAsInterpolation() // disable due to situation in NL #4284
) {
int num = Algorithms.extractFirstIntegerNumber(hno);
String fname = super.getName();
int numB = Algorithms.extractFirstIntegerNumber(fname);
@ -139,14 +141,13 @@ public class Building extends MapObject {
}
return -1;
}
private boolean checkNameAsInterpolation() {
protected boolean checkNameAsInterpolation() {
String nm = super.getName();
boolean interpolation = nm.contains("-");
if(interpolation) {
for(int i = 0; i < nm.length(); i++) {
if(nm.charAt(i) >= '0' && nm.charAt(i) <= '9' || nm.charAt(i) == '-') {
} else {
if(!(nm.charAt(i) >= '0' && nm.charAt(i) <= '9') && nm.charAt(i) != '-') {
interpolation = false;
break;
}

3
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -288,8 +288,8 @@ public class AppInitializer implements IProgress {
}
private void indexRegionsBoundaries(List<String> warnings) {
File file = app.getAppPath("regions.ocbf");
try {
File file = app.getAppPath("regions.ocbf");
if (file != null) {
if (!file.exists()) {
Algorithms.streamCopy(OsmandRegions.class.getResourceAsStream("regions.ocbf"),
@ -300,6 +300,7 @@ public class AppInitializer implements IProgress {
}
} catch (Exception e) {
warnings.add(e.getMessage());
file.delete(); // recreate file
LOG.error(e.getMessage(), e);
}
}