X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fmap.js;h=490bfac9eb002836449a825af930d37dbb1522e2;hp=a25a1f5617f6d6163fcf25d9f920c8ff6f4496ab;hb=ed4c478c78a978f1aced6806397f897eb8371c3b;hpb=edc3be711416b6cbbccd73833c892de4fb3882c8 diff --git a/js/map.js b/js/map.js index a25a1f5..490bfac 100644 --- a/js/map.js +++ b/js/map.js @@ -2,12 +2,9 @@ * 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 gMapCanvas, gMapContext, gGLMapCanvas, gTrackCanvas, gTrackContext, gGeolocation; +var gGLMapCanvas, gTrackCanvas, gTrackContext, gGeolocation; var gDebug = false; -var gTileSize = 256; -var gMaxZoom = 18; // The minimum is 0. - var gMinTrackAccuracy = 1000; // meters var gTrackWidth = 2; // pixels var gTrackColor = "#FF0000"; @@ -17,44 +14,59 @@ var gCurLocColor = "#A00000"; 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 + // and http://wiki.openstreetmap.org/wiki/Tiles or http://wiki.openstreetmap.org/wiki/TMS osm_mapnik: {name: "OpenStreetMap (Mapnik)", - url: "http://tile.openstreetmap.org/{z}/{x}/{y}.png", + url: "https://[a-c].tile.openstreetmap.org/{z}/{x}/{y}.png", copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, osm_cyclemap: {name: "Cycle Map (OSM)", - url: "http://[a-c].tile.opencyclemap.org/cycle/{z}/{x}/{y}.png", + url: "https://[a-c].tile.thunderforest.com/cycle/{z}/{x}/{y}.png", // "http://[a-c].tile.opencyclemap.org/cycle/{z}/{x}/{y}.png", copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, osm_transmap: {name: "Transport Map (OSM)", - url: "http://[a-c].tile2.opencyclemap.org/transport/{z}/{x}/{y}.png", + url: "https://[a-c].tile.thunderforest.com/transport/{z}/{x}/{y}.png", // "http://[a-c].tile2.opencyclemap.org/transport/{z}/{x}/{y}.png", + copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, + osm_germany: + {name: "OSM German Style", + url: "http://[a-d].tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png", // https is not supported at all copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, +// oepnvkarte: // XXX: toolserver.org does not support CORS at this time :( +// {name: "ÖPNV-Karte (OSM)", +// url: "http://toolserver.org/~cmarqu/hill/{z}/{x}/{y}.png", +// copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by MeMoMaps under CC-BY-SA.'}, mapquest_open: {name: "MapQuest OSM", - url: "http://otile[1-4].mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png", - copyright: 'Map data © OpenStreetMap and contributors (ODbL/CC-BY-SA), tiles Courtesy of MapQuest.'}, + url: "http://otile[1-4].mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png", // https has wrong cert, akamai instead of mqcdn + copyright: 'Map data © OpenStreetMap and contributors (ODbL/CC-BY-SA), tiles courtesy of MapQuest.'}, mapquest_aerial: {name: "MapQuest Open Aerial", url: "http://otile[1-4].mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg", copyright: 'Tiles Courtesy of MapQuest, portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency.'}, - opengeoserver_arial: - {name: "OpenGeoServer Aerial", - url: "http://services.opengeoserver.org/tiles/1.0.0/globe.aerial_EPSG3857/{z}/{x}/{y}.png?origin=nw", - copyright: 'Tiles by OpenGeoServer.org, CC-BY 3.0 AT.'}, - google_map: - {name: "Google Maps", - url: " http://mt1.google.com/vt/x={x}&y={y}&z={z}", - copyright: 'Map data and imagery © Google'}, + osm_hot: + {name: "OSM HOT style", + url: "http://[a-c].tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", // https has CAcert which doesn't work in browsers + copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, +// hikebike: // XXX: toolserver.org does not support CORS at this time :( +// {name: "Hike and Bike (OSM)", +// url: "http://toolserver.org/tiles/hikebike/{z}/{x}/{y}.png", +// copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'}, + stamen_toner: + {name: "Stamen Toner (B+W)", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com + url: "http://[a-c].tile.stamen.com/toner/{z}/{x}/{y}.jpg", + copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'}, + stamen_terrain: + {name: "Stamen Terrain (USA only)", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com + url: "http://[a-c].tile.stamen.com/terrain/{z}/{x}/{y}.jpg", + copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'}, + stamen_watercolor: + {name: "Stamen Watercolor (artistic)", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com + url: "http://[a-c].tile.stamen.com/watercolor/{z}/{x}/{y}.jpg", + copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'}, }; -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}; // This could be fractional if supported being between zoom levels. var gLastMouseX = 0; var gLastMouseY = 0; -var gZoomFactor; var gLoadingTile; @@ -72,10 +84,8 @@ var gCurPosMapCache; function initMap() { gGeolocation = navigator.geolocation; - // Set up canvas contexts. TODO: Remove 2D map once GL support works. - gMapCanvas = document.getElementById("map"); - gMapContext = gMapCanvas.getContext("2d"); - gGLMapCanvas = document.getElementById("glmap"); + // Set up canvas context. + gGLMapCanvas = document.getElementById("map"); try { // Try to grab the standard context. If it fails, fallback to experimental. // We also try to tell it we do not need a depth buffer. @@ -83,15 +93,23 @@ function initMap() { gGLMapCanvas.getContext("experimental-webgl", {depth: false}); } catch(e) {} - // If we don't have a GL context, give up now if (!gMap.gl) { + // If we don't have a GL context, give up now showGLWarningDialog(); gMap.gl = null; } + else { + // GL context can be lost at any time, handle that. + // See http://www.khronos.org/webgl/wiki/HandlingContextLost + gGLMapCanvas.addEventListener("webglcontextlost", + gMap.handleContextLost, false); + gGLMapCanvas.addEventListener("webglcontextrestored", + gMap.handleContextRestored, false); + } gTrackCanvas = document.getElementById("track"); gTrackContext = gTrackCanvas.getContext("2d"); - if (!gActiveMap) - gActiveMap = "osm_mapnik"; + if (!gMap.activeMap) + gMap.activeMap = "osm_mapnik"; //gDebug = true; if (gDebug) { @@ -132,15 +150,21 @@ function loadPrefs(aEvent) { document.getElementById("body").addEventListener("keydown", mapEvHandler, false); + document.addEventListener("visibilitychange", visibilityEvHandler, false); + + console.log("Events added."); document.getElementById("copyright").innerHTML = - gMapStyles[gActiveMap].copyright; + gMapStyles[gMap.activeMap].copyright; + console.log("Init loading tile..."); gLoadingTile = new Image(); - gLoadingTile.src = "style/loading.png"; gLoadingTile.onload = function() { + console.log("Loading tile loaded."); var throwEv = new CustomEvent("prefload-done"); gAction.dispatchEvent(throwEv); }; + console.log("Set loading tile..."); + gLoadingTile.src = "style/loading.png"; } } else { @@ -149,8 +173,8 @@ function loadPrefs(aEvent) { gAction.addEventListener("prefs-step", loadPrefs, false); gWaitCounter++; gPrefs.get("position", function(aValue) { - if (aValue) { - gPos = aValue; + if (aValue && aValue.x && aValue.y && aValue.z) { + gMap.pos = aValue; } gWaitCounter--; var throwEv = new CustomEvent("prefs-step"); @@ -184,11 +208,14 @@ function loadPrefs(aEvent) { if (aTPoint) { // Add in front and return new length. var tracklen = gTrack.unshift(aTPoint); - // Redraw track periodically, larger distance the longer it gets. + // Redraw track periodically, larger distance the longer it gets + // (but clamped to the first value over a certain limit). // Initial paint will do initial track drawing. if (tracklen % redrawBase == 0) { drawTrack(); - redrawBase = tracklen; + if (redrawBase < 1000) { + redrawBase = tracklen; + } } } else { @@ -213,6 +240,27 @@ var gMap = { glTextureCoordAttr: null, glResolutionAttr: null, glMapTexture: null, + glTextures: {}, + glTxCleanIntervalID: null, + glTexturesPerZoomLevel: 0, + + activeMap: "osm_mapnik", + tileSize: 256, + maxZoom: 18, // The minimum is 0. + zoomFactor: null, + pos: { + 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^gMap.maxZoom * gMap.tileSize) + z: 5 // This could be fractional if supported being between zoom levels. + }, + baseDim: { // Map width, height and tile size in level 18 pixels. + wid: null, + ht: null, + tsize: null, + }, + + get width() { return gMap.gl ? gMap.gl.drawingBufferWidth : gGLMapCanvas.width; }, + get height() { return gMap.gl ? gMap.gl.drawingBufferHeight : gGLMapCanvas.height; }, getVertShaderSource: function() { return 'attribute vec2 aVertexPosition;\n' + @@ -225,7 +273,7 @@ var gMap = { ' gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1);\n' + ' vTextureCoord = aTextureCoord;\n' + '}'; }, - getFragShaderSource:function() { + getFragShaderSource: function() { return 'varying highp vec2 vTextureCoord;\n\n' + 'uniform sampler2D uImage;\n\n' + 'void main(void) {\n' + @@ -234,12 +282,14 @@ var gMap = { initGL: function() { // When called from the event listener, the "this" reference doesn't work, so use the object name. + console.log("Initializing WebGL..."); if (gMap.gl) { gMap.gl.viewport(0, 0, gMap.gl.drawingBufferWidth, gMap.gl.drawingBufferHeight); gMap.gl.clearColor(0.0, 0.0, 0.0, 0.5); // Set clear color to black, fully opaque. gMap.gl.clear(gMap.gl.COLOR_BUFFER_BIT|gMap.gl.DEPTH_BUFFER_BIT); // Clear the color. // Create and initialize the shaders. + console.log("Create and compile shaders..."); var vertShader = gMap.gl.createShader(gMap.gl.VERTEX_SHADER); var fragShader = gMap.gl.createShader(gMap.gl.FRAGMENT_SHADER); gMap.gl.shaderSource(vertShader, gMap.getVertShaderSource()); @@ -259,6 +309,7 @@ var gMap = { return null; } + console.log("Create and link shader program..."); gMap.glShaderProgram = gMap.gl.createProgram(); gMap.gl.attachShader(gMap.glShaderProgram, vertShader); gMap.gl.attachShader(gMap.glShaderProgram, fragShader); @@ -273,6 +324,7 @@ var gMap = { gMap.glTextureCoordAttr = gMap.gl.getAttribLocation(gMap.glShaderProgram, "aTextureCoord"); gMap.glResolutionAttr = gMap.gl.getUniformLocation(gMap.glShaderProgram, "uResolution"); + console.log("Set up vertex buffer..."); var tileVerticesBuffer = gMap.gl.createBuffer(); gMap.gl.bindBuffer(gMap.gl.ARRAY_BUFFER, tileVerticesBuffer); // The vertices are the coordinates of the corner points of the square. @@ -288,54 +340,140 @@ var gMap = { gMap.gl.enableVertexAttribArray(gMap.glTextureCoordAttr); gMap.gl.vertexAttribPointer(gMap.glTextureCoordAttr, 2, gMap.gl.FLOAT, false, 0, 0); - // Map Texture - gMap.glMapTexture = gMap.gl.createTexture(); - gMap.gl.activeTexture(gMap.gl.TEXTURE0); - gMap.gl.bindTexture(gMap.gl.TEXTURE_2D, gMap.glMapTexture); - gMap.gl.uniform1i(gMap.gl.getUniformLocation(gMap.glShaderProgram, "uImage"), 0); - // Set params for how the texture minifies and magnifies (wrap params are not needed as we're power-of-two). - gMap.gl.texParameteri(gMap.gl.TEXTURE_2D, gMap.gl.TEXTURE_MIN_FILTER, gMap.gl.NEAREST); - gMap.gl.texParameteri(gMap.gl.TEXTURE_2D, gMap.gl.TEXTURE_MAG_FILTER, gMap.gl.NEAREST); - // Upload the image into the texture. - gMap.gl.texImage2D(gMap.gl.TEXTURE_2D, 0, gMap.gl.RGBA, gMap.gl.RGBA, gMap.gl.UNSIGNED_BYTE, gLoadingTile); + gMap.loadImageToTexture(gLoadingTile, getTileKey("loading", {x: 0, y: 0, z: 0})); gMap.gl.uniform2f(gMap.glResolutionAttr, gGLMapCanvas.width, gGLMapCanvas.height); // Create a buffer for the position of the rectangle corners. + console.log("Set up coord buffer..."); var mapVerticesTextureCoordBuffer = gMap.gl.createBuffer(); gMap.gl.bindBuffer(gMap.gl.ARRAY_BUFFER, mapVerticesTextureCoordBuffer); gMap.gl.enableVertexAttribArray(gMap.glVertexPositionAttr); gMap.gl.vertexAttribPointer(gMap.glVertexPositionAttr, 2, gMap.gl.FLOAT, false, 0, 0); + + // Call texture cleaning every 30 seconds, for now (is 60 better?). + gMap.glTxCleanIntervalID = window.setInterval(gMap.cleanTextures, 30 * 1000); } - var throwEv = new CustomEvent("mapinit-done"); - gAction.dispatchEvent(throwEv); + if (!gAppInitDone) { + // We may be called when context was lost and destroyed, + // only send event when we are in app startup + // (gAppInitDone is set to true right after we return this event). + var throwEv = new CustomEvent("mapinit-done"); + gAction.dispatchEvent(throwEv); + } }, - drawGL: function() { + draw: function() { + gMap.assembleGL(); + drawTrack(); + }, + + assembleGL: function() { if (!gMap.gl) { return; } - var x_start = 0; - var i_width = 256; - var y_start = 10; - var i_height = 256; - var textureCoordinates = [ - x_start, y_start, - x_start + i_width, y_start, - x_start, y_start + i_height, - x_start, y_start + i_height, - x_start + i_width, y_start, - x_start + i_width, y_start + i_height, - ]; - gMap.gl.bufferData(gMap.gl.ARRAY_BUFFER, new Float32Array(textureCoordinates), gMap.gl.STATIC_DRAW); + document.getElementById("zoomLevel").textContent = gMap.pos.z; + gMap.zoomFactor = Math.pow(2, gMap.maxZoom - gMap.pos.z); + gMap.baseDim.wid = gMap.gl.drawingBufferWidth * gMap.zoomFactor; + gMap.baseDim.ht = gMap.gl.drawingBufferHeight * gMap.zoomFactor; + gMap.baseDim.tsize = gMap.tileSize * gMap.zoomFactor; + + var xMin = gMap.pos.x - gMap.baseDim.wid / 2; // Corners of the window in level 18 pixels. + var yMin = gMap.pos.y - gMap.baseDim.ht / 2; + var xMax = gMap.pos.x + gMap.baseDim.wid / 2; + var yMax = gMap.pos.y + gMap.baseDim.ht / 2; + + if (gMapPrefsLoaded && mainDB) + gPrefs.set("position", gMap.pos); + + // Go through all the tiles in the map, find out if to draw them and do so. + for (var x = Math.floor(xMin / gMap.baseDim.tsize); x < Math.ceil(xMax / gMap.baseDim.tsize); x++) { + for (var y = Math.floor(yMin / gMap.baseDim.tsize); y < Math.ceil(yMax / gMap.baseDim.tsize); y++) { + // Only go to loading step if we haven't loaded the texture. + var coords = {x: x, y: y, z: gMap.pos.z}; + var tileKey = getTileKey(gMap.activeMap, normalizeCoords(coords)); + if (!gMap.glTextures[tileKey]) { + // Initiate loading/drawing of the actual tile. + gTileService.get(gMap.activeMap, coords, + function(aImage, aStyle, aCoords, aTileKey) { + // Only actually load if this still applies for the current view. + if ((aStyle == gMap.activeMap) && (aCoords.z == gMap.pos.z)) { + var URL = window.URL; + var imgURL = URL.createObjectURL(aImage); + var imgObj = new Image(); + imgObj.onload = function() { + gMap.loadImageToTexture(imgObj, aTileKey); + if (document.hidden != true) { // Only draw if we're actually visible. + window.requestAnimationFrame(function(aTimestamp) { gMap.drawGL() }); + } + URL.revokeObjectURL(imgURL); + } + imgObj.src = imgURL; + } + }); + } + } + } + if (document.hidden != true) { // Only draw if we're actually visible. + window.requestAnimationFrame(function(aTimestamp) { gMap.drawGL() }); + } + }, - // There are 6 indices in textureCoordinates. - gMap.gl.drawArrays(gMap.gl.TRIANGLES, 0, 6); + drawGL: function() { + var xMin = gMap.pos.x - gMap.baseDim.wid / 2; // Corners of the window in level 18 pixels. + var yMin = gMap.pos.y - gMap.baseDim.ht / 2; + var xMax = gMap.pos.x + gMap.baseDim.wid / 2; + var yMax = gMap.pos.y + gMap.baseDim.ht / 2; + + // Go through all the tiles in the map, find out if to draw them and do so. + for (var x = Math.floor(xMin / gMap.baseDim.tsize); x < Math.ceil(xMax / gMap.baseDim.tsize); x++) { + for (var y = Math.floor(yMin / gMap.baseDim.tsize); y < Math.ceil(yMax / gMap.baseDim.tsize); y++) { + // Rounding the pixel offsets ensures we position the tiles precisely. + var xoff = Math.round((x * gMap.baseDim.tsize - xMin) / gMap.zoomFactor); + var yoff = Math.round((y * gMap.baseDim.tsize - yMin) / gMap.zoomFactor); + // Draw the tile, first find out the actual texture to use. + var norm = normalizeCoords({x: x, y: y, z: gMap.pos.z}); + var tileKey = getTileKey(gMap.activeMap, norm); + if (!gMap.glTextures[tileKey]) { + tileKey = getTileKey("loading", {x: 0, y: 0, z: 0}); + } + gMap.drawTileGL(xoff, yoff, tileKey); + } + } + }, - var x_start = 400; - var i_width = 256; - var y_start = 10; - var i_height = 256; + resizeAndDraw: function() { + var viewportWidth = Math.min(window.innerWidth, window.outerWidth); + var viewportHeight = Math.min(window.innerHeight, window.outerHeight); + if (gGLMapCanvas && gTrackCanvas) { + gGLMapCanvas.width = viewportWidth; + gGLMapCanvas.height = viewportHeight; + gTrackCanvas.width = viewportWidth; + gTrackCanvas.height = viewportHeight; + if (gMap.gl) { + // Size viewport to canvas size. + gMap.gl.viewport(0, 0, gMap.gl.drawingBufferWidth, gMap.gl.drawingBufferHeight); + // Clear the color. + gMap.gl.clear(gMap.gl.COLOR_BUFFER_BIT); + // Make sure the vertex shader get the right resolution. + gMap.gl.uniform2f(gMap.glResolutionAttr, gGLMapCanvas.width, gGLMapCanvas.height); + // Prepare recalculation of textures to keep for one zoom level. + gMap.glTexturesPerZoomLevel = 0; + } + gMap.draw(); + showUI(); + } + }, + + drawTileGL: function(aLeft, aRight, aTileKey) { + gMap.gl.activeTexture(gMap.gl.TEXTURE0); + gMap.gl.bindTexture(gMap.gl.TEXTURE_2D, gMap.glTextures[aTileKey]); + // Set uImage to refer to TEXTURE0 + gMap.gl.uniform1i(gMap.gl.getUniformLocation(gMap.glShaderProgram, "uImage"), 0); + var x_start = aLeft; + var i_width = gMap.tileSize; + var y_start = aRight; + var i_height = gMap.tileSize; var textureCoordinates = [ x_start, y_start, x_start + i_width, y_start, @@ -345,66 +483,122 @@ var gMap = { x_start + i_width, y_start + i_height, ]; gMap.gl.bufferData(gMap.gl.ARRAY_BUFFER, new Float32Array(textureCoordinates), gMap.gl.STATIC_DRAW); - // gMap.gl.bindTexture(gMap.gl.TEXTURE_2D, gMap.glMapTexture); // There are 6 indices in textureCoordinates. gMap.gl.drawArrays(gMap.gl.TRIANGLES, 0, 6); + }, + loadImageToTexture: function(aImage, aTileKey) { + // Create and bind texture. + gMap.glTextures[aTileKey] = gMap.gl.createTexture(); + gMap.gl.bindTexture(gMap.gl.TEXTURE_2D, gMap.glTextures[aTileKey]); + // Set params for how the texture minifies and magnifies (wrap params are not needed as we're power-of-two). + gMap.gl.texParameteri(gMap.gl.TEXTURE_2D, gMap.gl.TEXTURE_MIN_FILTER, gMap.gl.NEAREST); + gMap.gl.texParameteri(gMap.gl.TEXTURE_2D, gMap.gl.TEXTURE_MAG_FILTER, gMap.gl.NEAREST); + // Upload the image into the texture. + gMap.gl.texImage2D(gMap.gl.TEXTURE_2D, 0, gMap.gl.RGBA, gMap.gl.RGBA, gMap.gl.UNSIGNED_BYTE, aImage); }, - resizeAndDrawGL: function() { - if (!gMap.gl) { return; } + cleanTextures: function() { + // Get rid of unneeded textures to save memory. + // TODO: Be less aggressive, maybe keep neighboring zoom levels (but x/y coords there are zoom-specific). + if (!gMap.glTexturesPerZoomLevel) { + // Calculate how many textures we need to keep for one zoom level. + // ceil(width/size) gives us the minimum, keep one on either side as well. + gMap.glTexturesPerZoomLevel = + Math.ceil(gMap.gl.drawingBufferWidth / gMap.tileSize + 2) * + Math.ceil(gMap.gl.drawingBufferHeight / gMap.tileSize + 2); + console.log("Keeping " + gMap.glTexturesPerZoomLevel + " textures per level"); + } + if (Object.keys(gMap.glTextures).length > gMap.glTexturesPerZoomLevel) { + console.log("Cleaning textures... (have " + Object.keys(gMap.glTextures).length + " atm)"); + + // Find coordinate ranges for tiles to keep. + var tMin = normalizeCoords({x: Math.floor((gMap.pos.x - gMap.baseDim.wid / 2) / gMap.baseDim.tsize) - 1, + y: Math.floor((gMap.pos.y - gMap.baseDim.ht / 2) / gMap.baseDim.tsize) - 1, + z: gMap.pos.z}); + var tMax = normalizeCoords({x: Math.ceil((gMap.pos.x + gMap.baseDim.wid / 2) / gMap.baseDim.tsize) + 1, + y: Math.ceil((gMap.pos.y + gMap.baseDim.ht / 2) / gMap.baseDim.tsize) + 1, + z: gMap.pos.z}); + console.log("In range: " + tMin.x + "," + tMin.y + "," + tMin.z + " - " + tMax.x + "," + tMax.y + "," + tMax.z); + for (var tileKey in gMap.glTextures) { + var keyMatches = tileKey.match(/([^:]+)::(\d+),(\d+),(\d+)/); + if (keyMatches && keyMatches[1] != "loading") { + var txData = { + style: keyMatches[1], + x: keyMatches[2], + y: keyMatches[3], + z: keyMatches[4], + } + var delTx = false; + if (txData.style != gMap.activeMap) { delTx = true; console.log("Different map style: " + txData.style); } + if (!delTx && (txData.z < tMin.z || txData.z > tMax.z)) { delTx = true; console.log("Out-of-range zoom: " + txData.z); } + if (tMin.x < tMax.x) { + if (!delTx && (txData.x < tMin.x || txData.x > tMax.x)) { delTx = true; console.log("Out-of-range X: " + txData.x); } + } + else { + // We are crossing over the 0 coordinate! + if (!delTx && (txData.x < tMin.x && txData.x > tMax.x)) { delTx = true; console.log("Out-of-range X: " + txData.x); } + } + if (tMin.y < tMax.y) { + if (!delTx && (txData.y < tMin.y || txData.y > tMax.y)) { delTx = true; console.log("Out-of-range Y: " + txData.y); } + } + else { + // We are crossing over the 0 coordinate! + if (!delTx && (txData.y < tMin.y && txData.y > tMax.y)) { delTx = true; console.log("Out-of-range Y: " + txData.y); } + } + if (delTx) { + // Delete texture from GL and from the array we are holding. + gMap.gl.deleteTexture(gMap.glTextures[tileKey]); + delete gMap.glTextures[tileKey]; + } + } + } + console.log("Cleaning complete, " + Object.keys(gMap.glTextures).length + " textures left)"); + } + }, - gMap.gl.viewport(0, 0, gMap.gl.drawingBufferWidth, gMap.gl.drawingBufferHeight); - gMap.gl.clear(gMap.gl.COLOR_BUFFER_BIT); // Clear the color. - gMap.gl.uniform2f(gMap.glResolutionAttr, gGLMapCanvas.width, gGLMapCanvas.height); - gMap.drawGL(); + handleContextLost: function(event) { + event.preventDefault(); + // GL context is gone, let's reset everything that depends on it. + clearInterval(gMap.glTxCleanIntervalID); + gMap.glTextures = {}; }, -} -function resizeAndDraw() { - var viewportWidth = Math.min(window.innerWidth, window.outerWidth); - var viewportHeight = Math.min(window.innerHeight, window.outerHeight); - if (gMapCanvas && gGLMapCanvas && gTrackCanvas) { - gMapCanvas.width = viewportWidth; - gMapCanvas.height = viewportHeight; - gGLMapCanvas.width = viewportWidth; - gGLMapCanvas.height = viewportHeight; - gTrackCanvas.width = viewportWidth; - gTrackCanvas.height = viewportHeight; - drawMap(); - gMap.resizeAndDrawGL(); - showUI(); - } + handleContextRestored: function(event) { + // When GL context is back, init GL again and draw. + gMap.initGL(); + gMap.draw(); + }, } // Using scale(x, y) together with drawing old data on scaled canvas would be an improvement for zooming. // See https://developer.mozilla.org/en-US/docs/Canvas_tutorial/Transformations#Scaling function zoomIn() { - if (gPos.z < gMaxZoom) { - gPos.z++; - drawMap(); + if (gMap.pos.z < gMap.maxZoom) { + gMap.pos.z++; + gMap.draw(); } } function zoomOut() { - if (gPos.z > 0) { - gPos.z--; - drawMap(); + if (gMap.pos.z > 0) { + gMap.pos.z--; + gMap.draw(); } } function zoomTo(aTargetLevel) { aTargetLevel = parseInt(aTargetLevel); - if (aTargetLevel >= 0 && aTargetLevel <= gMaxZoom) { - gPos.z = aTargetLevel; - drawMap(); + if (aTargetLevel >= 0 && aTargetLevel <= gMap.maxZoom) { + gMap.pos.z = aTargetLevel; + gMap.draw(); } } function gps2xy(aLatitude, aLongitude) { - var maxZoomFactor = Math.pow(2, gMaxZoom) * gTileSize; + var maxZoomFactor = Math.pow(2, gMap.maxZoom) * gMap.tileSize; var convLat = aLatitude * Math.PI / 180; var rawY = (1 - Math.log(Math.tan(convLat) + 1 / Math.cos(convLat)) / Math.PI) / 2 * maxZoomFactor; @@ -414,7 +608,7 @@ function gps2xy(aLatitude, aLongitude) { } function xy2gps(aX, aY) { - var maxZoomFactor = Math.pow(2, gMaxZoom) * gTileSize; + var maxZoomFactor = Math.pow(2, gMap.maxZoom) * gMap.tileSize; var n = Math.PI - 2 * Math.PI * aY / maxZoomFactor; return {latitude: 180 / Math.PI * Math.atan(0.5 * (Math.exp(n) - Math.exp(-n))), @@ -423,12 +617,12 @@ function xy2gps(aX, aY) { function setMapStyle() { var mapSel = document.getElementById("mapSelector"); - if (mapSel.selectedIndex >= 0 && gActiveMap != mapSel.value) { - gActiveMap = mapSel.value; + if (mapSel.selectedIndex >= 0 && gMap.activeMap != mapSel.value) { + gMap.activeMap = mapSel.value; document.getElementById("copyright").innerHTML = - gMapStyles[gActiveMap].copyright; + gMapStyles[gMap.activeMap].copyright; showUI(); - drawMap(); + gMap.draw(); } } @@ -445,20 +639,27 @@ function normalizeCoords(aCoords) { z: aCoords.z}; } +function getTileKey(aStyle, aNormalizedCoords) { + return aStyle + "::" + + aNormalizedCoords.x + "," + + aNormalizedCoords.y + "," + + aNormalizedCoords.z; +} + // Returns true if the tile is outside the current view. function isOutsideWindow(t) { var pos = decodeIndex(t); - var zoomFactor = Math.pow(2, gMaxZoom - pos.z); - var wid = gMapCanvas.width * zoomFactor; - var ht = gMapCanvas.height * zoomFactor; + var zoomFactor = Math.pow(2, gMap.maxZoom - pos.z); + var wid = gMap.width * zoomFactor; + var ht = gMap.height * zoomFactor; pos.x *= zoomFactor; pos.y *= zoomFactor; - var sz = gTileSize * zoomFactor; - if (pos.x > gPos.x + wid / 2 || pos.y > gPos.y + ht / 2 || - pos.x + sz < gPos.x - wid / 2 || pos.y - sz < gPos.y - ht / 2) + var sz = gMap.tileSize * zoomFactor; + if (pos.x > gMap.pos.x + wid / 2 || pos.y > gMap.pos.y + ht / 2 || + pos.x + sz < gMap.pos.x - wid / 2 || pos.y - sz < gMap.pos.y - ht / 2) return true; return false; } @@ -473,89 +674,16 @@ function decodeIndex(encodedIdx) { return {x: ind[0], y: ind[1], z: ind[2]}; } -function drawMap(aPixels, aOverdraw) { - // aPixels is an object with left/right/top/bottom members telling how many - // pixels on the borders should actually be drawn. - // aOverdraw is a bool that tells if we should draw placeholders or draw - // straight over the existing content. - if (!aPixels) - aPixels = {left: gMapCanvas.width, right: gMapCanvas.width, - top: gMapCanvas.height, bottom: gMapCanvas.height}; - if (!aOverdraw) - aOverdraw = false; - - document.getElementById("zoomLevel").textContent = gPos.z; - gZoomFactor = Math.pow(2, gMaxZoom - gPos.z); - var wid = gMapCanvas.width * gZoomFactor; // Width in level 18 pixels. - var ht = gMapCanvas.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; - - if (gMapPrefsLoaded && mainDB) - gPrefs.set("position", gPos); - - var tiles = {left: Math.ceil((xMin + aPixels.left * gZoomFactor) / size) - - (aPixels.left ? 0 : 1), - right: Math.floor((xMax - aPixels.right * gZoomFactor) / size) - - (aPixels.right ? 1 : 0), - top: Math.ceil((yMin + aPixels.top * gZoomFactor) / size) - - (aPixels.top ? 0 : 1), - bottom: Math.floor((yMax - aPixels.bottom * gZoomFactor) / size) - - (aPixels.bottom ? 1 : 0)}; - - // Go through all the tiles in the map, find out if to draw them and 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++) { // slow script warnings on the tablet appear here! - // Only go to the drawing step if we need to draw this tile. - if (x < tiles.left || x > tiles.right || - y < tiles.top || y > tiles.bottom) { - // Round here is **CRUCIAL** otherwise the images are filtered - // and the performance sucks (more than expected). - var xoff = Math.round((x * size - xMin) / gZoomFactor); - var yoff = Math.round((y * size - yMin) / gZoomFactor); - // Draw placeholder tile unless we overdraw. - if (!aOverdraw && - (x < tiles.left -1 || x > tiles.right + 1 || - y < tiles.top -1 || y > tiles.bottom + 1)) - gMapContext.drawImage(gLoadingTile, xoff, yoff); - - // Initiate loading/drawing of the actual tile. - gTileService.get(gActiveMap, {x: x, y: y, z: gPos.z}, - function(aImage, aStyle, aCoords) { - // Only draw if this applies for the current view. - if ((aStyle == gActiveMap) && (aCoords.z == gPos.z)) { - var ixMin = gPos.x - wid / 2; - var iyMin = gPos.y - ht / 2; - var ixoff = Math.round((aCoords.x * size - ixMin) / gZoomFactor); - var iyoff = Math.round((aCoords.y * size - iyMin) / gZoomFactor); - var URL = window.URL; - var imgURL = URL.createObjectURL(aImage); - var imgObj = new Image(); - imgObj.src = imgURL; - imgObj.onload = function() { - gMapContext.drawImage(imgObj, ixoff, iyoff); - URL.revokeObjectURL(imgURL); - } - } - }); - } - } - } - drawTrack(); -} - function drawTrack() { - gLastDrawnPoint = null; - gCurPosMapCache = undefined; - gTrackContext.clearRect(0, 0, gTrackCanvas.width, gTrackCanvas.height); - if (gTrack.length) { - for (var i = 0; i < gTrack.length; i++) { - drawTrackPoint(gTrack[i].coords.latitude, gTrack[i].coords.longitude, - (i + 1 >= gTrack.length)); + if (gTrackContext && (document.hidden != true)) { // Only draw if we're actually visible. + gLastDrawnPoint = null; + gCurPosMapCache = undefined; + gTrackContext.clearRect(0, 0, gTrackCanvas.width, gTrackCanvas.height); + if (gTrack.length) { + for (var i = 0; i < gTrack.length; i++) { + drawTrackPoint(gTrack[i].coords.latitude, gTrack[i].coords.longitude, + (i + 1 >= gTrack.length || gTrack[i+1].beginSegment)); + } } } } @@ -564,8 +692,8 @@ function drawTrackPoint(aLatitude, aLongitude, lastPoint) { var trackpoint = gps2xy(aLatitude, aLongitude); // lastPoint is for optimizing (not actually executing the draw until the last) trackpoint.optimized = (lastPoint === false); - var mappos = {x: Math.round((trackpoint.x - gPos.x) / gZoomFactor + gMapCanvas.width / 2), - y: Math.round((trackpoint.y - gPos.y) / gZoomFactor + gMapCanvas.height / 2)}; + 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)}; if (!gLastDrawnPoint || !gLastDrawnPoint.optimized) { gTrackContext.strokeStyle = gTrackColor; @@ -574,22 +702,23 @@ function drawTrackPoint(aLatitude, aLongitude, lastPoint) { gTrackContext.lineCap = "round"; gTrackContext.lineJoin = "round"; } + // This breaks optimiziation, so make sure to reset optimization. if (!gLastDrawnPoint || gLastDrawnPoint == trackpoint) { - // This breaks optimiziation, so make sure to close path and reset optimization. - if (gLastDrawnPoint && gLastDrawnPoint.optimized) + 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(); - trackpoint.optimized = false; gTrackContext.arc(mappos.x, mappos.y, gTrackContext.lineWidth, 0, Math.PI * 2, false); gTrackContext.fill(); } else { - if (!gLastDrawnPoint || !gLastDrawnPoint.optimized) { - gTrackContext.beginPath(); - gTrackContext.moveTo(Math.round((gLastDrawnPoint.x - gPos.x) / gZoomFactor + gMapCanvas.width / 2), - Math.round((gLastDrawnPoint.y - gPos.y) / gZoomFactor + gMapCanvas.height / 2)); - } + // Continue drawing segment, close if needed. gTrackContext.lineTo(mappos.x, mappos.y); if (!trackpoint.optimized) gTrackContext.stroke(); @@ -600,8 +729,8 @@ function drawTrackPoint(aLatitude, aLongitude, lastPoint) { function drawCurrentLocation(trackPoint) { var locpoint = gps2xy(trackPoint.coords.latitude, trackPoint.coords.longitude); var circleRadius = Math.round(gCurLocSize / 2); - var mappos = {x: Math.round((locpoint.x - gPos.x) / gZoomFactor + gMapCanvas.width / 2), - y: Math.round((locpoint.y - gPos.y) / gZoomFactor + gMapCanvas.height / 2)}; + var mappos = {x: Math.round((locpoint.x - gMap.pos.x) / gMap.zoomFactor + gMap.width / 2), + y: Math.round((locpoint.y - gMap.pos.y) / gMap.zoomFactor + gMap.height / 2)}; undrawCurrentLocation(); @@ -624,8 +753,8 @@ function drawCurrentLocation(trackPoint) { function undrawCurrentLocation() { if (gCurPosMapCache) { var oldpoint = gCurPosMapCache.point; - var oldmp = {x: Math.round((oldpoint.x - gPos.x) / gZoomFactor + gMapCanvas.width / 2), - y: Math.round((oldpoint.y - gPos.y) / gZoomFactor + gMapCanvas.height / 2)}; + var oldmp = {x: Math.round((oldpoint.x - gMap.pos.x) / gMap.zoomFactor + gMap.width / 2), + y: Math.round((oldpoint.y - gMap.pos.y) / gMap.zoomFactor + gMap.height / 2)}; gTrackContext.putImageData(gCurPosMapCache.data, oldmp.x - gCurPosMapCache.radius, oldmp.y - gCurPosMapCache.radius); @@ -633,6 +762,54 @@ function undrawCurrentLocation() { } } +function calcTrackDuration() { + // Get the duration of the track in s. + var tDuration = 0; + if (gTrack.length > 1) { + for (var i = 1; i < gTrack.length; i++) { + if (!gTrack[i].beginSegment) { + tDuration += (gTrack[i].time - gTrack[i-1].time); + } + } + } + return Math.round(tDuration / 1000); // The timestamps are in ms but we return seconds. +} + +function calcTrackLength() { + // Get the length of the track in km. + var tLength = 0; + if (gTrack.length > 1) { + for (var i = 1; i < gTrack.length; i++) { + if (!gTrack[i].beginSegment) { + tLength += getPointDistance(gTrack[i-1].coords, gTrack[i].coords); + } + } + } + return tLength; +} + +function getPointDistance(aGPSPoint1, aGPSPoint2) { + // Get the distance in km between the two given GPS points. + // See http://stackoverflow.com/questions/365826/calculate-distance-between-2-gps-coordinates + // Earth is almost exactly a sphere and we calculate small distances on the surface, so we can do spherical great-circle math. + // Also see http://en.wikipedia.org/wiki/Great-circle_distance + var R = 6371; // km + var dLat = deg2rad(aGPSPoint2.latitude - aGPSPoint1.latitude); + var dLon = deg2rad(aGPSPoint2.longitude - aGPSPoint1.longitude); + var lat1 = deg2rad(aGPSPoint1.latitude); + var lat2 = deg2rad(aGPSPoint2.latitude); + + var a = Math.sin(dLat/2) * Math.sin(dLat/2) + + Math.sin(dLon/2) * Math.sin(dLon/2) * Math.cos(lat1) * Math.cos(lat2); + var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); + return R * c; +} + +function deg2rad(aDegreeValue) { + // Convert an angle in degrees to radiants. + return aDegreeValue * (Math.PI / 180); +} + var mapEvHandler = { handleEvent: function(aEvent) { var touchEvent = aEvent.type.indexOf('touch') != -1; @@ -676,8 +853,8 @@ var mapEvHandler = { gDragTouchID = aEvent.changedTouches.item(0).identifier; coordObj = aEvent.changedTouches.identifiedTouch(gDragTouchID); } - var x = coordObj.clientX - gMapCanvas.offsetLeft; - var y = coordObj.clientY - gMapCanvas.offsetTop; + var x = coordObj.clientX - gGLMapCanvas.offsetLeft; + var y = coordObj.clientY - gGLMapCanvas.offsetTop; if (touchEvent || aEvent.button === 0) { gDragging = true; @@ -700,22 +877,22 @@ var mapEvHandler = { if (gPinchStartWidth / curPinchStartWidth > 1.7 || gPinchStartWidth / curPinchStartWidth < 0.6) { - var newZoomLevel = gPos.z + (gPinchStartWidth < curPinchStartWidth ? 1 : -1); - if ((newZoomLevel >= 0) && (newZoomLevel <= gMaxZoom)) { + var newZoomLevel = gMap.pos.z + (gPinchStartWidth < curPinchStartWidth ? 1 : -1); + if ((newZoomLevel >= 0) && (newZoomLevel <= gMap.maxZoom)) { // Calculate new center of the map - preserve middle of pinch. // This means that pixel distance between old center and middle // must equal pixel distance of new center and middle. var x = (aEvent.targetTouches.item(1).clientX + aEvent.targetTouches.item(0).clientX) / 2 - - gMapCanvas.offsetLeft; + gGLMapCanvas.offsetLeft; var y = (aEvent.targetTouches.item(1).clientY + aEvent.targetTouches.item(0).clientY) / 2 - - gMapCanvas.offsetTop; + gGLMapCanvas.offsetTop; // Zoom factor after this action. - var newZoomFactor = Math.pow(2, gMaxZoom - newZoomLevel); - gPos.x -= (x - gMapCanvas.width / 2) * (newZoomFactor - gZoomFactor); - gPos.y -= (y - gMapCanvas.height / 2) * (newZoomFactor - gZoomFactor); + var newZoomFactor = Math.pow(2, gMap.maxZoom - newZoomLevel); + gMap.pos.x -= (x - gMap.width / 2) * (newZoomFactor - gMap.zoomFactor); + gMap.pos.y -= (y - gMap.height / 2) * (newZoomFactor - gMap.zoomFactor); if (gPinchStartWidth < curPinchStartWidth) zoomIn(); @@ -729,27 +906,14 @@ var mapEvHandler = { // If we are in a pinch, do not drag. break; } - var x = coordObj.clientX - gMapCanvas.offsetLeft; - var y = coordObj.clientY - gMapCanvas.offsetTop; + var x = coordObj.clientX - gGLMapCanvas.offsetLeft; + var y = coordObj.clientY - gGLMapCanvas.offsetTop; if (gDragging === true) { var dX = x - gLastMouseX; var dY = y - gLastMouseY; - gPos.x -= dX * gZoomFactor; - gPos.y -= dY * gZoomFactor; - if (true) { // use optimized path - var mapData = gMapContext.getImageData(0, 0, - gMapCanvas.width, - gMapCanvas.height); - gMapContext.clearRect(0, 0, gMapCanvas.width, gMapCanvas.height); - gMapContext.putImageData(mapData, dX, dY); - drawMap({left: (dX > 0) ? dX : 0, - right: (dX < 0) ? -dX : 0, - top: (dY > 0) ? dY : 0, - bottom: (dY < 0) ? -dY : 0}); - } - else { - drawMap(false, true); - } + gMap.pos.x -= dX * gMap.zoomFactor; + gMap.pos.y -= dY * gMap.zoomFactor; + gMap.draw(); showUI(); } gLastMouseX = x; @@ -776,8 +940,8 @@ var mapEvHandler = { // Debug output: "coordinates" of the point the mouse was over. /* - var ptCoord = {x: gPos.x + (x - gMapCanvas.width / 2) * gZoomFactor, - y: gPos.y + (x - gMapCanvas.height / 2) * gZoomFactor}; + var ptCoord = {x: gMap.pos.x + (x - gMap.width / 2) * gMap.zoomFactor, + y: gMap.pos.y + (x - gMap.height / 2) * gMap.zoomFactor}; var gpsCoord = xy2gps(ptCoord.x, ptCoord.y); var pt2Coord = gps2xy(gpsCoord.latitude, gpsCoord.longitude); console.log(ptCoord.x + "/" + ptCoord.y + " - " + @@ -785,18 +949,18 @@ var mapEvHandler = { pt2Coord.x + "/" + pt2Coord.y); */ - var newZoomLevel = gPos.z + (aEvent.deltaY < 0 ? 1 : -1); - if ((newZoomLevel >= 0) && (newZoomLevel <= gMaxZoom)) { + var newZoomLevel = gMap.pos.z + (aEvent.deltaY < 0 ? 1 : -1); + if ((newZoomLevel >= 0) && (newZoomLevel <= gMap.maxZoom)) { // 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 - gMapCanvas.offsetLeft; - var y = coordObj.clientY - gMapCanvas.offsetTop; + var x = coordObj.clientX - gGLMapCanvas.offsetLeft; + var y = coordObj.clientY - gGLMapCanvas.offsetTop; // Zoom factor after this action. - var newZoomFactor = Math.pow(2, gMaxZoom - newZoomLevel); - gPos.x -= (x - gMapCanvas.width / 2) * (newZoomFactor - gZoomFactor); - gPos.y -= (y - gMapCanvas.height / 2) * (newZoomFactor - gZoomFactor); + var newZoomFactor = Math.pow(2, gMap.maxZoom - newZoomLevel); + gMap.pos.x -= (x - gMap.width / 2) * (newZoomFactor - gMap.zoomFactor); + gMap.pos.y -= (y - gMap.height / 2) * (newZoomFactor - gMap.zoomFactor); if (aEvent.deltaY < 0) zoomIn(); @@ -812,16 +976,16 @@ var mapEvHandler = { var dY = 0; switch (aEvent.which) { case 39: // right - dX = -gTileSize / 2; + dX = -gMap.tileSize / 2; break; case 37: // left - dX = gTileSize / 2; + dX = gMap.tileSize / 2; break; case 38: // up - dY = gTileSize / 2; + dY = gMap.tileSize / 2; break; case 40: // down - dY = -gTileSize / 2; + dY = -gMap.tileSize / 2; break; case 87: // w case 107: // + (numpad) @@ -868,28 +1032,24 @@ var mapEvHandler = { // Move if needed. if (dX || dY) { - gPos.x -= dX * gZoomFactor; - gPos.y -= dY * gZoomFactor; - if (true) { // use optimized path - var mapData = gMapContext.getImageData(0, 0, - gMapCanvas.width, - gMapCanvas.height); - gMapContext.clearRect(0, 0, gMapCanvas.width, gMapCanvas.height); - gMapContext.putImageData(mapData, dX, dY); - drawMap({left: (dX > 0) ? dX : 0, - right: (dX < 0) ? -dX : 0, - top: (dY > 0) ? dY : 0, - bottom: (dY < 0) ? -dY : 0}); - } - else { - drawMap(false, true); - } + gMap.pos.x -= dX * gMap.zoomFactor; + gMap.pos.y -= dY * gMap.zoomFactor; + gMap.draw(); } break; } } }; +function visibilityEvHandler() { + // Immediately draw if we just got visible. + if (document.hidden != true) { + gMap.draw(); + } + // No need to handle the event where we become invisible as we care only draw + // when we are visible anyhow. +} + var geofake = { tracking: false, lastPos: {x: undefined, y: undefined}, @@ -966,11 +1126,11 @@ function startTracking() { if (gCenterPosition) { var posCoord = gps2xy(position.coords.latitude, position.coords.longitude); - if (Math.abs(gPos.x - posCoord.x) > gMapCanvas.width * gZoomFactor / 4 || - Math.abs(gPos.y - posCoord.y) > gMapCanvas.height * gZoomFactor / 4) { - gPos.x = posCoord.x; - gPos.y = posCoord.y; - drawMap(); // This draws the current point as well. + if (Math.abs(gMap.pos.x - posCoord.x) > gMap.width * gMap.zoomFactor / 4 || + Math.abs(gMap.pos.y - posCoord.y) > gMap.height * gMap.zoomFactor / 4) { + gMap.pos.x = posCoord.x; + gMap.pos.y = posCoord.y; + gMap.draw(); // This draws the current point as well. redrawn = true; } } @@ -1014,11 +1174,11 @@ var gTileService = { get: function(aStyle, aCoords, aCallback) { var norm = normalizeCoords(aCoords); - var dbkey = aStyle + "::" + norm.x + "," + norm.y + "," + norm.z; + var dbkey = getTileKey(aStyle, norm); this.getDBCache(dbkey, function(aResult, aEvent) { if (aResult) { // We did get a cached object. - aCallback(aResult.image, aStyle, aCoords); + aCallback(aResult.image, aStyle, aCoords, dbkey); // Look at the timestamp and return if it's not too old. if (aResult.timestamp + gTileService.ageLimit > Date.now()) return; @@ -1033,14 +1193,15 @@ var gTileService = { .replace("{x}", norm.x) .replace("{y}", norm.y) .replace("{z}", norm.z) - .replace("[a-c]", String.fromCharCode(97 + Math.floor(Math.random() * 2))) - .replace("[1-4]", 1 + Math.floor(Math.random() * 3)), + .replace("[a-c]", String.fromCharCode(97 + Math.floor(Math.random() * 3))) + .replace("[a-d]", String.fromCharCode(97 + Math.floor(Math.random() * 4))) + .replace("[1-4]", 1 + Math.floor(Math.random() * 4)), true); XHR.responseType = "blob"; XHR.addEventListener("load", function () { if (XHR.status === 200) { var blob = XHR.response; - aCallback(blob, aStyle, aCoords); + aCallback(blob, aStyle, aCoords, dbkey); gTileService.setDBCache(dbkey, {image: blob, timestamp: Date.now()}); } }, false);