From 48dd98413b6a910664b20b563a2de99d04385941 Mon Sep 17 00:00:00 2001 From: Pavol Zibrita Date: Wed, 5 Sep 2012 07:55:08 +0200 Subject: [PATCH 1/5] fix ' --- OsmAnd/res/values-fr/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 82cb18312b..c67b7906d8 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1,6 +1,6 @@ Modifications hors ligne - Toujours utiliser l'édition hors ligne + Toujours utiliser l\'édition hors ligne Changements en 0.7.1 : \n\t- Modification hors ligne des PI \n\t- Option de suivi en ligne - envoyer ses coordonnées à un service web de façon périodique (lire la configuration dans les articles HowTo) @@ -165,7 +165,7 @@ Emplacement actuel… Dernière vue Recherche autour de : - Rechercher autour d'ici + Rechercher autour d\'ici Changement pour 0.6.7 : \n\t- Gestionaire de données hors ligne (téléchargement, suppression, sauvegarde des données hors ligne directement dans OsmAnd) \n\t- Favoris et groupes (categorisation, suppression, gestion) @@ -1001,7 +1001,7 @@ Désactiver mode veille Activer mode veille L\'écran est verrouillé - Positionner l'intervalle d\'activation : + Positionner l\'intervalle d\'activation : Démarrer\n suivi en ligne Arrêter\n suivi en ligne Configurer l\'écran From e7153f1a419d2d9697916d5162a99f8cc9cb1e88 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 5 Sep 2012 09:29:31 +0200 Subject: [PATCH 2/5] Issue 1346 --- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index f733747089..412a0cea83 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -880,7 +880,6 @@ public class OsmandSettings { return new File(getExternalStorageDirectory(), path); } - // This value is a key for saving last known location shown on the map public static final String LAST_KNOWN_MAP_LAT = "last_known_map_lat"; //$NON-NLS-1$ public static final String LAST_KNOWN_MAP_LON = "last_known_map_lon"; //$NON-NLS-1$ @@ -1193,7 +1192,6 @@ public class OsmandSettings { return globalPreferences.edit().putString(LAST_SEARCHED_INTERSECTED_STREET, street).commit(); } - public static final String SELECTED_POI_FILTER_FOR_MAP = "selected_poi_filter_for_map"; //$NON-NLS-1$ public boolean setPoiFilterForMap(String filterId) { @@ -1208,7 +1206,6 @@ public class OsmandSettings { } return new PoiFilter(null, application); } - public static final String VOICE_PROVIDER_NOT_USE = "VOICE_PROVIDER_NOT_USE"; // this value string is synchronized with settings_pref.xml preference name @@ -1216,7 +1213,11 @@ public class OsmandSettings { // this value string is synchronized with settings_pref.xml preference name public final OsmandPreference USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache(); - + { + //Issue 1346 + USE_COMPASS_IN_NAVIGATION.setModeDefaultValue(ApplicationMode.CAR, false); + } + // this value string is synchronized with settings_pref.xml preference name public final CommonPreference RENDERER = new StringPreference("renderer", RendererRegistry.DEFAULT_RENDER) { { From fa46800c2cba5b3864d3b00adbb61ca45494a2ec Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 5 Sep 2012 13:12:25 +0200 Subject: [PATCH 3/5] try fix error with setting save_track_interval and live_monitoring_interval --- .../src/net/osmand/plus/activities/LiveMonitoringHelper.java | 4 +++- OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java b/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java index 88ccaa0e17..512513421e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java @@ -39,7 +39,9 @@ public class LiveMonitoringHelper { } public void insertData(double lat, double lon, double alt, double speed, double hdop, long time, OsmandSettings settings){ - if (time - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get() * 1000) { + //* 1000 in next line seems to be wrong with new IntervalChooseDialog + //if (time - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get() * 1000) { + if (time - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get()) { LiveMonitoringData data = new LiveMonitoringData((float)lat, (float)lon,(float) alt,(float) speed,(float) hdop, time ); new LiveSender().execute(data); lastTimeUpdated = time; diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java index 31eb1bbdc6..599fc806fa 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java @@ -268,7 +268,9 @@ public class SavingTrackHelper extends SQLiteOpenHelper { } public void insertData(double lat, double lon, double alt, double speed, double hdop, long time, OsmandSettings settings){ - if ((time - lastTimeUpdated > settings.SAVE_TRACK_INTERVAL.get() * 1000)) { + //* 1000 in next line seems to be wrong with new IntervalChooseDialog + //if (time - lastTimeUpdated > settings.SAVE_TRACK_INTERVAL.get() * 1000) { + if (time - lastTimeUpdated > settings.SAVE_TRACK_INTERVAL.get()) { execWithClose(updateScript, new Object[] { lat, lon, alt, speed, hdop, time }); boolean newSegment = false; if (lastPoint == null || (time - lastTimeUpdated) > 180 * 1000) { From bbb52824b832c48498173811c3341dcf36c48923 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 5 Sep 2012 13:28:49 +0200 Subject: [PATCH 4/5] fix build --- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 412a0cea83..5566ea26b7 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -1212,7 +1212,8 @@ public class OsmandSettings { public final OsmandPreference VOICE_PROVIDER = new StringPreference("voice_provider", null).makeProfile(); // this value string is synchronized with settings_pref.xml preference name - public final OsmandPreference USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache(); + //public final OsmandPreference USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache(); + public final CommonPreference USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache(); { //Issue 1346 USE_COMPASS_IN_NAVIGATION.setModeDefaultValue(ApplicationMode.CAR, false); From c2f6506a2cce2853081edbf037466311b22319a4 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 5 Sep 2012 13:44:47 +0200 Subject: [PATCH 5/5] fix default values --- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 5566ea26b7..e252ae3539 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -606,18 +606,18 @@ public class OsmandSettings { public final OsmandPreference AVOID_FERRIES = new BooleanPreference("avoid_ferries", false).makeGlobal().cache(); // this value string is synchronized with settings_pref.xml preference name - public final CommonPreference SAVE_TRACK_INTERVAL = new IntPreference("save_track_interval", 5).makeProfile(); + public final CommonPreference SAVE_TRACK_INTERVAL = new IntPreference("save_track_interval", 5000).makeProfile(); { - SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.CAR, 5); - SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.BICYCLE, 10); - SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 20); + SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.CAR, 5000); + SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.BICYCLE, 10000); + SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 20000); } // this value string is synchronized with settings_pref.xml preference name public final CommonPreference LIVE_MONITORING = new BooleanPreference("live_monitoring", false).makeGlobal(); // this value string is synchronized with settings_pref.xml preference name - public final CommonPreference LIVE_MONITORING_INTERVAL = new IntPreference("live_monitoring_interval", 5).makeGlobal(); + public final CommonPreference LIVE_MONITORING_INTERVAL = new IntPreference("live_monitoring_interval", 5000).makeGlobal(); // this value string is synchronized with settings_pref.xml preference name public final CommonPreference LIVE_MONITORING_URL = new StringPreference("live_monitoring_url",