X-Git-Url: https://git-public.kairo.at//?a=blobdiff_plain;f=js%2Fmap.js;h=8e8ef55b0bff17c6a129e243b253ac0e63133bc9;hb=3610c22d8eb34e6472073da446a20f2772184145;hp=869ce2c13c2227a6a680afa2fd80f70fbdf0f43e;hpb=b47b4a65e0de47e607e0f675402e69239d012ad6;p=lantea.git
diff --git a/js/map.js b/js/map.js
index 869ce2c..8e8ef55 100644
--- a/js/map.js
+++ b/js/map.js
@@ -42,6 +42,7 @@ var gMaxZoom = 18; // The minimum is 0.
var gMapStyles = {
// OSM tile usage policy: http://wiki.openstreetmap.org/wiki/Tile_usage_policy
+ // Find some more OSM ones at http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Tile_servers
osm_mapnik:
{name: "OpenStreetMap (Mapnik)",
url: "http://tile.openstreetmap.org/{z}/{x}/{y}.png",
@@ -51,31 +52,84 @@ var gMapStyles = {
url: "http://tah.openstreetmap.org/Tiles/tile/{z}/{x}/{y}.png",
copyright: 'Map data and imagery © OpenStreetMap contributors, CC-BY-SA'},
mapquest_open:
- {name: "MapQuest Open",
+ {name: "MapQuest OSM",
url: "http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png",
- copyright: 'Data, imagery and map information provided by MapQuest, OpenStreetMap and contributors, CC-BY-SA.'}
+ copyright: 'Data, imagery and map information provided by MapQuest, OpenStreetMap and contributors, CC-BY-SA.'},
+ mapquest_aerial:
+ {name: "MapQuest Open Aerial",
+ url: "http://oatile1.mqcdn.com/naip/{z}/{x}/{y}.png",
+ copyright: 'Data, imagery and map information provided by MapQuest, OpenStreetMap and contributors, CC-BY-SA.'},
+ google_map:
+ {name: "Google Maps",
+ url: " http://mt1.google.com/vt/x={x}&y={y}&z={z}",
+ copyright: 'Map data and imagery © Google'},
};
var gActiveMap = "osm_mapnik";
var gPos = {x: 35630000.0, // Current position in the map in pixels at the maximum zoom level (18)
y: 23670000.0, // The range is 0-67108864 (2^gMaxZoom * gTileSize)
- z: 5.0}; // This can be fractional if we are between zoom levels.
+ z: 5}; // This could be fractional if supported being between zoom levels.
var gLastMouseX = 0;
var gLastMouseY = 0;
+var gZoomFactor;
-// Used as an assiciative 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;
+var gGeoWatchID;
+var gTrack = [];
+var gLastTrackPoint;
+var gCenterPosition = true;
+
function initMap() {
gCanvas = document.getElementById("map");
gContext = gCanvas.getContext("2d");
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);
@@ -92,6 +146,9 @@ function initMap() {
document.getElementById("copyright").innerHTML =
gMapStyles[gActiveMap].copyright;
+
+ gLoadingTile = new Image();
+ gLoadingTile.src = "style/loading.png";
}
function resizeAndDraw() {
@@ -120,6 +177,24 @@ function zoomOut() {
}
}
+function gps2xy(aLatitude, aLongitude) {
+ var maxZoomFactor = Math.pow(2, gMaxZoom) * gTileSize;
+ var convLat = aLatitude * Math.PI / 180;
+ var rawY = (1 - Math.log(Math.tan(convLat) +
+ 1 / Math.cos(convLat)) / Math.PI) / 2 * maxZoomFactor;
+ var rawX = (aLongitude + 180) / 360 * maxZoomFactor;
+ return {x: Math.round(rawX),
+ y: Math.round(rawY)};
+}
+
+function xy2gps(aX, aY) {
+ var maxZoomFactor = Math.pow(2, gMaxZoom) * gTileSize;
+ var n = Math.PI - 2 * Math.PI * aY / maxZoomFactor;
+ return {latitude: 180 / Math.PI *
+ Math.atan(0.5 * (Math.exp(n) - Math.exp(-n))),
+ longitude: aX / maxZoomFactor * 360 - 180};
+}
+
function setMapStyle() {
var mapSel = document.getElementById("mapSelector");
if (mapSel.selectedIndex >= 0 && gActiveMap != mapSel.value) {
@@ -136,8 +211,9 @@ function mod(a, b) {
}
function normaliseIndices(x, y, z) {
- return {x: mod(x, Math.pow(2, z)),
- y: mod(y, Math.pow(2, z)),
+ var zoomFactor = Math.pow(2, z);
+ return {x: mod(x, zoomFactor),
+ y: mod(y, zoomFactor),
z: z};
}
@@ -155,13 +231,14 @@ function isOutsideWindow(t) {
var y = pos[1];
var z = pos[2];
- var wid = gCanvas.width * Math.pow(2, gMaxZoom - z);
- var ht = gCanvas.height * Math.pow(2, gMaxZoom - z);
+ var zoomFactor = Math.pow(2, gMaxZoom - z);
+ var wid = gCanvas.width * zoomFactor;
+ var ht = gCanvas.height * zoomFactor;
- x *= Math.pow(2, gMaxZoom - z);
- y *= Math.pow(2, gMaxZoom - z);
+ x *= zoomFactor;
+ y *= zoomFactor;
- var sz = gTileSize * Math.pow(2, gMaxZoom - z);
+ var sz = gTileSize * zoomFactor;
if (x > gPos.x + wid / 2 || y > gPos.y + ht / 2 ||
x + sz < gPos.x - wid / 2 || y - sz < gPos.y - ht / 2)
return true;
@@ -183,24 +260,30 @@ function drawMap() {
// if (isOutsideWindow(t))
// delete gTiles[t];
// }
- var z = Math.round(gPos.z);
- var wid = gCanvas.width * Math.pow(2, gMaxZoom - z); // Width in level 18 pixels.
- var ht = gCanvas.height * Math.pow(2, gMaxZoom - z); // Height in level 18 pixels.
- var size = gTileSize * Math.pow(2, gMaxZoom - z); // Tile size in level 18 pixels.
+ document.getElementById("zoomLevel").textContent = gPos.z;
+ gZoomFactor = Math.pow(2, gMaxZoom - gPos.z);
+ var wid = gCanvas.width * gZoomFactor; // Width in level 18 pixels.
+ var ht = gCanvas.height * gZoomFactor; // Height in level 18 pixels.
+ var size = gTileSize * gZoomFactor; // Tile size in level 18 pixels.
var xMin = gPos.x - wid / 2; // Corners of the window in level 18 pixels.
var yMin = gPos.y - ht / 2;
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) / Math.pow(2, gMaxZoom - z);
- var yoff = (y * size - yMin) / Math.pow(2, gMaxZoom - z);
- var tileKey = encodeIndex(x, y, z);
+ 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 {
@@ -213,18 +296,45 @@ function drawMap() {
drawMap();
}
}
- gContext.fillStyle = "#ffffff";
- gContext.fillRect(Math.round(xoff), Math.round(yoff), gTileSize, gTileSize);
+ gContext.drawImage(gLoadingTile, Math.round(xoff), Math.round(yoff));
}
}
}
+ if (gTrack.length)
+ for (var i = 0; i < gTrack.length; i++) {
+ drawTrackPoint(gTrack[i].coords.latitude, gTrack[i].coords.longitude);
+ }
+}
+
+function drawTrackPoint(aLatitude, aLongitude) {
+ var trackpoint = gps2xy(aLatitude, aLongitude);
+ gContext.strokeStyle = "#FF0000";
+ gContext.fillStyle = gContext.strokeStyle;
+ gContext.lineWidth = 2;
+ gContext.lineCap = "round";
+ gContext.lineJoin = "round";
+ gContext.beginPath();
+ if (!gLastTrackPoint || gLastTrackPoint == trackpoint) {
+ gContext.arc((trackpoint.x - gPos.x) / gZoomFactor + gCanvas.width / 2,
+ (trackpoint.y - gPos.y) / gZoomFactor + gCanvas.height / 2,
+ gContext.lineWidth, 0, Math.PI * 2, false);
+ gContext.fill();
+ }
+ else {
+ gContext.moveTo((gLastTrackPoint.x - gPos.x) / gZoomFactor + gCanvas.width / 2,
+ (gLastTrackPoint.y - gPos.y) / gZoomFactor + gCanvas.height / 2);
+ gContext.lineTo((trackpoint.x - gPos.x) / gZoomFactor + gCanvas.width / 2,
+ (trackpoint.y - gPos.y) / gZoomFactor + gCanvas.height / 2);
+ gContext.stroke();
+ }
+ gLastTrackPoint = trackpoint;
}
var mapEvHandler = {
handleEvent: function(aEvent) {
var touchEvent = aEvent.type.indexOf('touch') != -1;
- // Bail out on unwanted map moves, but not mousewheel events.
+ // Bail out on unwanted map moves, but not zoom-changing events.
if (aEvent.type != "DOMMouseScroll" && aEvent.type != "mousewheel") {
// Bail out if this is neither a touch nor left-click.
if (!touchEvent && aEvent.button != 0)
@@ -249,6 +359,7 @@ var mapEvHandler = {
}
var x = coordObj.clientX - gCanvas.offsetLeft;
var y = coordObj.clientY - gCanvas.offsetTop;
+
if (touchEvent || aEvent.button === 0) {
gDragging = true;
}
@@ -262,8 +373,8 @@ var mapEvHandler = {
if (gDragging === true) {
var dX = x - gLastMouseX;
var dY = y - gLastMouseY;
- gPos.x -= dX * Math.pow(2, gMaxZoom - gPos.z);
- gPos.y -= dY * Math.pow(2, gMaxZoom - gPos.z);
+ gPos.x -= dX * gZoomFactor;
+ gPos.y -= dY * gZoomFactor;
drawMap();
}
gLastMouseX = x;
@@ -290,6 +401,27 @@ var mapEvHandler = {
delta = -aEvent.detail / 3;
}
+ // Calculate new center of the map - same point stays under the mouse.
+ // This means that the pixel distance between the old center and point
+ // must equal the pixel distance of the new center and that point.
+ var x = coordObj.clientX - gCanvas.offsetLeft;
+ var y = coordObj.clientY - gCanvas.offsetTop;
+ // Debug output: "coordinates" of the point the mouse was over.
+ /*
+ var ptCoord = {x: gPos.x + (x - gCanvas.width / 2) * gZoomFactor,
+ y: gPos.y + (x - gCanvas.height / 2) * gZoomFactor};
+ var gpsCoord = xy2gps(ptCoord.x, ptCoord.y);
+ var pt2Coord = gps2xy(gpsCoord.latitude, gpsCoord.longitude);
+ document.getElementById("debug").textContent =
+ ptCoord.x + "/" + ptCoord.y + " - " +
+ gpsCoord.latitude + "/" + gpsCoord.longitude + " - " +
+ pt2Coord.x + "/" + pt2Coord.y;
+ */
+ // Zoom factor after this action.
+ var newZoomFactor = Math.pow(2, gMaxZoom - gPos.z + (delta > 0 ? -1 : 1));
+ gPos.x -= (x - gCanvas.width / 2) * (newZoomFactor - gZoomFactor);
+ gPos.y -= (y - gCanvas.height / 2) * (newZoomFactor - gZoomFactor);
+
if (delta > 0)
zoomIn();
else if (delta < 0)
@@ -298,3 +430,102 @@ var mapEvHandler = {
}
}
};
+
+var geofake = {
+ tracking: false,
+ watchPosition: function(aSuccessCallback, aErrorCallback, aPrefObject) {
+ this.tracking = true;
+ var watchCall = function() {
+ aSuccessCallback({timestamp: Date.now(),
+ coords: {latitude: 48.208174 +
+ (Math.random() - .5) / 5,
+ longitude: 16.373819 +
+ (Math.random() - .5) / 5,
+ accuracy: 20}});
+ if (geofake.tracking)
+ setTimeout(watchCall, 1000);
+ };
+ setTimeout(watchCall, 1000);
+ return "foo";
+ },
+ clearWatch: function(aID) {
+ this.tracking = false;
+ }
+}
+
+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() {
+ if (mainDB)
+ gTrackStore.getList(function(aTPoints) {
+ //document.getElementById("debug").textContent = aTPoints.length + " points loaded.";
+ if (aTPoints.length) {
+ gTrack = aTPoints;
+ }
+ });
+ else
+ setTimeout(getStoredTrack, 100);
+ loopCnt++;
+ if (loopCnt > 20)
+ return;
+ };
+ getStoredTrack();
+ if (navigator.geolocation) {
+ //gGeoWatchID = geofake.watchPosition(
+ gGeoWatchID = navigator.geolocation.watchPosition(
+ function(position) {
+ // Coords spec: https://developer.mozilla.org/en/XPCOM_Interface_Reference/NsIDOMGeoPositionCoords
+ var tPoint = {time: position.timestamp,
+ coords: position.coords,
+ beginSegment: !gLastTrackPoint};
+ gTrack.push(tPoint);
+ gTrackStore.push(tPoint);
+ drawTrackPoint(position.coords.latitude, position.coords.longitude);
+ if (gCenterPosition) {
+ 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;
+ gPos.y = posCoord.y;
+ drawMap();
+ }
+ }
+ },
+ function(error) {
+ // Ignore erros for the moment, but this is good for debugging.
+ // See https://developer.mozilla.org/en/Using_geolocation#Handling_errors
+ document.getElementById("debug").textContent = error.message;
+ },
+ {enableHighAccuracy: true}
+ );
+ }
+}
+
+function endTracking() {
+ if (gGeoWatchID) {
+ //geofake.clearWatch(gGeoWatchID);
+ navigator.geolocation.clearWatch(gGeoWatchID);
+ }
+}
+
+function clearTrack() {
+ gTrack = [];
+ gTrackStore.clear();
+ drawMap();
+}