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

clean structure

Browse source
This commit is contained in:
Victor Shcherb 2015-10-25 17:24:40 +01:00
parent 69a6210b4a
commit 6c445aed91
1 changed files with 90 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

179
OsmAnd-java/src/net/osmand/map/OsmandRegions.java
View file

@ -46,27 +46,16 @@ public class OsmandRegions {
public static final String FIELD_ROAD_SIGNS = "road_signs"; public static final String FIELD_ROAD_SIGNS = "road_signs";
private BinaryMapIndexReader reader; private BinaryMapIndexReader reader;
private String locale = "en";
Map<String, RegionData> fullNamesToRegionData = new HashMap<String, RegionData>(); Map<String, RegionData> fullNamesToRegionData = new HashMap<String, RegionData>();
Map<String, LinkedList<BinaryMapDataObject>> countriesByDownloadName = new HashMap<String, LinkedList<BinaryMapDataObject>>();
Map<String, String> downloadNamesToFullNames = new HashMap<String, String>(); Map<String, String> downloadNamesToFullNames = new HashMap<String, String>();
// Map<String, String> fullNamesToLocaleNames = new HashMap<String, String>(); Map<String, LinkedList<BinaryMapDataObject>> countriesByDownloadName = new HashMap<String, LinkedList<BinaryMapDataObject>>();
// Map<String, String> fullNamesNoParentToLocaleNames = new HashMap<String, String>();
// Map<String, String> fullMapNamesToDownloadNames = new HashMap<String, String>();
// Map<String, String> fullNamesToLowercaseIndex = new HashMap<String, String>();
// Map<String, String> fullNamesToParentFullNames = new HashMap<String, String>();
// Map<String, String> fullNamesToDownloadNames = new HashMap<String, String>();
// Map<String, String> fullNamesToLangs = new HashMap<String, String>();
// Map<String, String> fullNamesToMetrics = new HashMap<String, String>();
// Map<String, String> fullNamesToLeftHandDrivings = new HashMap<String, String>();
// Map<String, String> fullNamesToRoadSigns = new HashMap<String, String>();
QuadTree<String> quadTree = null ; QuadTree<String> quadTree = null ;
String locale = "en";
MapIndexFields mapIndexFields = new MapIndexFields(); MapIndexFields mapIndexFields = new MapIndexFields();
private class MapIndexFields { private class MapIndexFields {
MapIndex mapIndex;
Integer parentFullName = null; Integer parentFullName = null;
Integer fullNameType = null; Integer fullNameType = null;
Integer downloadNameType = null; Integer downloadNameType = null;
@ -90,7 +79,7 @@ public class OsmandRegions {
public void prepareFile(String fileName) throws IOException { public void prepareFile(String fileName) throws IOException {
reader = new BinaryMapIndexReader(new RandomAccessFile(fileName, "r"), new File(fileName)); reader = new BinaryMapIndexReader(new RandomAccessFile(fileName, "r"), new File(fileName));
initLocaleNames(); initRegionData();
} }
public boolean containsCountry(String name){ public boolean containsCountry(String name){
@ -119,21 +108,6 @@ public class OsmandRegions {
} }
} }
public String getDownloadNameIndexLowercase(String downloadName) {
if(downloadName == null) {
return null;
}
final String lc = downloadName.toLowerCase();
if (downloadNamesToFullNames.containsKey(lc)) {
String fullName = downloadNamesToFullNames.get(lc);
if (fullNamesToLowercaseIndex.containsKey(fullName)) {
return fullNamesToLowercaseIndex.get(fullName);
}
}
return null;
}
public boolean isInitialized(){ public boolean isInitialized(){
return reader != null; return reader != null;
@ -297,19 +271,12 @@ public class OsmandRegions {
this.locale = locale; this.locale = locale;
} }
public String getMapDownloadType(String fullname) {
return fullMapNamesToDownloadNames.get(fullname); public RegionData getRegionData(String fullname) {
return fullNamesToRegionData.get(fullname);
} }
public String getDownloadName(String fullname) { public void initRegionData() throws IOException {
return fullNamesToDownloadNames.get(fullname);
}
public String getParentFullName(String fullname) {
return fullNamesToParentFullNames.get(fullname);
}
public void initLocaleNames() throws IOException {
// final Collator clt = OsmAndCollator.primaryCollator(); // final Collator clt = OsmAndCollator.primaryCollator();
final Map<String, String> parentRelations = new LinkedHashMap<String, String>(); final Map<String, String> parentRelations = new LinkedHashMap<String, String>();
final ResultMatcher<BinaryMapDataObject> resultMatcher = new ResultMatcher<BinaryMapDataObject>() { final ResultMatcher<BinaryMapDataObject> resultMatcher = new ResultMatcher<BinaryMapDataObject>() {
@ -324,9 +291,54 @@ public class OsmandRegions {
return false; return false;
} }
} }
RegionData rd = initRegionData(parentRelations, object);
if(rd == null) {
return false;
}
downloadNamesToFullNames.put(rd.regionDownloadName, rd.regionFullName);
fullNamesToRegionData.put(rd.regionFullName, rd);
return false;
}
@Override
public boolean isCancelled() {
return false;
}
};
iterateOverAllObjects(resultMatcher);
// post process download names
for(Map.Entry<String, String> e : parentRelations.entrySet()) {
String fullName = e.getKey();
String parentFullName = e.getValue();
// String parentParentFulName = parentRelations.get(parentFullName); // could be used for japan/russia
RegionData rd = fullNamesToRegionData.get(fullName);
if(rd != null) {
rd.parent = fullNamesToRegionData.get(parentFullName);
}
}
}
private RegionData initRegionData(final Map<String, String> parentRelations, BinaryMapDataObject object) {
RegionData rd = new RegionData(); RegionData rd = new RegionData();
rd.downloadsId = mapIndexFields.get(mapIndexFields.downloadNameType, object); rd.regionDownloadName = mapIndexFields.get(mapIndexFields.downloadNameType, object);
rd.regionFullName = mapIndexFields.get(mapIndexFields.fullNameType, object); rd.regionFullName = mapIndexFields.get(mapIndexFields.fullNameType, object);
if(Algorithms.isEmpty(rd.regionDownloadName) || Algorithms.isEmpty(rd.regionFullName)) {
return null;
}
double cx = 0;
double cy = 0;
for(int i = 0; i<object.getPointsLength(); i++) {
cx +=object.getPoint31XTile(i);
cy +=object.getPoint31YTile(i);
}
if(object.getPointsLength() > 0) {
cx /= object.getPointsLength();
cy /= object.getPointsLength();
rd.regionCenter = new LatLon(MapUtils.get31LatitudeY((int) cy), MapUtils.get31LongitudeX((int) cx));
}
rd.regionParentFullName = mapIndexFields.get(mapIndexFields.parentFullName, object); rd.regionParentFullName = mapIndexFields.get(mapIndexFields.parentFullName, object);
if(!Algorithms.isEmpty(rd.regionParentFullName)) { if(!Algorithms.isEmpty(rd.regionParentFullName)) {
parentRelations.put(rd.regionFullName, rd.regionParentFullName); parentRelations.put(rd.regionFullName, rd.regionParentFullName);
@ -338,26 +350,11 @@ public class OsmandRegions {
rd.regionLeftHandDriving = mapIndexFields.get(mapIndexFields.leftHandDrivingType, object); rd.regionLeftHandDriving = mapIndexFields.get(mapIndexFields.leftHandDrivingType, object);
rd.regionMetric = mapIndexFields.get(mapIndexFields.metricType, object); rd.regionMetric = mapIndexFields.get(mapIndexFields.metricType, object);
rd.regionRoadSigns = mapIndexFields.get(mapIndexFields.roadSignsType, object); rd.regionRoadSigns = mapIndexFields.get(mapIndexFields.roadSignsType, object);
rd.regionSearchText = getSearchIndex(object);
String roadSigns = getRoadSigns(object); rd.regionMapDownload = isDownloadOfType(object, MAP_TYPE);
if(!Algorithms.isEmpty(roadSigns)){ return rd;
fullNamesToRoadSigns.put(fullName, roadSigns);
} }
rd.searchText = getSearchIndex(object);
fullNamesToLowercaseIndex.put(fullName, ind.toString());
String downloadName = getDownloadName(object);
if(downloadName != null) {
fullNamesToDownloadNames.put(fullName, downloadName);
downloadNamesToFullNames.put(downloadName, fullName);
if(isDownloadOfType(object, MAP_TYPE)) {
fullMapNamesToDownloadNames.put(fullName, downloadName);
}
}
return false;
}
private String getSearchIndex(BinaryMapDataObject object) { private String getSearchIndex(BinaryMapDataObject object) {
MapIndex mi = object.getMapIndex(); MapIndex mi = object.getMapIndex();
TIntObjectIterator<String> it = object.getObjectNames().iterator(); TIntObjectIterator<String> it = object.getObjectNames().iterator();
@ -377,37 +374,6 @@ public class OsmandRegions {
} }
@Override
public boolean isCancelled() {
return false;
}
};
iterateOverAllObjects(resultMatcher);
// post process download names
for(Map.Entry<String, String> e : parentRelations.entrySet()) {
String fullName = e.getKey();
String parentFullName = e.getValue();
String parentParentFulName = parentRelations.get(parentFullName);
if(!Algorithms.isEmpty(parentFullName) &&
!Algorithms.isEmpty(parentParentFulName)) {
if(parentParentFulName.contains("russia") || parentParentFulName.contains("japan")) {
parentFullName = parentParentFulName;
}
String locPrefix = fullNamesToLocaleNames.get(parentFullName);
String locName = fullNamesToLocaleNames.get(fullName);
if(locPrefix == null || locName == null) {
throw new IllegalStateException("There is no prefix registered for " + fullName + " (" + parentFullName + ") ");
}
fullNamesToLocaleNames.put(fullName, locPrefix + " " + locName);
fullNamesNoParentToLocaleNames.put(fullName, locName);
// don't add parent to index
// String index = fullNamesToLowercaseIndex.get(fullName);
// String prindex = fullNamesToLowercaseIndex.get(parentFullName);
// fullNamesToLowercaseIndex.put(fullName, index + " " + prindex);
}
}
}
private boolean isDownloadOfType(BinaryMapDataObject object, String type) { private boolean isDownloadOfType(BinaryMapDataObject object, String type) {
@ -433,10 +399,7 @@ public class OsmandRegions {
return false; return false;
} }
initTypes(object); initTypes(object);
String nm = object.getNameByType(downloadNameType); String nm = mapIndexFields.get(mapIndexFields.downloadNameType, object);
// if(nm != null) {
// System.out.println((c++) +" " + nm);
// }
if (!countriesByDownloadName.containsKey(nm)) { if (!countriesByDownloadName.containsKey(nm)) {
LinkedList<BinaryMapDataObject> ls = new LinkedList<BinaryMapDataObject>(); LinkedList<BinaryMapDataObject> ls = new LinkedList<BinaryMapDataObject>();
countriesByDownloadName.put(nm, ls); countriesByDownloadName.put(nm, ls);
@ -492,7 +455,7 @@ public class OsmandRegions {
private void initTypes(BinaryMapDataObject object) { private void initTypes(BinaryMapDataObject object) {
if (mapIndexFields == null) { if (mapIndexFields == null) {
mapIndexFields = new MapIndexFields(); mapIndexFields = new MapIndexFields();
mapIndexFields.mapIndex = object.getMapIndex(); // mapIndexFields.mapIndex = object.getMapIndex();
mapIndexFields.downloadNameType = object.getMapIndex().getRule(FIELD_DOWNLOAD_NAME, null); mapIndexFields.downloadNameType = object.getMapIndex().getRule(FIELD_DOWNLOAD_NAME, null);
mapIndexFields.nameType = object.getMapIndex().getRule(FIELD_NAME, null); mapIndexFields.nameType = object.getMapIndex().getRule(FIELD_NAME, null);
mapIndexFields.nameEnType = object.getMapIndex().getRule(FIELD_NAME_EN, null); mapIndexFields.nameEnType = object.getMapIndex().getRule(FIELD_NAME_EN, null);
@ -515,7 +478,7 @@ public class OsmandRegions {
Set<String> found = new TreeSet<String>(); Set<String> found = new TreeSet<String>();
for (BinaryMapDataObject b : cs) { for (BinaryMapDataObject b : cs) {
String nm = b.getNameByType(or.nameEnType); String nm = b.getNameByType(or.mapIndexFields.nameEnType);
if(nm == null) { if(nm == null) {
nm = b.getName(); nm = b.getName();
} }
@ -553,8 +516,8 @@ public class OsmandRegions {
public static class RegionData { public static class RegionData {
// filled by osmand regions
protected RegionData parent = null; protected RegionData parent = null;
// filled by osmand regions
protected String regionLeftHandDriving; protected String regionLeftHandDriving;
protected String regionLang; protected String regionLang;
protected String regionMetric; protected String regionMetric;
@ -564,13 +527,11 @@ public class OsmandRegions {
protected String regionName; protected String regionName;
protected String regionNameEn; protected String regionNameEn;
protected String regionNameLocale; protected String regionNameLocale;
protected String regionSearchText;
protected String regionDownloadName;
protected boolean regionMapDownload;
protected LatLon regionCenter;
///
String regionId;
private String downloadsId;
private String name;
private String searchText;
private LatLon center;
public String getLocaleName() { public String getLocaleName() {
if(!Algorithms.isEmpty(regionNameLocale)) { if(!Algorithms.isEmpty(regionNameLocale)) {
@ -583,13 +544,21 @@ public class OsmandRegions {
} }
public LatLon getCenter() { public LatLon getCenter() {
return center; return regionCenter;
} }
public String getSearchText() { public String getSearchText() {
return searchText; return regionSearchText;
} }
///TODO investigate do we need it ???
String regionId;
private String downloadsId;
private String name;
public String getName() { public String getName() {
return name; return name;
} }