persist prefs

diff --git a/index.html b/index.html
index e0af394940ab3cb08e3fb295c426965770fa8377..2864474d3ccb369ce1b9f3893fe7508ce206ed89 100644 (file)
--- a/index.html
+++ b/index.html
@@ -61,12 +61,18 @@
        onclick="saveTrack();">
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();"><br/>
+<input type="checkbox" id="trackCheckbox"
+       onchange="setTracking(this);">
+<label for="trackCheckbox">Enable tracking</label><br/>
+<input type="checkbox" id="centerCheckbox"
+       onchange="setCentering(this);">
+<label for="centerCheckbox">Center Map</label><br/>
 </fieldset>
 <input type="button" id="settingsButton" value="Settings"
        onclick="toggleSettings();"><br/>
 <fieldset id="settingsArea"><legend>Settings</legend>
 Map style:
-<select id="mapSelector" onclick="setMapStyle();">
+<select id="mapSelector" onchange="setMapStyle();">
 <!-- option value="osm_mapnik">OpenStreetMap (Mapnik)</option -->
 </select>
 </fieldset>

diff --git a/js/map.js b/js/map.js
index 221808094d238bfb89059ca9bf5a451282f17b0e..8e8ef55b0bff17c6a129e243b253ac0e63133bc9 100644 (file)
--- a/js/map.js
+++ b/js/map.js
@@ -74,10 +74,13 @@ var gLastMouseX = 0;
 var gLastMouseY = 0;
 var gZoomFactor;
 
-// Used as an associative array. They keys have to be strings, ours will be "xindex,yindex,zindex" e.g. "13,245,12".
+// Used as an associative array.
+// The keys have to be strings, ours will be "xindex,yindex,zindex" e.g. "13,245,12".
 var gTiles = {};
 var gLoadingTile;
 
+var gMapPrefsLoaded = false;
+
 var gDragging = false;
 var gZoomTouchID;
 
@@ -92,6 +95,41 @@ function initMap() {
   if (!gActiveMap)
     gActiveMap = "osm_mapnik";
 
+  var loopCnt = 0;
+  var getPersistentPrefs = function() {
+    if (mainDB) {
+      gPrefs.get("position", function(aValue) {
+        if (aValue) {
+          gPos = aValue;
+          drawMap();
+        }
+      });
+      gPrefs.get("center_map", function(aValue) {
+        if (aValue === undefined)
+          document.getElementById("centerCheckbox").checked = true;
+        else
+          document.getElementById("centerCheckbox").checked = aValue;
+        setCentering(document.getElementById("centerCheckbox"));
+      });
+      gPrefs.get("tracking_enabled", function(aValue) {
+        if (aValue === undefined)
+          document.getElementById("trackCheckbox").checked = true;
+        else
+          document.getElementById("trackCheckbox").checked = aValue;
+        setTracking(document.getElementById("trackCheckbox"));
+      });
+      gMapPrefsLoaded = true;
+    }
+    else
+      setTimeout(getPersistentPrefs, 100);
+    loopCnt++;
+    if (loopCnt > 20) {
+      gMapPrefsLoaded = true;
+      return;
+    }
+  };
+  getPersistentPrefs();
+
   gCanvas.addEventListener("mouseup", mapEvHandler, false);
   gCanvas.addEventListener("mousemove", mapEvHandler, false);
   gCanvas.addEventListener("mousedown", mapEvHandler, false);
@@ -233,14 +271,19 @@ function drawMap() {
   var xMax = gPos.x + wid / 2;
   var yMax = gPos.y + ht / 2;
 
-  // Go through all the tiles we want. If any of them aren't loaded or being loaded, do so.
+  if (gMapPrefsLoaded && mainDB)
+    gPrefs.set("position", gPos);
+
+  // Go through all the tiles we want.
+  // If any of them aren't loaded or being loaded, do so.
   for (var x = Math.floor(xMin / size); x < Math.ceil(xMax / size); x++) {
     for (var y = Math.floor(yMin / size); y < Math.ceil(yMax / size); y++) {
       var xoff = (x * size - xMin) / gZoomFactor;
       var yoff = (y * size - yMin) / gZoomFactor;
       var tileKey = encodeIndex(x, y, gPos.z);
       if (gTiles[tileKey] && gTiles[tileKey].complete) {
-        // Round here is **CRUICIAL** otherwise the images are filtered and the performance sucks (more than expected).
+        // Round here is **CRUCIAL** otherwise the images are filtered
+        // and the performance sucks (more than expected).
         gContext.drawImage(gTiles[tileKey], Math.round(xoff), Math.round(yoff));
       }
       else {
@@ -394,8 +437,10 @@ var geofake = {
     this.tracking = true;
     var watchCall = function() {
       aSuccessCallback({timestamp: Date.now(),
-                        coords: {latitude: 48.208174, // + Math.random() - .5,
-                                 longitude: 16.373819, // + Math.random() - .5,
+                        coords: {latitude: 48.208174 +
+                                           (Math.random() - .5) / 5,
+                                 longitude: 16.373819 +
+                                            (Math.random() - .5) / 5,
                                  accuracy: 20}});
       if (geofake.tracking)
         setTimeout(watchCall, 1000);
@@ -408,6 +453,21 @@ var geofake = {
   }
 }
 
+function setCentering(aCheckbox) {
+  if (gMapPrefsLoaded && mainDB)
+    gPrefs.set("center_map", aCheckbox.checked);
+  gCenterPosition = aCheckbox.checked;
+}
+
+function setTracking(aCheckbox) {
+  if (gMapPrefsLoaded && mainDB)
+    gPrefs.set("tracking_enabled", aCheckbox.checked);
+  if (aCheckbox.checked)
+    startTracking();
+  else
+    endTracking();
+}
+
 function startTracking() {
   var loopCnt = 0;
   var getStoredTrack = function() {
@@ -437,7 +497,8 @@ function startTracking() {
         gTrackStore.push(tPoint);
         drawTrackPoint(position.coords.latitude, position.coords.longitude);
         if (gCenterPosition) {
-          var posCoord = gps2xy(position.coords.latitude, position.coords.longitude);
+          var posCoord = gps2xy(position.coords.latitude,
+                                position.coords.longitude);
           if (Math.abs(gPos.x - posCoord.x) > gCanvas.width * gZoomFactor / 4 ||
               Math.abs(gPos.y - posCoord.y) > gCanvas.height * gZoomFactor / 4) {
             gPos.x = posCoord.x;
@@ -458,6 +519,7 @@ function startTracking() {
 
 function endTracking() {
   if (gGeoWatchID) {
+    //geofake.clearWatch(gGeoWatchID);
     navigator.geolocation.clearWatch(gGeoWatchID);
   }
 }

diff --git a/js/ui.js b/js/ui.js
index 9f2f1fe0d0d0f900cdc49540fd29482d2085452b..9eff69350098f5a863c81f7abc757f10e9bfef58 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -51,7 +51,6 @@ window.onload = function() {
   initDB();
   initMap();
   resizeAndDraw();
-  startTracking();
 }
 
 window.onresize = function() {
@@ -168,7 +167,7 @@ var gPrefs = {
     var transaction = mainDB.transaction([this.objStore],
                                          IDBTransaction.READ_WRITE);
     var objStore = transaction.objectStore(this.objStore);
-    var request = objStore.add(aValue, aKey);
+    var request = objStore.put(aValue, aKey);
     request.onsuccess = function(event) {
       success = true;
       if (aCallback)