X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fmap.js;h=490bfac9eb002836449a825af930d37dbb1522e2;hp=f9ce632f83c9ecdb2d497bc159b16025a52d0177;hb=ed4c478c78a978f1aced6806397f897eb8371c3b;hpb=7a076538678eb75b90e066df5e2d51346067927d
diff --git a/js/map.js b/js/map.js
index f9ce632..490bfac 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;
@@ -661,7 +682,7 @@ function drawTrack() {
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));
}
}
}
@@ -681,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 - 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();
@@ -745,7 +767,9 @@ function calcTrackDuration() {
var tDuration = 0;
if (gTrack.length > 1) {
for (var i = 1; i < gTrack.length; i++) {
- tDuration += (gTrack[i].time - gTrack[i-1].time);
+ 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.
@@ -756,7 +780,9 @@ function calcTrackLength() {
var tLength = 0;
if (gTrack.length > 1) {
for (var i = 1; i < gTrack.length; i++) {
- tLength += getPointDistance(gTrack[i-1].coords, gTrack[i].coords);
+ if (!gTrack[i].beginSegment) {
+ tLength += getPointDistance(gTrack[i-1].coords, gTrack[i].coords);
+ }
}
}
return tLength;
@@ -1168,6 +1194,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";