X-Git-Url: https://git-public.kairo.at/?a=blobdiff_plain;f=js%2Fmap.js;h=6d1a6ce2c868584d2785d908a0db1fa946795f3c;hb=57ee3e06c1c005f34297f9b9d1f7e6211ca30607;hp=d1f6b03c93cc7e4164f4cc671c7702fa9617d415;hpb=7b45b392492e0cb54d75b069cfecbb3985b641bc;p=lantea.git

diff --git a/js/map.js b/js/map.js
index d1f6b03..6d1a6ce 100644
--- a/js/map.js
+++ b/js/map.js
@@ -722,10 +722,20 @@ function drawTrack() {
 function drawTrackPoint(aLatitude, aLongitude, lastPoint) {
   var trackpoint = gps2xy(aLatitude, aLongitude);
   // lastPoint is for optimizing (not actually executing the draw until the last)
+  trackpoint.segmentEnd = (lastPoint === true);
   trackpoint.optimized = (lastPoint === false);
-  var mappos = {x: Math.round((trackpoint.x - gMap.pos.x) / gMap.zoomFactor + gMap.width / 2),
-                y: Math.round((trackpoint.y - gMap.pos.y) / gMap.zoomFactor + gMap.height / 2)};
-
+  trackpoint.mappos = {x: Math.round((trackpoint.x - gMap.pos.x) / gMap.zoomFactor + gMap.width / 2),
+                       y: Math.round((trackpoint.y - gMap.pos.y) / gMap.zoomFactor + gMap.height / 2)};
+  if (gLastDrawnPoint) {
+    // Lines completely outside the current display should not be drawn.
+    trackpoint.skip_drawing = false;
+    if ((trackpoint.mappos.x < 0 && gLastDrawnPoint.mappos.x < 0) ||
+        (trackpoint.mappos.x > gMap.width && gLastDrawnPoint.mappos.x > gMap.width) ||
+        (trackpoint.mappos.y < 0 && gLastDrawnPoint.mappos.y < 0) ||
+        (trackpoint.mappos.y > gMap.height && gLastDrawnPoint.mappos.y > gMap.height)) {
+      trackpoint.skip_drawing = true;
+    }
+  }
   if (!gLastDrawnPoint || !gLastDrawnPoint.optimized) {
     gTrackContext.strokeStyle = gTrackColor;
     gTrackContext.fillStyle = gTrackContext.strokeStyle;
@@ -734,25 +744,41 @@ function drawTrackPoint(aLatitude, aLongitude, lastPoint) {
     gTrackContext.lineJoin = "round";
   }
   // This breaks optimiziation, so make sure to reset optimization.
-  if (!gLastDrawnPoint || gLastDrawnPoint == trackpoint) {
+  if (trackpoint.skip_drawing || !gLastDrawnPoint) {
     trackpoint.optimized = false;
     // Close path if one was open.
     if (gLastDrawnPoint && gLastDrawnPoint.optimized) {
       gTrackContext.stroke();
     }
   }
-  if (!gLastDrawnPoint || (gLastDrawnPoint == trackpoint) || !gLastDrawnPoint.optimized) {
-    // Start drawing a segment.
-    gTrackContext.beginPath();
-    gTrackContext.arc(mappos.x, mappos.y,
-                      gTrackContext.lineWidth, 0, Math.PI * 2, false);
-    gTrackContext.fill();
-  }
-  else {
-    // Continue drawing segment, close if needed.
-    gTrackContext.lineTo(mappos.x, mappos.y);
-    if (!trackpoint.optimized)
-      gTrackContext.stroke();
+  if (!trackpoint.skip_drawing) {
+    if (gLastDrawnPoint && gLastDrawnPoint.skip_drawing && !gLastDrawnPoint.segmentEnd) {
+      // If the last point was skipped but the current one isn't, draw a segment start
+      // for the off-screen previous one as well as a connection line.
+      gTrackContext.beginPath();
+      gTrackContext.arc(gLastDrawnPoint.mappos.x, gLastDrawnPoint.mappos.y,
+                        gTrackContext.lineWidth, 0, Math.PI * 2, false);
+      gTrackContext.fill();
+      gTrackContext.lineTo(trackpoint.mappos.x, trackpoint.mappos.y);
+    }
+    else if (!gLastDrawnPoint || !gLastDrawnPoint.optimized) {
+      // Start drawing a segment with the current point.
+      gTrackContext.beginPath();
+      gTrackContext.arc(trackpoint.mappos.x, trackpoint.mappos.y,
+                        gTrackContext.lineWidth, 0, Math.PI * 2, false);
+      gTrackContext.fill();
+    }
+    else if (gLastDrawnPoint &&
+             Math.abs(gLastDrawnPoint.mappos.x - trackpoint.mappos.x) <= 1 &&
+             Math.abs(gLastDrawnPoint.mappos.y - trackpoint.mappos.y) <= 1) {
+      // We would draw the same or almost the same point, don't do any actual drawing.
+    }
+    else {
+      // Continue drawing segment, close if needed.
+      gTrackContext.lineTo(trackpoint.mappos.x, trackpoint.mappos.y);
+      if (!trackpoint.optimized)
+        gTrackContext.stroke();
+    }
   }
   gLastDrawnPoint = trackpoint;
 }
@@ -861,12 +887,12 @@ var mapEvHandler = {
 
       // Bail out if the started touch can't be found.
       if (touchEvent && gDragging &&
-          !aEvent.changedTouches.identifiedTouch(gDragTouchID))
+          !aEvent.targetTouches.item(0))
         return;
     }
 
     var coordObj = touchEvent ?
-                   aEvent.changedTouches.identifiedTouch(gDragTouchID) :
+                   aEvent.targetTouches.item(0) :
                    aEvent;
 
     switch (aEvent.type) {
@@ -881,8 +907,7 @@ var mapEvHandler = {
                          aEvent.targetTouches.item(0).clientY, 2)
             );
           }
-          gDragTouchID = aEvent.changedTouches.item(0).identifier;
-          coordObj = aEvent.changedTouches.identifiedTouch(gDragTouchID);
+          coordObj = aEvent.targetTouches.item(0);
         }
         var x = coordObj.clientX - gGLMapCanvas.offsetLeft;
         var y = coordObj.clientY - gGLMapCanvas.offsetTop;
@@ -1205,6 +1230,24 @@ function clearTrack() {
   drawTrack();
 }
 
+function loadTrack(aTrackId) {
+  fetchBackend("track_json?id=" + encodeURIComponent(aTrackId), "GET", null,
+    function(aResult, aStatusCode) {
+      if (aStatusCode >= 400 || !aResult) {
+        console.log("loading track failed: " + aStatusCode + ", result: " + aResult.message);
+      }
+      else {
+        console.log("loading track with " + aResult.length + " points.");
+        gTrack = aResult;
+        for (var i = 0; i < gTrack.length; i++) {
+          try { gTrackStore.push(gTrack[i]); } catch(e) {}
+        }
+        drawTrack();
+      }
+    }
+  );
+}
+
 var gTileService = {
   objStore: "tilecache",