X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fmap.js;h=f214881ee9084276418f68d7b72707b87cc90574;hp=ffafab4f8dfd768837f8ea67446851ce9336e5e2;hb=7ef765750ee7eac523572bbd87396491fe955be1;hpb=5dd2ab70fabaf7bf0f74d0975f7d9edce1f264d2 diff --git a/js/map.js b/js/map.js index ffafab4..f214881 100644 --- a/js/map.js +++ b/js/map.js @@ -14,34 +14,55 @@ 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 gLastMouseX = 0; @@ -87,8 +108,6 @@ function initMap() { } gTrackCanvas = document.getElementById("track"); gTrackContext = gTrackCanvas.getContext("2d"); - if (!gMap.activeMap) - gMap.activeMap = "osm_mapnik"; //gDebug = true; if (gDebug) { @@ -132,8 +151,6 @@ function loadPrefs(aEvent) { document.addEventListener("visibilitychange", visibilityEvHandler, false); console.log("Events added."); - document.getElementById("copyright").innerHTML = - gMapStyles[gMap.activeMap].copyright; console.log("Init loading tile..."); gLoadingTile = new Image(); @@ -151,6 +168,22 @@ function loadPrefs(aEvent) { gAction.removeEventListener(aEvent.type, loadPrefs, false); gAction.addEventListener("prefs-step", loadPrefs, false); gWaitCounter++; + gPrefs.get("active_map_style", function(aValue) { + console.log("active_map_style: >>" + 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; @@ -161,10 +194,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"); @@ -172,10 +207,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); @@ -187,11 +224,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 { @@ -595,10 +635,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(); + } } } @@ -651,14 +694,14 @@ function decodeIndex(encodedIdx) { } function drawTrack() { - if (document.hidden != true) { // Only draw if we're actually visible. + 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)); + (i + 1 >= gTrack.length || gTrack[i+1].beginSegment)); } } } @@ -678,22 +721,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(); @@ -737,6 +781,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; @@ -1121,6 +1213,7 @@ var gTileService = { .replace("{y}", norm.y) .replace("{z}", norm.z) .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";