From 687096c1ed7a6f56caf6691b5c86defeeeb98a66 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 19 Jun 2010 22:13:45 +0000 Subject: [PATCH] small bugfix git-svn-id: https://osmand.googlecode.com/svn/trunk@182 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8 --- .../src/com/osmand/ToDoConstants.java | 16 ++++----- .../com/osmand/RegionAddressRepository.java | 3 ++ .../com/osmand/activities/RoutingHelper.java | 33 ------------------- .../search/SearchAddressActivity.java | 5 +++ 4 files changed, 14 insertions(+), 43 deletions(-) diff --git a/DataExtractionOSM/src/com/osmand/ToDoConstants.java b/DataExtractionOSM/src/com/osmand/ToDoConstants.java index 39b0c3cbf1..4b021de391 100644 --- a/DataExtractionOSM/src/com/osmand/ToDoConstants.java +++ b/DataExtractionOSM/src/com/osmand/ToDoConstants.java @@ -49,6 +49,7 @@ public class ToDoConstants { // FUTURE RELEASES + // 49. Calculate route from specified point (not from your location only) // 48. Enable change favourite point (for example fav - "car") means last point you left car. It is not static point. // 43. Enable poi filter by name (?) // 44. Show gps status (possibly open existing gps-compass app (free) or suggest to install it - no sense to write own activity) @@ -70,21 +71,16 @@ public class ToDoConstants { // TODO swing - // 4. Fix issues with big files (such as netherlands) - save memory (!) - very slow due to transport index ! - // Current result : for big file (1 - task 60-80% time, 90% memory) // 1. Download tiles without using dir tiles (?) - // 5. Improve address indexing (use relations). - // Use relation "postal_code" to assign postcodes, use relation "a6" (to accumulate streets!), - // "a3" to read all cities & define boundaries for city (& define that street in city). + // 9. Fix issues with big files (such as netherlands) - save memory (!) - very slow due to transport index ! + // Current result : for big file (1 - task 60-80% time, 90% memory) + // 10. Improve address indexing (use relations). + // use relation "a6" (to accumulate streets!), "a3" to read all cities & define boundaries for city (& define that street in city). // BUGS Swing // DONE ANDROID : - // 36. Postcode search - // 8. Enable change POI directly on map (requires OSM login) - // 45. Autozoom feature (for car navigation) - // 44. Introduce settings presets (car/bicycle/pedestrian/default) - show different icons for car (bigger), possibly change fonts, position - // 20. Implement save track/route to gpx + // DONE SWING diff --git a/OsmAnd/src/com/osmand/RegionAddressRepository.java b/OsmAnd/src/com/osmand/RegionAddressRepository.java index d2acf562d8..fb3c711522 100644 --- a/OsmAnd/src/com/osmand/RegionAddressRepository.java +++ b/OsmAnd/src/com/osmand/RegionAddressRepository.java @@ -86,6 +86,9 @@ public class RegionAddressRepository { public boolean areCitiesPreloaded(){ return !cities.isEmpty(); } + public boolean arePostcodesPreloaded(){ + return !postCodes.isEmpty(); + } public PostCode getPostcode(String name){ if(name == null){ diff --git a/OsmAnd/src/com/osmand/activities/RoutingHelper.java b/OsmAnd/src/com/osmand/activities/RoutingHelper.java index 11416a0d3e..035e13161b 100644 --- a/OsmAnd/src/com/osmand/activities/RoutingHelper.java +++ b/OsmAnd/src/com/osmand/activities/RoutingHelper.java @@ -56,39 +56,6 @@ public class RoutingHelper { // } // static { // addTestLocation(53.83330108605482, 27.590844306640605); -// addTestLocation(53.83319978227928, 27.580802116088847); -// addTestLocation(53.83319978227928, 27.57196155517576); -// addTestLocation(53.833149130299624, 27.563893470458964); -// addTestLocation(53.8330984782587, 27.55651203124998); -// addTestLocation(53.83340238958535, 27.551448020629863); -// addTestLocation(53.834263459701916, 27.543208274536113); -// addTestLocation(53.835428408740796, 27.53325191467283); -// addTestLocation(53.83598554682643, 27.531964454345683); -// addTestLocation(53.83654267750025, 27.532221946411113); -// addTestLocation(53.836441381565386, 27.533166083984355); -// addTestLocation(53.8341621582541, 27.53325191467283); -// addTestLocation(53.83016055507444, 27.533595237426738); -// addTestLocation(53.82696912916281, 27.533938560180644); -// addTestLocation(53.8255506396008, 27.53376689880369); -// addTestLocation(53.82119354992355, 27.531706962280253); -// addTestLocation(53.817646747077355, 27.53050533264158); -// addTestLocation(53.81156581517512, 27.529389533691386); -// addTestLocation(53.81404896894648, 27.5300761791992); -// addTestLocation(53.80994408432531, 27.529217872314433); -// addTestLocation(53.8062949605079, 27.529217872314433); -// addTestLocation(53.80203724791403, 27.529132041625957); -// addTestLocation(53.794838702875424, 27.52878871887205); -// addTestLocation(53.79052912343052, 27.52758708923338); -// addTestLocation(53.77922071028288, 27.524497184448222); -// addTestLocation(53.76714827905046, 27.520978126220683); -// addTestLocation(53.756138036056214, 27.515914115600566); -// addTestLocation(53.75121547304873, 27.51385417907713); -// addTestLocation(53.74745972778275, 27.513425025634746); -// addTestLocation(53.74284071585075, 27.51402584045408); -// addTestLocation(53.738373496098994, 27.514884147338847); -// addTestLocation(53.735175081196715, 27.516257438354472); -// addTestLocation(53.711966594109235, 27.519604835205058); -// addTestLocation(53.70769930787764, 27.520463142089824); // addTestLocation(53.69992563864831, 27.52381053894041); // addTestLocation(53.69728328030487, 27.521235618286113); // } diff --git a/OsmAnd/src/com/osmand/activities/search/SearchAddressActivity.java b/OsmAnd/src/com/osmand/activities/search/SearchAddressActivity.java index 204c330646..5e9ce8c323 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchAddressActivity.java +++ b/OsmAnd/src/com/osmand/activities/search/SearchAddressActivity.java @@ -320,10 +320,15 @@ public class SearchAddressActivity extends Activity { if (region != null) { Long cityId = OsmandSettings.getLastSearchedCity(this); + String postcode = OsmandSettings.getLastSearchedPostcode(this); if (!region.areCitiesPreloaded()) { progressMsg = "Loading cities..."; + } else if (postcode != null && !region.arePostcodesPreloaded()) { + progressMsg = "Loading postcodes..."; } else if (cityId != -1 && region.getCityById(cityId) != null && region.getCityById(cityId).isEmptyWithStreets()) { progressMsg = "Loading streets/buildings..."; + } else if (postcode != null && region.getPostcode(postcode) != null && region.getPostcode(postcode).isEmptyWithStreets()) { + progressMsg = "Loading streets/buildings..."; } else if (OsmandSettings.usingEnglishNames(this) != region.useEnglishNames()) { progressMsg = "Converting native/english names..."; }