X-Git-Url: https://git-public.kairo.at//?a=blobdiff_plain;f=js%2Fmap.js;h=b63aea5fe1272ffd773cc4464cc02781765b6e4b;hb=67aadbe86b7bb9d03cf24784a17238404934195d;hp=dbe2fae38153522d55671f4d4e9297fec94336b8;hpb=31011cc9f47b3a7219781e6ff4e9ac47b0bc7bc9;p=lantea.git
diff --git a/js/map.js b/js/map.js
index dbe2fae..b63aea5 100644
--- a/js/map.js
+++ b/js/map.js
@@ -29,12 +29,12 @@ var gMapStyles = {
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: "https://tilecache[1-4].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: "https://tilecache[1-4].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:
@@ -88,7 +88,7 @@ var gMapPrefsLoaded = false;
var gDragging = false;
var gDragTouchID, gPinchStartWidth;
-var gGeoWatchID;
+var gGeoWatchID, gGPSWakeLock;
var gTrack = [];
var gLastTrackPoint, gLastDrawnPoint;
var gCenterPosition = true;
@@ -861,12 +861,12 @@ var mapEvHandler = {
// Bail out if the started touch can't be found.
if (touchEvent && gDragging &&
- !aEvent.changedTouches.identifiedTouch(gDragTouchID))
+ !aEvent.targetTouches.item(0))
return;
}
var coordObj = touchEvent ?
- aEvent.changedTouches.identifiedTouch(gDragTouchID) :
+ aEvent.targetTouches.item(0) :
aEvent;
switch (aEvent.type) {
@@ -881,8 +881,7 @@ var mapEvHandler = {
aEvent.targetTouches.item(0).clientY, 2)
);
}
- gDragTouchID = aEvent.changedTouches.item(0).identifier;
- coordObj = aEvent.changedTouches.identifiedTouch(gDragTouchID);
+ coordObj = aEvent.targetTouches.item(0);
}
var x = coordObj.clientX - gGLMapCanvas.offsetLeft;
var y = coordObj.clientY - gGLMapCanvas.offsetTop;
@@ -1132,6 +1131,9 @@ function startTracking() {
if (gGeolocation) {
gActionLabel.textContent = "Establishing Position";
gAction.style.display = "block";
+ if (navigator.requestWakeLock) {
+ gGPSWakeLock = navigator.requestWakeLock("gps");
+ }
gGeoWatchID = gGeolocation.watchPosition(
function(position) {
if (gActionLabel.textContent) {
@@ -1187,6 +1189,10 @@ function endTracking() {
gActionLabel.textContent = "";
gAction.style.display = "none";
}
+ if (navigator.requestWakeLock && gGPSWakeLock) {
+ console.log("releasing WakeLock");
+ gGPSWakeLock.unlock();
+ }
if (gGeoWatchID) {
gGeolocation.clearWatch(gGeoWatchID);
}