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

Fix issue with address creator ( cities with same name wrongly deleted)

Browse source
This commit is contained in:
Victor Shcherb 2012-06-02 21:59:56 +02:00
parent b42f5bf0ca
commit 75211b4f19
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
DataExtractionOSM/src/net/osmand/data/preparation/IndexAddressCreator.java
View file

@ -807,7 +807,7 @@ public class IndexAddressCreator extends AbstractIndexPartCreator{
mapConnection.commit(); mapConnection.commit();
writer.startWriteAddressIndex(regionName); writer.startWriteAddressIndex(regionName);
Map<CityType, Collection<City>> cities = readCities(mapConnection); Map<CityType, List<City>> cities = readCities(mapConnection);
PreparedStatement streetstat = mapConnection.prepareStatement(// PreparedStatement streetstat = mapConnection.prepareStatement(//
"SELECT A.id, A.name, A.name_en, A.latitude, A.longitude, "+ //$NON-NLS-1$ "SELECT A.id, A.name, A.name_en, A.latitude, A.longitude, "+ //$NON-NLS-1$
"B.id, B.name, B.name_en, B.latitude, B.longitude, B.postcode, A.cityPart, "+ //$NON-NLS-1$ "B.id, B.name, B.name_en, B.latitude, B.longitude, B.postcode, A.cityPart, "+ //$NON-NLS-1$
@ -1138,16 +1138,12 @@ public class IndexAddressCreator extends AbstractIndexPartCreator{
} }
public Map<CityType, Collection<City>> readCities(Connection c) throws SQLException{ public Map<CityType, List<City>> readCities(Connection c) throws SQLException{
Map<CityType, Collection<City>> cities = new LinkedHashMap<City.CityType, Collection<City>>(); Map<CityType, List<City>> cities = new LinkedHashMap<City.CityType, List<City>>();
for(CityType t : CityType.values()) { for(CityType t : CityType.values()) {
cities.put(t, new TreeSet<City>(new Comparator<City>() { cities.put(t, new ArrayList<City>());
@Override
public int compare(City o1, City o2) {
return Collator.getInstance().compare(o1.getName(), o2.getName());
}
}));
} }
Statement stat = c.createStatement(); Statement stat = c.createStatement();
ResultSet set = stat.executeQuery("select id, latitude, longitude , name , name_en , city_type from city"); //$NON-NLS-1$ ResultSet set = stat.executeQuery("select id, latitude, longitude , name , name_en , city_type from city"); //$NON-NLS-1$
while(set.next()){ while(set.next()){
@ -1169,6 +1165,16 @@ public class IndexAddressCreator extends AbstractIndexPartCreator{
} }
set.close(); set.close();
stat.close(); stat.close();
Comparator<City> comparator = new Comparator<City>() {
@Override
public int compare(City o1, City o2) {
return Collator.getInstance().compare(o1.getName(), o2.getName());
}
};
for(List<City> t : cities.values()) {
Collections.sort(t, comparator);
}
return cities; return cities;
} }
} }