X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fmap.js;h=361420b7e1e91088f204f932d678d6d0bf5e911d;hp=6aeacf688794cbdbb33fccde9c89c6b23b93df61;hb=306ae634d914dabcca192f5ac7630a3833deb9a8;hpb=003d56f8a1eee6825cc6c800f135e13df753770d

diff --git a/js/map.js b/js/map.js
index 6aeacf6..361420b 100644
--- a/js/map.js
+++ b/js/map.js
@@ -163,13 +163,17 @@ function loadPrefs(aEvent) {
     });
     gWaitCounter++;
     var trackLoadStarted = false;
+    var redrawBase = 100;
     gTrackStore.getListStepped(function(aTPoint) {
       if (aTPoint) {
         // Add in front and return new length.
         var tracklen = gTrack.unshift(aTPoint);
-        // Redraw track every 100 values (initial paint will do first anyhow).
-        if (tracklen % 100 == 0)
+        // Redraw track periodically, larger distance the longer it gets.
+        // Initial paint will do initial track drawing.
+        if (tracklen % redrawBase == 0) {
           drawTrack();
+          redrawBase = tracklen;
+        }
       }
       else {
         // Last point received.
@@ -458,6 +462,10 @@ var mapEvHandler = {
   handleEvent: function(aEvent) {
     var touchEvent = aEvent.type.indexOf('touch') != -1;
 
+    if (touchEvent) {
+      aEvent.stopPropagation();
+    }
+
     // Bail out if the event is happening on an input.
     if (aEvent.target.tagName.toLowerCase() == "input")
       return;
@@ -489,7 +497,6 @@ var mapEvHandler = {
                 Math.pow(aEvent.targetTouches.item(1).clientY -
                          aEvent.targetTouches.item(0).clientY, 2)
             );
-            console.log('!!! ' + gPinchStartWidth);
           }
           gDragTouchID = aEvent.changedTouches.item(0).identifier;
           coordObj = aEvent.changedTouches.identifiedTouch(gDragTouchID);
@@ -515,7 +522,7 @@ var mapEvHandler = {
           );
           if (!gPinchStartWidth)
             gPinchStartWidth = curPinchStartWidth;
-          console.log(gPinchStartWidth + ' <?> ' + curPinchStartWidth);
+
           if (gPinchStartWidth / curPinchStartWidth > 1.7 ||
               gPinchStartWidth / curPinchStartWidth < 0.6) {
             var newZoomLevel = gPos.z + (gPinchStartWidth < curPinchStartWidth ? 1 : -1);
@@ -544,6 +551,7 @@ var mapEvHandler = {
               gPinchStartWidth = null;
             }
           }
+          // If we are in a pinch, do not drag.
           break;
         }
         var x = coordObj.clientX - gMapCanvas.offsetLeft;
@@ -574,6 +582,7 @@ var mapEvHandler = {
         break;
       case "mouseup":
       case "touchend":
+        gPinchStartWidth = null;
         gDragging = false;
         showUI();
         break;