summaryrefslogtreecommitdiffstats
path: root/subsurface-core
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-14 09:10:06 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-14 09:10:06 -0800
commit76d07635270bb3068b7d9a559b481d3c094f0d7b (patch)
treecd507fe34e03b8c5cc2c10e9d991a50f44635d9e /subsurface-core
parent24404a401d5a21134b153000fffc74bd429a0631 (diff)
downloadsubsurface-76d07635270bb3068b7d9a559b481d3c094f0d7b.tar.gz
Location service: make distance and time threshold configurable
Right now the distance is always in meters, the mobile app doesn't deal with units at all, anyway. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core')
-rw-r--r--subsurface-core/pref.h2
-rw-r--r--subsurface-core/qthelper.cpp7
-rw-r--r--subsurface-core/subsurfacestartup.c4
3 files changed, 12 insertions, 1 deletions
diff --git a/subsurface-core/pref.h b/subsurface-core/pref.h
index 9f5f587e2..348dcfbf2 100644
--- a/subsurface-core/pref.h
+++ b/subsurface-core/pref.h
@@ -123,6 +123,8 @@ struct preferences {
geocoding_prefs_t geocoding;
enum deco_mode deco_mode;
short conservatism_level;
+ int time_threshold;
+ int distance_threshold;
};
enum unit_system_values {
METRIC,
diff --git a/subsurface-core/qthelper.cpp b/subsurface-core/qthelper.cpp
index 63248f6c4..c1205ce6f 100644
--- a/subsurface-core/qthelper.cpp
+++ b/subsurface-core/qthelper.cpp
@@ -1601,6 +1601,13 @@ void loadPreferences()
// Subsurface webservice id is stored outside of the groups
GET_TXT("subsurface_webservice_uid", userid);
+ // but the related time / distance threshold (only used in the mobile app)
+ // are in their own group
+ s.beginGroup("locationService");
+ GET_INT("distance_threshold", distance_threshold);
+ GET_INT("time_threshold", time_threshold);
+ s.endGroup();
+
// GeoManagement
s.beginGroup("geocoding");
#ifdef DISABLED
diff --git a/subsurface-core/subsurfacestartup.c b/subsurface-core/subsurfacestartup.c
index 13cbbfa3f..5b3dfa8c1 100644
--- a/subsurface-core/subsurfacestartup.c
+++ b/subsurface-core/subsurfacestartup.c
@@ -79,7 +79,9 @@ struct preferences default_prefs = {
.category = { 0 }
},
.deco_mode = BUEHLMANN,
- .conservatism_level = 3
+ .conservatism_level = 3,
+ .distance_threshold = 1000,
+ .time_threshold = 600
};
int run_survey;