From 45410f6ed0c82b8c4327dc3b47e09f60890bdba7 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Jul 2010 11:16:02 +0000 Subject: [PATCH] final fixes for 0.2.1 git-svn-id: https://osmand.googlecode.com/svn/trunk@298 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8 --- DataExtractionOSM/src/com/osmand/ToDoConstants.java | 5 +++-- OsmAnd/res/values/strings.xml | 8 ++++---- OsmAnd/src/com/osmand/activities/MainMenuActivity.java | 2 +- OsmAnd/src/com/osmand/activities/SavingTrackHelper.java | 2 +- OsmAnd/src/com/osmand/activities/SettingsActivity.java | 1 + .../com/osmand/activities/search/SearchPOIActivity.java | 7 ++++--- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/DataExtractionOSM/src/com/osmand/ToDoConstants.java b/DataExtractionOSM/src/com/osmand/ToDoConstants.java index 5ad6364187..64015de9cd 100644 --- a/DataExtractionOSM/src/com/osmand/ToDoConstants.java +++ b/DataExtractionOSM/src/com/osmand/ToDoConstants.java @@ -13,10 +13,11 @@ public class ToDoConstants { */ public int DESCRIBE_ABOUT_AUTHORS = 8; + // pinch zoom, fix bugs with test data - // TODO ANDROID - // Prepare update v 0.2.1: screenshots, // android description, sites(osmand/wiki), US/canada indexes & poi/transport.index + // TODO ANDROID + // Prepare update v 0.2.1: screenshots, android description, sites(osmand/wiki), US/canada indexes & poi/transport.index // 61. Provide route information for YOURS (calclate turns/angle/expected time). // Fix some missing turns in CloudMade (for secondary roads wo name). Add them (if dist to prev/next turn > 150m) [dacha] diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index e3ea578c6c..3f5b3c453d 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -156,13 +156,13 @@ See osmand.googlecode.com. Choose street Choose city Choose country - Choose postion on the map + Choose position on the map Position on the map Specify point - Show aspect of vew based on compass + Show aspect of view based on compass Show aspect of view - Unmark location - Mark location + Clear point + Mark point Enable 3D view of the map Map View 3D Rotate map to bearing of your direction diff --git a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java index 261689e162..a425cc264e 100644 --- a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java +++ b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java @@ -49,7 +49,7 @@ public class MainMenuActivity extends Activity { public void startApplication(){ if(!applicationAlreadyStarted){ - + // Algoritms.removeAllFiles(new File(Environment.getExternalStorageDirectory(), "/osmand/tiles/Mapnik/18")); final ProgressDialog dlg = ProgressDialog.show(this, getString(R.string.loading_data), getString(R.string.reading_indexes), true); final ProgressDialogImplementation impl = new ProgressDialogImplementation(dlg); impl.setRunnable("Initializing app", new Runnable(){ //$NON-NLS-1$ diff --git a/OsmAnd/src/com/osmand/activities/SavingTrackHelper.java b/OsmAnd/src/com/osmand/activities/SavingTrackHelper.java index 9aaea2f91b..31a8c2fbc1 100644 --- a/OsmAnd/src/com/osmand/activities/SavingTrackHelper.java +++ b/OsmAnd/src/com/osmand/activities/SavingTrackHelper.java @@ -154,7 +154,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { file.mkdirs(); if (file.exists()) { Cursor query = db.rawQuery("SELECT " + TRACK_COL_LAT + "," + TRACK_COL_LON + "," + TRACK_COL_ALTITUDE + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - + TRACK_COL_SPEED + "," + TRACK_COL_DATE + " FROM " + TRACK_NAME, null); //$NON-NLS-1$ //$NON-NLS-2$ + + TRACK_COL_SPEED + "," + TRACK_COL_DATE + " FROM " + TRACK_NAME +" ORDER BY " + TRACK_COL_DATE +" ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ long previousTime = 0; Map>> data = new LinkedHashMap>>(); List segment = new ArrayList(); diff --git a/OsmAnd/src/com/osmand/activities/SettingsActivity.java b/OsmAnd/src/com/osmand/activities/SettingsActivity.java index 57d9c35a54..30696d0a44 100644 --- a/OsmAnd/src/com/osmand/activities/SettingsActivity.java +++ b/OsmAnd/src/com/osmand/activities/SettingsActivity.java @@ -336,6 +336,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference if(preset == ApplicationMode.CAR){ edit.putBoolean(OsmandSettings.USE_INTERNET_TO_DOWNLOAD_TILES, true); // edit.putBoolean(OsmandSettings.SHOW_POI_OVER_MAP, _); + edit.putBoolean(OsmandSettings.SHOW_TRANSPORT_OVER_MAP, false); edit.putBoolean(OsmandSettings.ROTATE_MAP_TO_BEARING, true); edit.putBoolean(OsmandSettings.SHOW_VIEW_ANGLE, false); edit.putBoolean(OsmandSettings.AUTO_ZOOM_MAP, true); diff --git a/OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java b/OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java index fdf2ffa4f0..e236497ed4 100644 --- a/OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/com/osmand/activities/search/SearchPOIActivity.java @@ -65,7 +65,8 @@ public class SearchPOIActivity extends ListActivity implements LocationListener, public static final String SEARCH_LON = "com.osmand.am_search_lon"; //$NON-NLS-1$ private static final int GPS_TIMEOUT_REQUEST = 2000; private static final int GPS_DIST_REQUEST = 5; - + private static final int MIN_DISTANCE_TO_RESEARCH = 70; + private static final int MIN_DISTANCE_TO_UPDATE = 6; private Button searchPOILevel; @@ -164,10 +165,10 @@ public class SearchPOIActivity extends ListActivity implements LocationListener, searchPOILevel.setEnabled(filter.isSearchFurtherAvailable()); searchArea.setText(filter.getSearchArea()); handled = true; - } else if (searchedLocation != null && l.distanceTo(searchedLocation) > 80) { + } else if (searchedLocation != null && l.distanceTo(searchedLocation) > MIN_DISTANCE_TO_RESEARCH) { amenityAdapter.setNewModel(filter.searchAgain(l.getLatitude(), l.getLongitude())); handled = true; - } else if(location.distanceTo(l) > 6){ + } else if(location.distanceTo(l) > MIN_DISTANCE_TO_UPDATE){ handled = true; } } else {