projects
/
lantea.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ace4b36
)
see if we can actually make storing map across app sessions work
author
Robert Kaiser
<kairo@kairo.at>
Fri, 1 May 2015 01:21:35 +0000
(
03:21
+0200)
committer
Robert Kaiser
<kairo@kairo.at>
Fri, 1 May 2015 01:21:35 +0000
(
03:21
+0200)
js/map.js
patch
|
blob
|
blame
|
history
diff --git
a/js/map.js
b/js/map.js
index 53b076af255bfc746a9ced40b6c2a2504fd4a4e7..c7a69e835d56ed86f3548dbcc6930b4cb99be27a 100644
(file)
--- a/
js/map.js
+++ b/
js/map.js
@@
-108,8
+108,6
@@
function initMap() {
}
gTrackCanvas = document.getElementById("track");
gTrackContext = gTrackCanvas.getContext("2d");
}
gTrackCanvas = document.getElementById("track");
gTrackContext = gTrackCanvas.getContext("2d");
- if (!gMap.activeMap)
- gMap.activeMap = "osm_mapnik";
//gDebug = true;
if (gDebug) {
//gDebug = true;
if (gDebug) {
@@
-153,8
+151,6
@@
function loadPrefs(aEvent) {
document.addEventListener("visibilitychange", visibilityEvHandler, false);
console.log("Events added.");
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();
console.log("Init loading tile...");
gLoadingTile = new Image();
@@
-175,8
+171,13
@@
function loadPrefs(aEvent) {
gPrefs.get("active_map_style", function(aValue) {
if (aValue && gMapStyles[aValue]) {
gMap.activeMap = aValue;
gPrefs.get("active_map_style", function(aValue) {
if (aValue && gMapStyles[aValue]) {
gMap.activeMap = aValue;
- document.getElementById("mapSelector").value = 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--;
var throwEv = new CustomEvent("prefs-step");
gAction.dispatchEvent(throwEv);
@@
-631,13
+632,15
@@
function xy2gps(aX, aY) {
function setMapStyle() {
var mapSel = document.getElementById("mapSelector");
function setMapStyle() {
var mapSel = document.getElementById("mapSelector");
- if (
!gWaitCounter &&
mapSel.selectedIndex >= 0 && gMap.activeMap != mapSel.value) {
+ 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;
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();
+ }
}
}
}
}