improve debugging, make geofake do dmaller tracks, use correct GPX MIME type, add...

diff --git a/index.html b/index.html
index 4f8643bf15df7715647524de56d7d1270f7e9cc1..c7a4f62edcfd4fcb11ac03f121f1a75b717f35a5 100644 (file)
--- a/index.html
+++ b/index.html
@@ -26,6 +26,8 @@
 <fieldset id="trackArea"><legend>Track</legend>
 <input type="button" id="saveTrackButton" value="Save"
        onclick="saveTrack();">
 <fieldset id="trackArea"><legend>Track</legend>
 <input type="button" id="saveTrackButton" value="Save"
        onclick="saveTrack();">

+<input type="button" id="dumpTrackButton" value="Dump"
+       onclick="saveTrackDump();" class="debugHide">

 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();"><br/>
 <input type="checkbox" id="trackCheckbox"
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();"><br/>
 <input type="checkbox" id="trackCheckbox"


@@ -49,7 +51,7 @@ Map style:
   Please use a browser that supports &lt;canvas&gt; elements.
 </canvas>
 
   Please use a browser that supports &lt;canvas&gt; elements.
 </canvas>
 

-<p id="debug"></p>
+<p id="debug" class="debugHide"></p>

 <p id="copyright"></p>
 
 </body>
 <p id="copyright"></p>
 
 </body>

diff --git a/js/map.js b/js/map.js
index 8ebb14a88416e31d86ec64ca5117a2b524cffb50..cb659f9d2f6f81967557b57fca08fd39017d3de2 100644 (file)
--- a/js/map.js
+++ b/js/map.js
@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 

-var gCanvas, gContext;
+var gCanvas, gContext, gGeolocation;
+var gDebug = false;

 
 var gTileSize = 256;
 var gMaxZoom = 18; // The minimum is 0.
 
 var gTileSize = 256;
 var gMaxZoom = 18; // The minimum is 0.


@@ -49,7 +50,7 @@ var gLoadingTile;
 var gMapPrefsLoaded = false;
 
 var gDragging = false;
 var gMapPrefsLoaded = false;
 
 var gDragging = false;

-var gZoomTouchID;
+var gDragTouchID;

 
 var gGeoWatchID;
 var gTrack = [];
 
 var gGeoWatchID;
 var gTrack = [];


@@ -57,11 +58,22 @@ var gLastTrackPoint;
 var gCenterPosition = true;
 
 function initMap() {
 var gCenterPosition = true;
 
 function initMap() {

+  gGeolocation = navigator.geolocation;

   gCanvas = document.getElementById("map");
   gContext = gCanvas.getContext("2d");
   if (!gActiveMap)
     gActiveMap = "osm_mapnik";
 
   gCanvas = document.getElementById("map");
   gContext = gCanvas.getContext("2d");
   if (!gActiveMap)
     gActiveMap = "osm_mapnik";
 

+  //gDebug = true;
+  if (gDebug) {
+    gGeolocation = geofake;
+    var hiddenList = document.getElementsByClassName("debugHide");
+    // last to first - list of elements with that class is changing!
+    for (var i = hiddenList.length - 1; i >= 0; i--) {
+      hiddenList[i].classList.remove("debugHide");
+    }
+  }
+

   var loopCnt = 0;
   var getPersistentPrefs = function() {
     if (mainDB) {
   var loopCnt = 0;
   var getPersistentPrefs = function() {
     if (mainDB) {


@@ -308,21 +320,21 @@ var mapEvHandler = {
         return;
 
       // Bail out if the started touch can't be found.
         return;
 
       // Bail out if the started touch can't be found.

-      if (touchEvent && zoomstart &&
-          !aEvent.changedTouches.identifiedTouch(gZoomTouchID))
+      if (touchEvent && gDragging &&
+          !aEvent.changedTouches.identifiedTouch(gDragTouchID))

         return;
     }
 
     var coordObj = touchEvent ?
         return;
     }
 
     var coordObj = touchEvent ?

-                   aEvent.changedTouches.identifiedTouch(gZoomTouchID) :
+                   aEvent.changedTouches.identifiedTouch(gDragTouchID) :

                    aEvent;
 
     switch (aEvent.type) {
       case "mousedown":
       case "touchstart":
         if (touchEvent) {
                    aEvent;
 
     switch (aEvent.type) {
       case "mousedown":
       case "touchstart":
         if (touchEvent) {

-          zoomTouchID = aEvent.changedTouches.item(0).identifier;
-          coordObj = aEvent.changedTouches.identifiedTouch(gZoomTouchID);
+          gDragTouchID = aEvent.changedTouches.item(0).identifier;
+          coordObj = aEvent.changedTouches.identifiedTouch(gDragTouchID);

         }
         var x = coordObj.clientX - gCanvas.offsetLeft;
         var y = coordObj.clientY - gCanvas.offsetTop;
         }
         var x = coordObj.clientX - gCanvas.offsetLeft;
         var y = coordObj.clientY - gCanvas.offsetTop;


@@ -400,14 +412,24 @@ var mapEvHandler = {
 
 var geofake = {
   tracking: false,
 
 var geofake = {
   tracking: false,

+  lastPos: {x: undefined, y: undefined},

   watchPosition: function(aSuccessCallback, aErrorCallback, aPrefObject) {
     this.tracking = true;
     var watchCall = function() {
   watchPosition: function(aSuccessCallback, aErrorCallback, aPrefObject) {
     this.tracking = true;
     var watchCall = function() {

+      // calc new position in lat/lon degrees
+      // 90° on Earth surface are ~10,000 km at the equator,
+      // so try moving at most 10m at a time
+      if (geofake.lastPos.x)
+        geofake.lastPos.x += (Math.random() - .5) * 90 / 1000000
+      else
+        geofake.lastPos.x = 48.208174
+      if (geofake.lastPos.y)
+        geofake.lastPos.y += (Math.random() - .5) * 90 / 1000000
+      else
+        geofake.lastPos.y = 16.373819

       aSuccessCallback({timestamp: Date.now(),
       aSuccessCallback({timestamp: Date.now(),

-                        coords: {latitude: 48.208174 +
-                                           (Math.random() - .5) / 5,
-                                 longitude: 16.373819 +
-                                            (Math.random() - .5) / 5,
+                        coords: {latitude: geofake.lastPos.x,
+                                 longitude: geofake.lastPos.y,

                                  accuracy: 20}});
       if (geofake.tracking)
         setTimeout(watchCall, 1000);
                                  accuracy: 20}});
       if (geofake.tracking)
         setTimeout(watchCall, 1000);


@@ -440,7 +462,8 @@ function startTracking() {
   var getStoredTrack = function() {
     if (mainDB)
       gTrackStore.getList(function(aTPoints) {
   var getStoredTrack = function() {
     if (mainDB)
       gTrackStore.getList(function(aTPoints) {

-        //document.getElementById("debug").textContent = aTPoints.length + " points loaded.";
+        if (gDebug)
+          document.getElementById("debug").textContent = aTPoints.length + " points loaded.";

         if (aTPoints.length) {
           gTrack = aTPoints;
         }
         if (aTPoints.length) {
           gTrack = aTPoints;
         }


@@ -453,8 +476,7 @@ function startTracking() {
   };
   getStoredTrack();
   if (navigator.geolocation) {
   };
   getStoredTrack();
   if (navigator.geolocation) {

-    //gGeoWatchID = geofake.watchPosition(
-    gGeoWatchID = navigator.geolocation.watchPosition(
+    gGeoWatchID = gGeolocation.watchPosition(

       function(position) {
         // Coords spec: https://developer.mozilla.org/en/XPCOM_Interface_Reference/NsIDOMGeoPositionCoords
         var tPoint = {time: position.timestamp,
       function(position) {
         // Coords spec: https://developer.mozilla.org/en/XPCOM_Interface_Reference/NsIDOMGeoPositionCoords
         var tPoint = {time: position.timestamp,


@@ -486,8 +508,7 @@ function startTracking() {
 
 function endTracking() {
   if (gGeoWatchID) {
 
 function endTracking() {
   if (gGeoWatchID) {

-    //geofake.clearWatch(gGeoWatchID);
-    navigator.geolocation.clearWatch(gGeoWatchID);
+    gGeolocation.clearWatch(gGeoWatchID);

   }
 }
 
   }
 }
 

diff --git a/js/ui.js b/js/ui.js
index 9dfcdc7d0b4362aa82ffe26d11c01dd9541f3458..d484274bddc8b405617d532ea736bf752d980edd 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -105,11 +105,19 @@ function saveTrack() {
     out += '    </trkseg>' + "\n";
     out += '  </trk>' + "\n";
     out += '</gpx>' + "\n";
     out += '    </trkseg>' + "\n";
     out += '  </trk>' + "\n";
     out += '</gpx>' + "\n";

-    var outDataURI = "data:application/octet-stream," + encodeURIComponent(out);
+    var outDataURI = "data:application/gpx+xml," + encodeURIComponent(out);

     window.open(outDataURI, 'GPX Track');
   }
 }
 
     window.open(outDataURI, 'GPX Track');
   }
 }
 

+function saveTrackDump() {
+  if (gTrack.length) {
+    var out = JSON.stringify(gTrack);
+    var outDataURI = "data:application/json," + encodeURIComponent(out);
+    window.open(outDataURI, 'JSON dump');
+  }
+}
+

 var gPrefs = {
   objStore: "prefs",
 
 var gPrefs = {
   objStore: "prefs",
 

diff --git a/style/lantea.css b/style/lantea.css
index acff337ef5276e713cf5d2ce9571a18cf026052d..49133028ab83536f5f0b9fa727357cb3e264b638 100644 (file)
--- a/style/lantea.css
+++ b/style/lantea.css
@@ -56,6 +56,10 @@ h1 {
   margin: 0;
 }
 
   margin: 0;
 }
 

+.debugHide {
+  display: none;
+}
+

 #copyright {
   position: absolute;
   bottom: .5em;
 #copyright {
   position: absolute;
   bottom: .5em;