X-Git-Url: https://git-public.kairo.at/?a=blobdiff_plain;ds=inline;f=js%2Fmap.js;h=dbe2fae38153522d55671f4d4e9297fec94336b8;hb=31011cc9f47b3a7219781e6ff4e9ac47b0bc7bc9;hp=dbc6904715b1e6c12d9a7d0feeef7dda6d04c711;hpb=0f6678faa1ae37dd652e341cb31e04b3f277b904;p=lantea.git
diff --git a/js/map.js b/js/map.js
index dbc6904..dbe2fae 100644
--- a/js/map.js
+++ b/js/map.js
@@ -14,34 +14,68 @@ 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: "https://tilecache.kairo.at/osmde/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //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:
+ {name: "ÃPNV-Karte (OSM)",
+ url: "https://tilecache.kairo.at/oepnv/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //url: "http://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png", // memomaps.de does not support CORS or https at this time :(
+ 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: "https://tilecache[1-4].kairo.at/mapqosm/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //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",
+ url: "https://tilecache[1-4].kairo.at/mapqsat/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //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: "https://tilecache[1-4].kairo.at/osmhot/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //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:
+ {name: "Hike and Bike (OSM)",
+ url: "https://tilecache[1-4].kairo.at/hikebike/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //url: "http://toolserver.org/tiles/hikebike/{z}/{x}/{y}.png", // toolserver.org does not support CORS at this time :(
+ copyright: 'Map data and imagery © OpenStreetMap contributors, ODbL/CC-BY-SA'},
+ outdoors:
+ {name: "Outdoors (OSM)",
+ url: "https://[a-c].tile.thunderforest.com/outdoors/{z}/{x}/{y}.png", // url: "http://[a-c].tile.opencyclemap.org/outdoors/{z}/{x}/{y}.png",
+ copyright: 'Map data © OpenStreetMap and contributors (ODbL/CC-BY-SA), tiles by Thunderforest.'},
+ stamen_toner:
+ {name: "Stamen Toner (B+W)",
+ url: "https://tilecache[1-4].kairo.at/toner/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //url: "http://[a-c].tile.stamen.com/toner/{z}/{x}/{y}.jpg", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com
+ 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)",
+ url: "https://tilecache[1-4].kairo.at/terrain/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //url: "http://[a-c].tile.stamen.com/terrain/{z}/{x}/{y}.jpg", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com
+ copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'},
+ stamen_watercolor:
+ {name: "Stamen Watercolor (artistic)",
+ url: "https://tilecache[1-4].kairo.at/watercolor/{z}/{x}/{y}.png", // route through CORS+SSL tilecache @ kairo.at
+ //url: "http://[a-c].tile.stamen.com/watercolor/{z}/{x}/{y}.jpg", // https has wrong cert, .ssl.fastly.net instead of .tile.stamen.com
+ copyright: 'Map data © OpenStreetMap contributors, ODbL/CC-BY-SA, tiles by Stamen Design, under CC BY 3.0.'},
};
var gLastMouseX = 0;
@@ -72,15 +106,21 @@ 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 (!gMap.activeMap)
- gMap.activeMap = "osm_mapnik";
//gDebug = true;
if (gDebug) {
@@ -121,15 +161,19 @@ function loadPrefs(aEvent) {
document.getElementById("body").addEventListener("keydown", mapEvHandler, false);
- document.getElementById("copyright").innerHTML =
- gMapStyles[gMap.activeMap].copyright;
+ document.addEventListener("visibilitychange", visibilityEvHandler, false);
+
+ console.log("Events added.");
+ 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 {
@@ -137,6 +181,21 @@ function loadPrefs(aEvent) {
gAction.removeEventListener(aEvent.type, loadPrefs, false);
gAction.addEventListener("prefs-step", loadPrefs, false);
gWaitCounter++;
+ gPrefs.get("active_map_style", function(aValue) {
+ if (aValue && gMapStyles[aValue]) {
+ gMap.activeMap = aValue;
+ }
+ else {
+ gMap.activeMap = "osm_mapnik";
+ }
+ document.getElementById("mapSelector").value = gMap.activeMap;
+ document.getElementById("copyright").innerHTML =
+ gMapStyles[gMap.activeMap].copyright;
+ gWaitCounter--;
+ var throwEv = new CustomEvent("prefs-step");
+ gAction.dispatchEvent(throwEv);
+ });
+ gWaitCounter++;
gPrefs.get("position", function(aValue) {
if (aValue && aValue.x && aValue.y && aValue.z) {
gMap.pos = aValue;
@@ -147,10 +206,12 @@ function loadPrefs(aEvent) {
});
gWaitCounter++;
gPrefs.get("center_map", function(aValue) {
- if (aValue === undefined)
+ if (aValue === undefined) {
document.getElementById("centerCheckbox").checked = true;
- else
+ }
+ else {
document.getElementById("centerCheckbox").checked = aValue;
+ }
setCentering(document.getElementById("centerCheckbox"));
gWaitCounter--;
var throwEv = new CustomEvent("prefs-step");
@@ -158,10 +219,12 @@ function loadPrefs(aEvent) {
});
gWaitCounter++;
gPrefs.get("tracking_enabled", function(aValue) {
- if (aValue === undefined)
+ if (aValue === undefined) {
document.getElementById("trackCheckbox").checked = true;
- else
+ }
+ else {
document.getElementById("trackCheckbox").checked = aValue;
+ }
gWaitCounter--;
var throwEv = new CustomEvent("prefs-step");
gAction.dispatchEvent(throwEv);
@@ -173,11 +236,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 {
@@ -203,7 +269,8 @@ var gMap = {
glResolutionAttr: null,
glMapTexture: null,
glTextures: {},
- glTextureKeys: {},
+ glTxCleanIntervalID: null,
+ glTexturesPerZoomLevel: 0,
activeMap: "osm_mapnik",
tileSize: 256,
@@ -214,6 +281,11 @@ var gMap = {
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; },
@@ -229,7 +301,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' +
@@ -238,12 +310,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());
@@ -263,6 +337,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);
@@ -277,6 +352,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.
@@ -292,19 +368,28 @@ var gMap = {
gMap.gl.enableVertexAttribArray(gMap.glTextureCoordAttr);
gMap.gl.vertexAttribPointer(gMap.glTextureCoordAttr, 2, gMap.gl.FLOAT, false, 0, 0);
- gMap.loadImageToTexture(gLoadingTile, 0, "loading::0,0,0");
+ 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);
+ }
},
draw: function() {
@@ -317,25 +402,25 @@ var gMap = {
document.getElementById("zoomLevel").textContent = gMap.pos.z;
gMap.zoomFactor = Math.pow(2, gMap.maxZoom - gMap.pos.z);
- var wid = gMap.gl.drawingBufferWidth * gMap.zoomFactor; // Width in level 18 pixels.
- var ht = gMap.gl.drawingBufferHeight * gMap.zoomFactor; // Height in level 18 pixels.
- var size = gMap.tileSize * gMap.zoomFactor; // Tile size in level 18 pixels.
+ 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 - wid / 2; // Corners of the window in level 18 pixels.
- var yMin = gMap.pos.y - ht / 2;
- var xMax = gMap.pos.x + wid / 2;
- var yMax = gMap.pos.y + ht / 2;
+ 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 / 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!
+ 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.glTextureKeys[tileKey]) {
+ if (!gMap.glTextures[tileKey]) {
// Initiate loading/drawing of the actual tile.
gTileService.get(gMap.activeMap, coords,
function(aImage, aStyle, aCoords, aTileKey) {
@@ -345,10 +430,10 @@ var gMap = {
var imgURL = URL.createObjectURL(aImage);
var imgObj = new Image();
imgObj.onload = function() {
- var txNr = 1;
- while (gMap.glTextures["tx" + txNr]) { txNr++; }
- gMap.loadImageToTexture(imgObj, txNr, aTileKey);
- requestAnimationFrame(function(aTimestamp) { gMap.drawGL() });
+ 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;
@@ -357,37 +442,32 @@ var gMap = {
}
}
}
- requestAnimationFrame(function(aTimestamp) { gMap.drawGL() });
+ if (document.hidden != true) { // Only draw if we're actually visible.
+ window.requestAnimationFrame(function(aTimestamp) { gMap.drawGL() });
+ }
},
drawGL: function() {
- var wid = gMap.gl.drawingBufferWidth * gMap.zoomFactor; // Width in level 18 pixels.
- var ht = gMap.gl.drawingBufferHeight * gMap.zoomFactor; // Height in level 18 pixels.
- var size = gMap.tileSize * gMap.zoomFactor; // Tile size in level 18 pixels.
+ 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;
- var xMin = gMap.pos.x - wid / 2; // Corners of the window in level 18 pixels.
- var yMin = gMap.pos.y - ht / 2;
- var xMax = gMap.pos.x + wid / 2;
- var yMax = gMap.pos.y + ht / 2;
-
- var txIndexList = [];
// 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!
- // Round here is **CRUCIAL** otherwise the images are filtered
- // and the performance sucks (more than expected).
- var xoff = Math.round((x * size - xMin) / gMap.zoomFactor);
- var yoff = Math.round((y * size - yMin) / gMap.zoomFactor);
- // Draw the tile, first find out the index of the texture to use.
+ 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);
- var txIndex = gMap.glTextureKeys[tileKey];
- if (!txIndex) { txIndex = 0; }
- txIndexList.push(txIndex);
- gMap.drawTileGL(xoff, yoff, txIndex);
+ if (!gMap.glTextures[tileKey]) {
+ tileKey = getTileKey("loading", {x: 0, y: 0, z: 0});
+ }
+ gMap.drawTileGL(xoff, yoff, tileKey);
}
}
- console.log("Used Indexes: " + txIndexList.join(","));
},
resizeAndDraw: function() {
@@ -405,15 +485,17 @@ var gMap = {
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, aTextureIndex) {
+ drawTileGL: function(aLeft, aRight, aTileKey) {
gMap.gl.activeTexture(gMap.gl.TEXTURE0);
- gMap.gl.bindTexture(gMap.gl.TEXTURE_2D, gMap.glTextures["tx" + aTextureIndex]);
+ 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;
@@ -434,18 +516,88 @@ var gMap = {
gMap.gl.drawArrays(gMap.gl.TRIANGLES, 0, 6);
},
- loadImageToTexture: function(aImage, aTextureIndex, aTileKey) {
- // TODO: Get rid of old textures.
- gMap.glTextureKeys[aTileKey] = aTextureIndex;
+ loadImageToTexture: function(aImage, aTileKey) {
// Create and bind texture.
- gMap.glTextures["tx" + aTextureIndex] = gMap.gl.createTexture();
- gMap.gl.bindTexture(gMap.gl.TEXTURE_2D, gMap.glTextures["tx" + aTextureIndex]);
+ 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);
},
+
+ 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");
+ }
+ },
+
+ handleContextLost: function(event) {
+ event.preventDefault();
+ // GL context is gone, let's reset everything that depends on it.
+ clearInterval(gMap.glTxCleanIntervalID);
+ gMap.glTextures = {};
+ },
+
+ 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.
@@ -495,10 +647,13 @@ function setMapStyle() {
var mapSel = document.getElementById("mapSelector");
if (mapSel.selectedIndex >= 0 && gMap.activeMap != mapSel.value) {
gMap.activeMap = mapSel.value;
+ gPrefs.set("active_map_style", gMap.activeMap);
document.getElementById("copyright").innerHTML =
gMapStyles[gMap.activeMap].copyright;
- showUI();
- gMap.draw();
+ if (!gWaitCounter) { // Only do this when prefs are loaded already.
+ showUI();
+ gMap.draw();
+ }
}
}
@@ -551,13 +706,15 @@ function decodeIndex(encodedIdx) {
}
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));
+ }
}
}
}
@@ -576,22 +733,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 - gMap.pos.x) / gMap.zoomFactor + gMap.width / 2),
- Math.round((gLastDrawnPoint.y - gMap.pos.y) / gMap.zoomFactor + gMap.height / 2));
- }
+ // Continue drawing segment, close if needed.
gTrackContext.lineTo(mappos.x, mappos.y);
if (!trackpoint.optimized)
gTrackContext.stroke();
@@ -635,6 +793,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;
@@ -866,6 +1072,15 @@ var mapEvHandler = {
}
};
+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},
@@ -1009,8 +1224,9 @@ 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 () {
@@ -1083,11 +1299,13 @@ var gTileService = {
var request = transaction.objectStore(this.objStore).clear();
request.onsuccess = function(event) {
success = true;
+ console.log("Cache cleared.");
if (aCallback)
aCallback(success, event);
};
request.onerror = function(event) {
// Errors can be handled here.
+ console.log("Error clearing cache!");
if (aCallback)
aCallback(success, event);
}