Put some constants in new settings.js, add Fiord map style (close #7)
This commit is contained in:
parent
5c35280588
commit
57da01c03c
@ -33,4 +33,5 @@
|
|||||||
<plugin name="cordova-plugin-whitelist" spec="1" />
|
<plugin name="cordova-plugin-whitelist" spec="1" />
|
||||||
<plugin name="at.gofg.sportscomputer.powermanagement" spec="~1.1.0" />
|
<plugin name="at.gofg.sportscomputer.powermanagement" spec="~1.1.0" />
|
||||||
<plugin name="cordova-plugin-inappbrowser" spec="~3.1.0" />
|
<plugin name="cordova-plugin-inappbrowser" spec="~3.1.0" />
|
||||||
|
<engine name="android" spec="^8.0.0" />
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -67,7 +67,7 @@ $("#addpackagebtn").click(function () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var address = ($("input[name=number]").val() + " " + $("input[name=street]").val()).toUpperCase();
|
var address = ($("input[name=number]").val() + " " + $("input[name=street]").val()).toUpperCase();
|
||||||
$.getJSON(geocodeapi, {
|
$.getJSON(SETTINGS.geocodeapi, {
|
||||||
address: address + " " + $("input[name=citystate]").val().toUpperCase()
|
address: address + " " + $("input[name=citystate]").val().toUpperCase()
|
||||||
}, function (resp) {
|
}, function (resp) {
|
||||||
if (resp.status == "OK") {
|
if (resp.status == "OK") {
|
||||||
|
@ -14,26 +14,20 @@ function leafletMap() {
|
|||||||
attributionControl: false
|
attributionControl: false
|
||||||
});
|
});
|
||||||
|
|
||||||
var mapSources = {
|
|
||||||
"offline": 'assets/tiles/{z}/{x}/{y}.png',
|
|
||||||
"liberty": 'https://maps.netsyms.net/styles/osm-liberty/{z}/{x}/{y}.png',
|
|
||||||
"terrain": 'https://maps.netsyms.net/styles/klokantech-terrain/{z}/{x}/{y}.png'
|
|
||||||
};
|
|
||||||
|
|
||||||
if (localStorage.getItem("mapsource") == null) {
|
if (localStorage.getItem("mapsource") == null) {
|
||||||
localStorage.setItem("mapsource", "offline");
|
localStorage.setItem("mapsource", "liberty");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (localStorage.getItem("mapsource") == "offline") {
|
if (localStorage.getItem("mapsource") == "offline") {
|
||||||
map.setMaxBounds(L.latLngBounds(L.latLng(46.7384, -112.1429), L.latLng(46.5127, -111.7557)));
|
map.setMaxBounds(L.latLngBounds(L.latLng(46.7384, -112.1429), L.latLng(46.5127, -111.7557)));
|
||||||
map.setMinZoom(12);
|
map.setMinZoom(12);
|
||||||
map.setMaxZoom(16);
|
map.setMaxZoom(16);
|
||||||
L.tileLayer(mapSources[localStorage.getItem("mapsource")], {
|
L.tileLayer(SETTINGS.maptileurls[localStorage.getItem("mapsource")], {
|
||||||
minZoom: 12,
|
minZoom: 12,
|
||||||
maxZoom: 16
|
maxZoom: 16
|
||||||
}).addTo(map);
|
}).addTo(map);
|
||||||
} else {
|
} else {
|
||||||
L.tileLayer(mapSources[localStorage.getItem("mapsource")], {
|
L.tileLayer(SETTINGS.maptileurls[localStorage.getItem("mapsource")], {
|
||||||
minZoom: 1,
|
minZoom: 1,
|
||||||
maxZoom: 19
|
maxZoom: 19
|
||||||
}).addTo(map);
|
}).addTo(map);
|
||||||
|
@ -117,6 +117,9 @@ function pickMapSource() {
|
|||||||
{
|
{
|
||||||
text: 'Terrain' + (currentmapsource == "terrain" ? " (current)" : ""),
|
text: 'Terrain' + (currentmapsource == "terrain" ? " (current)" : ""),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
text: 'Dark Fiord' + (currentmapsource == "fiord" ? " (current)" : ""),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
text: 'Cancel',
|
text: 'Cancel',
|
||||||
color: 'red'
|
color: 'red'
|
||||||
@ -135,6 +138,9 @@ function pickMapSource() {
|
|||||||
case 2:
|
case 2:
|
||||||
mapsource = "terrain";
|
mapsource = "terrain";
|
||||||
break;
|
break;
|
||||||
|
case 3:
|
||||||
|
mapsource = "fiord";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -19,16 +19,14 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
|
||||||
var geocodeapi = "https://apis.netsyms.net/packagehelper/geocode.php";
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script src="node_modules/framework7/js/framework7.bundle.min.js"></script>
|
<script src="node_modules/framework7/js/framework7.bundle.min.js"></script>
|
||||||
<script src="node_modules/jquery/dist/jquery.min.js"></script>
|
<script src="node_modules/jquery/dist/jquery.min.js"></script>
|
||||||
<script src="node_modules/leaflet/dist/leaflet.js"></script>
|
<script src="node_modules/leaflet/dist/leaflet.js"></script>
|
||||||
<script src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
|
<script src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
|
||||||
<script src="node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.js"></script>
|
<script src="node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.js"></script>
|
||||||
|
|
||||||
|
<script src="settings.js"></script>
|
||||||
|
|
||||||
<script src="assets/js/platform.js"></script>
|
<script src="assets/js/platform.js"></script>
|
||||||
|
|
||||||
<script src="assets/js/audio.js"></script>
|
<script src="assets/js/audio.js"></script>
|
||||||
|
9
www/settings.js
Normal file
9
www/settings.js
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
var SETTINGS = {
|
||||||
|
"maptileurls": {
|
||||||
|
"offline": "assets/tiles/{z}/{x}/{y}.png",
|
||||||
|
"liberty": "https://maps.netsyms.net/styles/osm-liberty/{z}/{x}/{y}.png",
|
||||||
|
"terrain": "https://maps.netsyms.net/styles/klokantech-terrain/{z}/{x}/{y}.png",
|
||||||
|
"fiord": "https://maps.netsyms.net/styles/fiord-color/{z}/{x}/{y}.png"
|
||||||
|
},
|
||||||
|
"geocodeapi": "https://apis.netsyms.net/packagehelper/geocode.php"
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user