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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2012-09-05 20:00:11 +02:00
commit f7576c8247
4 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/values-fr/strings.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<resources><string name="offline_edition">Modifications hors ligne</string> <resources><string name="offline_edition">Modifications hors ligne</string>
<string name="offline_edition_descr">Toujours utiliser l'édition hors ligne</string> <string name="offline_edition_descr">Toujours utiliser l\'édition hors ligne</string>
<string name="tip_recent_changes_0_7_1_t">Changements en 0.7.1 : <string name="tip_recent_changes_0_7_1_t">Changements en 0.7.1 :
\n\t- Modification hors ligne des PI \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) \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 @@
<string name="search_position_current_location">Emplacement actuel…</string> <string name="search_position_current_location">Emplacement actuel…</string>
<string name="search_position_map_view">Dernière vue</string> <string name="search_position_map_view">Dernière vue</string>
<string name="select_search_position">Recherche autour de :</string> <string name="select_search_position">Recherche autour de :</string>
<string name="context_menu_item_search">Rechercher autour d'ici</string> <string name="context_menu_item_search">Rechercher autour d\'ici</string>
<string name="tip_recent_changes_0_6_7_t">Changement pour 0.6.7 : <string name="tip_recent_changes_0_6_7_t">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- 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) \n\t- Favoris et groupes (categorisation, suppression, gestion)
@ -1001,7 +1001,7 @@
<string name="bg_service_sleep_mode_off">Désactiver mode veille</string> <string name="bg_service_sleep_mode_off">Désactiver mode veille</string>
<string name="bg_service_sleep_mode_on">Activer mode veille</string> <string name="bg_service_sleep_mode_on">Activer mode veille</string>
<string name="bg_service_screen_lock_toast">L\'écran est verrouillé</string> <string name="bg_service_screen_lock_toast">L\'écran est verrouillé</string>
<string name="bg_service_interval">Positionner l'intervalle d\'activation :</string> <string name="bg_service_interval">Positionner l\'intervalle d\'activation :</string>
<string name="live_monitoring_mode_off">Démarrer\n suivi en ligne</string> <string name="live_monitoring_mode_off">Démarrer\n suivi en ligne</string>
<string name="live_monitoring_mode_on">Arrêter\n suivi en ligne</string> <string name="live_monitoring_mode_on">Arrêter\n suivi en ligne</string>
<string name="layer_map_appearance">Configurer l\'écran</string> <string name="layer_map_appearance">Configurer l\'écran</string>

22
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -606,18 +606,18 @@ public class OsmandSettings {
public final OsmandPreference<Boolean> AVOID_FERRIES = new BooleanPreference("avoid_ferries", false).makeGlobal().cache(); public final OsmandPreference<Boolean> AVOID_FERRIES = new BooleanPreference("avoid_ferries", false).makeGlobal().cache();
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final CommonPreference<Integer> SAVE_TRACK_INTERVAL = new IntPreference("save_track_interval", 5).makeProfile(); public final CommonPreference<Integer> SAVE_TRACK_INTERVAL = new IntPreference("save_track_interval", 5000).makeProfile();
{ {
SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.CAR, 5); SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.CAR, 5000);
SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.BICYCLE, 10); SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.BICYCLE, 10000);
SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 20); SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 20000);
} }
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final CommonPreference<Boolean> LIVE_MONITORING = new BooleanPreference("live_monitoring", false).makeGlobal(); public final CommonPreference<Boolean> LIVE_MONITORING = new BooleanPreference("live_monitoring", false).makeGlobal();
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final CommonPreference<Integer> LIVE_MONITORING_INTERVAL = new IntPreference("live_monitoring_interval", 5).makeGlobal(); public final CommonPreference<Integer> LIVE_MONITORING_INTERVAL = new IntPreference("live_monitoring_interval", 5000).makeGlobal();
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final CommonPreference<String> LIVE_MONITORING_URL = new StringPreference("live_monitoring_url", public final CommonPreference<String> LIVE_MONITORING_URL = new StringPreference("live_monitoring_url",
@ -880,7 +880,6 @@ public class OsmandSettings {
return new File(getExternalStorageDirectory(), path); return new File(getExternalStorageDirectory(), path);
} }
// This value is a key for saving last known location shown on the map // 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_LAT = "last_known_map_lat"; //$NON-NLS-1$
public static final String LAST_KNOWN_MAP_LON = "last_known_map_lon"; //$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(); 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 static final String SELECTED_POI_FILTER_FOR_MAP = "selected_poi_filter_for_map"; //$NON-NLS-1$
public boolean setPoiFilterForMap(String filterId) { public boolean setPoiFilterForMap(String filterId) {
@ -1208,15 +1206,19 @@ public class OsmandSettings {
} }
return new PoiFilter(null, application); return new PoiFilter(null, application);
} }
public static final String VOICE_PROVIDER_NOT_USE = "VOICE_PROVIDER_NOT_USE"; public static final String VOICE_PROVIDER_NOT_USE = "VOICE_PROVIDER_NOT_USE";
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<String> VOICE_PROVIDER = new StringPreference("voice_provider", null).makeProfile(); public final OsmandPreference<String> VOICE_PROVIDER = new StringPreference("voice_provider", null).makeProfile();
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<Boolean> USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache(); //public final OsmandPreference<Boolean> USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache();
public final CommonPreference<Boolean> 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 // this value string is synchronized with settings_pref.xml preference name
public final CommonPreference<String> RENDERER = new StringPreference("renderer", RendererRegistry.DEFAULT_RENDER) { public final CommonPreference<String> RENDERER = new StringPreference("renderer", RendererRegistry.DEFAULT_RENDER) {
{ {

4
OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java
View file

@ -39,7 +39,9 @@ public class LiveMonitoringHelper {
} }
public void insertData(double lat, double lon, double alt, double speed, double hdop, long time, OsmandSettings settings){ 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 ); LiveMonitoringData data = new LiveMonitoringData((float)lat, (float)lon,(float) alt,(float) speed,(float) hdop, time );
new LiveSender().execute(data); new LiveSender().execute(data);
lastTimeUpdated = time; lastTimeUpdated = time;

4
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -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){ 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 }); execWithClose(updateScript, new Object[] { lat, lon, alt, speed, hdop, time });
boolean newSegment = false; boolean newSegment = false;
if (lastPoint == null || (time - lastTimeUpdated) > 180 * 1000) { if (lastPoint == null || (time - lastTimeUpdated) > 180 * 1000) {