Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix empty en names for cities (tested on new zealand)

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@868 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-12-31 10:27:04 +00:00
parent 39cf89bb0a
commit dad4a1276f
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
DataExtractionOSM/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
View file

@ -49,12 +49,12 @@ public class BinaryMapAddressReaderAdapter {
int tag = WireFormat.getTagFieldNumber(t); int tag = WireFormat.getTagFieldNumber(t);
switch (tag) { switch (tag) {
case 0: case 0:
if(region.enName == null || region.enName.length() == 0){
region.enName = Junidecode.unidecode(region.name);
}
return; return;
case OsmandOdb.OsmAndAddressIndex.NAME_FIELD_NUMBER : case OsmandOdb.OsmAndAddressIndex.NAME_FIELD_NUMBER :
region.name = codedIS.readString(); region.name = codedIS.readString();
if(region.enName == null){
region.enName = Junidecode.unidecode(region.name);
}
break; break;
case OsmandOdb.OsmAndAddressIndex.NAME_EN_FIELD_NUMBER : case OsmandOdb.OsmAndAddressIndex.NAME_EN_FIELD_NUMBER :
region.enName = codedIS.readString(); region.enName = codedIS.readString();
@ -198,6 +198,9 @@ public class BinaryMapAddressReaderAdapter {
switch (tag) { switch (tag) {
case 0: case 0:
c.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x)); c.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x));
if(c.getEnName().length() == 0){
c.setEnName(Junidecode.unidecode(c.getName()));
}
return c; return c;
case OsmandOdb.CityIndex.CITY_TYPE_FIELD_NUMBER : case OsmandOdb.CityIndex.CITY_TYPE_FIELD_NUMBER :
int type = codedIS.readUInt32(); int type = codedIS.readUInt32();
@ -214,9 +217,6 @@ public class BinaryMapAddressReaderAdapter {
break; break;
case OsmandOdb.CityIndex.NAME_FIELD_NUMBER : case OsmandOdb.CityIndex.NAME_FIELD_NUMBER :
c.setName(codedIS.readString()); c.setName(codedIS.readString());
if(c.getEnName().length() == 0){
c.setEnName(Junidecode.unidecode(c.getName()));
}
break; break;
case OsmandOdb.CityIndex.X_FIELD_NUMBER : case OsmandOdb.CityIndex.X_FIELD_NUMBER :
x = codedIS.readFixed32(); x = codedIS.readFixed32();
@ -261,6 +261,9 @@ public class BinaryMapAddressReaderAdapter {
if(loadLocation){ if(loadLocation){
s.setLocation(MapUtils.getLatitudeFromTile(24, y), MapUtils.getLongitudeFromTile(24, x)); s.setLocation(MapUtils.getLatitudeFromTile(24, y), MapUtils.getLongitudeFromTile(24, x));
} }
if(s.getEnName().length() == 0){
s.setEnName(Junidecode.unidecode(s.getName()));
}
return s; return s;
case OsmandOdb.StreetIndex.ID_FIELD_NUMBER : case OsmandOdb.StreetIndex.ID_FIELD_NUMBER :
s.setId(codedIS.readUInt64()); s.setId(codedIS.readUInt64());
@ -270,9 +273,6 @@ public class BinaryMapAddressReaderAdapter {
break; break;
case OsmandOdb.StreetIndex.NAME_FIELD_NUMBER : case OsmandOdb.StreetIndex.NAME_FIELD_NUMBER :
s.setName(codedIS.readString()); s.setName(codedIS.readString());
if(s.getEnName().length() == 0){
s.setEnName(Junidecode.unidecode(s.getName()));
}
break; break;
case OsmandOdb.StreetIndex.X_FIELD_NUMBER : case OsmandOdb.StreetIndex.X_FIELD_NUMBER :
int sx = codedIS.readSInt32(); int sx = codedIS.readSInt32();
@ -322,6 +322,9 @@ public class BinaryMapAddressReaderAdapter {
switch (tag) { switch (tag) {
case 0: case 0:
b.setLocation(MapUtils.getLatitudeFromTile(24, y), MapUtils.getLongitudeFromTile(24, x)); b.setLocation(MapUtils.getLatitudeFromTile(24, y), MapUtils.getLongitudeFromTile(24, x));
if(b.getEnName().length() == 0){
b.setEnName(Junidecode.unidecode(b.getName()));
}
return b; return b;
case OsmandOdb.BuildingIndex.ID_FIELD_NUMBER : case OsmandOdb.BuildingIndex.ID_FIELD_NUMBER :
b.setId(codedIS.readUInt64()); b.setId(codedIS.readUInt64());
@ -331,9 +334,6 @@ public class BinaryMapAddressReaderAdapter {
break; break;
case OsmandOdb.BuildingIndex.NAME_FIELD_NUMBER : case OsmandOdb.BuildingIndex.NAME_FIELD_NUMBER :
b.setName(codedIS.readString()); b.setName(codedIS.readString());
if(b.getEnName().length() == 0){
b.setEnName(Junidecode.unidecode(b.getName()));
}
break; break;
case OsmandOdb.BuildingIndex.X_FIELD_NUMBER : case OsmandOdb.BuildingIndex.X_FIELD_NUMBER :
x = codedIS.readSInt32() + street24X; x = codedIS.readSInt32() + street24X;

2
DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexWriter.java
View file

@ -405,7 +405,7 @@ public class BinaryMapIndexWriter {
} }
private boolean checkEnNameToWrite(MapObject obj){ private boolean checkEnNameToWrite(MapObject obj){
if(obj.getEnName() == null){ if(obj.getEnName() == null || obj.getEnName().length() == 0){
return false; return false;
} }
return !obj.getEnName().equals(Junidecode.unidecode(obj.getName())); return !obj.getEnName().equals(Junidecode.unidecode(obj.getName()));