diff options
| author | Arne Hamann <kontakt+github@arne.email> | 2020-01-28 12:23:27 +0300 |
|---|---|---|
| committer | Arne Hamann <kontakt+github@arne.email> | 2020-01-28 12:23:27 +0300 |
| commit | cc305ff2c6c13768e4f8f207062e063e2650cc69 (patch) | |
| tree | 26039a52433559f874d0ae5335cb751f23ba4f7e | |
| parent | 72d4d0904ad207fc5cd949cd61832accf1ea7361 (diff) | |
pitching works3d-buildings-new
Signed-off-by: Arne Hamann <kontakt+github@arne.email>
| -rw-r--r-- | js/script.js | 47 | ||||
| -rw-r--r-- | lib/Controller/PageController.php | 2 |
2 files changed, 25 insertions, 24 deletions
diff --git a/js/script.js b/js/script.js index 5db427fd..76bd5f8c 100644 --- a/js/script.js +++ b/js/script.js @@ -234,7 +234,8 @@ style: 'mapbox://styles/mapbox/streets-v8', minZoom: 1, maxZoom: 22, - attribution: attrib + attribution: attrib, + pitch: 45 }); //mapController.controlLayers.addBaseLayer(mapController.baseLayers['Mapbox vector streets'], 'Mapbox vector streets'); @@ -243,28 +244,9 @@ style: 'mapbox://styles/mapbox/outdoors-v11', minZoom: 1, maxZoom: 22, - attribution: attrib - }); - mapController.controlLayers.addBaseLayer(mapController.baseLayers['Topographic'], 'Topographic'); - - mapController.baseLayers['Dark'] = L.mapboxGL({ - accessToken: optionsValues.mapboxAPIKEY, - style: 'mapbox://styles/mapbox/dark-v8', - minZoom: 1, - maxZoom: 22, - attribution: attrib - }); - mapController.controlLayers.addBaseLayer(mapController.baseLayers['Dark'], 'Dark'); - - mapController.baseLayers['Mapbox satellite'] = L.mapboxGL({ - accessToken: optionsValues.mapboxAPIKEY, - style: 'mapbox://styles/mapbox/satellite-streets-v9', - minZoom: 1, - maxZoom: 22, - attribution: attribSat + attribution: attrib, }); - //mapController.controlLayers.addBaseLayer(mapController.baseLayers['Mapbox satellite'], 'Mapbox satellite'); - mapController.map.addLayer(L.mapboxGL( + mapController.controlLayers.addOverlay(L.mapboxGL( { 'accessToken': optionsValues.mapboxAPIKEY, 'id': '3d-buildings', @@ -299,7 +281,26 @@ 'fill-extrusion-opacity': 0.6 } } - )); + ),"3d-buildings"); + mapController.controlLayers.addBaseLayer(mapController.baseLayers['Topographic'], 'Topographic'); + + mapController.baseLayers['Dark'] = L.mapboxGL({ + accessToken: optionsValues.mapboxAPIKEY, + style: 'mapbox://styles/mapbox/dark-v8', + minZoom: 1, + maxZoom: 22, + attribution: attrib + }); + mapController.controlLayers.addBaseLayer(mapController.baseLayers['Dark'], 'Dark'); + + mapController.baseLayers['Mapbox satellite'] = L.mapboxGL({ + accessToken: optionsValues.mapboxAPIKEY, + style: 'mapbox://styles/mapbox/satellite-streets-v9', + minZoom: 1, + maxZoom: 22, + attribution: attribSat + }); + //mapController.controlLayers.addBaseLayer(mapController.baseLayers['Mapbox satellite'], 'Mapbox satellite'); } if (optionsValues.hasOwnProperty('tileLayer')) { mapController.changeTileLayer(optionsValues.tileLayer); diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 45be154a..b62ad3f0 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -119,7 +119,7 @@ class PageController extends Controller { // routing engine $csp->addAllowedConnectDomain('https://*.project-osrm.org'); // TODO allow connections to router engine - //$csp->addAllowedConnectDomain('http://192.168.0.66:8989'); + $csp->addAllowedScriptDomain('https://linux-ilie'); // poi images $csp->addAllowedImageDomain('https://nominatim.openstreetmap.org'); // search and geocoder |