diff --git a/Caddyfile b/Caddyfile
index 2667b99..c37c710 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -18,5 +18,5 @@ log stdout
errors stdout
-header / Content-Security-Policy "default-src 'self' ; media-src https://storage.theel0ja.info; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://www1.theel0ja.info https://www0.theel0ja.info https://cdnjs.cloudflare.com https://cdn.theel0ja.info; style-src 'self' data: 'unsafe-inline' https://cdnjs.cloudflare.com https://getbootstrap.com https://cdn.theel0ja.info; img-src 'self' data: https://www0.theel0ja.info blob: https://cdn.rawgit.com; font-src data: ; connect-src https://sentry.io https://*.tiles.mapbox.com https://api.mapbox.com; child-src data: blob:; report-uri https://sentry.io/api/942255/csp-report/?sentry_key=87c404ea730a4a0cb596ca0caec20bbb;"
+# header / Content-Security-Policy "default-src 'self' ; media-src https://storage.theel0ja.info; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://www1.theel0ja.info https://www0.theel0ja.info https://cdnjs.cloudflare.com https://cdn.theel0ja.info; style-src 'self' data: 'unsafe-inline' https://cdnjs.cloudflare.com https://getbootstrap.com https://cdn.theel0ja.info; img-src 'self' data: https://www0.theel0ja.info blob: https://cdn.rawgit.com; font-src data: ; connect-src https://sentry.io https://*.tiles.mapbox.com https://api.mapbox.com; child-src data: blob:; report-uri https://sentry.io/api/942255/csp-report/?sentry_key=87c404ea730a4a0cb596ca0caec20bbb;"
header / X-Frame-Options "DENY"
diff --git a/docker-compose.yml b/docker-compose.yml
index 81c68ca..9e8ba46 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
build: .
#image: abiosoft/caddy:php
ports:
- - 172.19.5.1:30005:2015
+ - 30005:2015
volumes:
- ./Caddyfile:/etc/Caddyfile
- ./src:/app/src
diff --git a/src/assets/js/templates/index.js b/src/assets/js/templates/index.js
index f4f37f2..94ba667 100644
--- a/src/assets/js/templates/index.js
+++ b/src/assets/js/templates/index.js
@@ -19,16 +19,32 @@ var inputs = layerList.getElementsByTagName('input');
function switchLayer(layer) {
var layerId = layer.target.id;
- map.setStyle('mapbox://styles/mapbox/' + layerId + '-v9');
+
+ if(layerId == "streets-alt") {
+ map.setStyle("https://tiles-conf.osm.theel0ja.info/config.php?tilejson=https://storage1.theel0ja.info/mapserver/planet.json&style=osm-bright");
+ } else {
+ map.setStyle('mapbox://styles/mapbox/' + layerId + '-v9');
+ }
+
if(layerId == "satellite-streets") {
- // Remove active from Streets
+ // Remove active from Streets & Streets-Alt
$( "#menu #streets-btn" ).removeClass("active");
+ $( "#menu #streets-alt-btn" ).removeClass("active");
+
$( "#menu #satellite-streets-btn" ).addClass("active");
} else if(layerId == "streets") {
- // Remove active class from Satellite Streets
+ // Remove active class from Satellite Streets & Streets-Alt
$( "#menu #satellite-streets-btn" ).removeClass("active");
+ $( "#menu #streets-alt-btn" ).removeClass("active");
+
$( "#menu #streets-btn" ).addClass("active");
+ } else if(layerId == "streets-alt") {
+ // Remove active class from Satellite Streets & Streets
+ $( "#menu #streets-btn" ).removeClass("active");
+ $( "#menu #satellite-streets-btn" ).removeClass("active");
+
+ $( "#menu #streets-alt-btn" ).addClass("active");
} else {
throw "Error: Unknown layer";
}
diff --git a/src/templates/index.html.twig b/src/templates/index.html.twig
index a44d0c4..0d091a2 100644
--- a/src/templates/index.html.twig
+++ b/src/templates/index.html.twig
@@ -27,6 +27,8 @@
Streets