tileserver-gl-light 4.4.10 → 4.5.1

package/public/templates/data.tmpl

@@ -7,8 +7,8 @@
   {{#is_vector}}
   <link rel="stylesheet" type="text/css" href="{{public_url}}maplibre-gl.css{{&key_query}}" />
   <link rel="stylesheet" type="text/css" href="{{public_url}}maplibre-gl-inspect.css{{&key_query}}" />
-  <script>if (typeof Symbol !== 'undefined') { document.write('<script src="{{public_url}}maplibre-gl.js{{&key_query}}"><\/script>'); } else { document.write('<script src="{{public_url}}maplibre-gl-compat.js{{&key_query}}"><\/script>'); }</script>
-  <script>if (typeof Symbol !== 'undefined') { document.write('<script src="{{public_url}}maplibre-gl-inspect.min.js{{&key_query}}"><\/script>'); } else { document.write('<script src="{{public_url}}maplibre-gl-inspect-compat.min.js{{&key_query}}"><\/script>'); }</script>
+  <script src="{{public_url}}maplibre-gl.js{{&key_query}}"></script>
+  <script src="{{public_url}}maplibre-gl-inspect.min.js{{&key_query}}"></script>
   <style>
     body {background:#fff;color:#333;font-family:Arial, sans-serif;}
     #map {position:absolute;top:0;left:0;right:250px;bottom:0;}
@@ -54,6 +54,7 @@
     container: 'map',
     hash: true,
     maplibreLogo: true,
+    maxPitch: 85,
     style: {
       version: 8,
       sources: {
@@ -94,48 +95,48 @@
   var keyMatch = location.search.match(/[\?\&]key=([^&]+)/i);
   var keyParam = keyMatch ? '?key=' + keyMatch[1] : '';    
     
-	var map = L.map('map', { zoomControl: false });
-	new L.Control.Zoom({ position: 'topright' }).addTo(map);
+    var map = L.map('map', { zoomControl: false });
+    new L.Control.Zoom({ position: 'topright' }).addTo(map);
 
-	var tile_urls = [], tile_attribution, tile_minzoom, tile_maxzoom;
-	var url = '{{public_url}}data/{{id}}.json' + keyParam;
-	var req = new XMLHttpRequest();
-	req.overrideMimeType("application/json");
-	req.open('GET', url, true);
-	req.onload = function() {
-		var jsonResponse = JSON.parse(req.responseText);
-		for (key in jsonResponse) {
-		  var keyl = key.toLowerCase();
-			switch(keyl) {
-			  case "tiles":
-				tile_urls = jsonResponse[key];
-				break;
-			  case "attribution":
-				tile_attribution = jsonResponse[key];
-				break;
-			  case "minzoom":
-				tile_minzoom = jsonResponse[key];
-				break;
-			  case "maxzoom":
-				tile_maxzoom = jsonResponse[key];
-				break;
-			}
-		}
+    var tile_urls = [], tile_attribution, tile_minzoom, tile_maxzoom;
+    var url = '{{public_url}}data/{{id}}.json' + keyParam;
+    var req = new XMLHttpRequest();
+    req.overrideMimeType("application/json");
+    req.open('GET', url, true);
+    req.onload = function() {
+        var jsonResponse = JSON.parse(req.responseText);
+        for (key in jsonResponse) {
+          var keyl = key.toLowerCase();
+            switch(keyl) {
+              case "tiles":
+                tile_urls = jsonResponse[key];
+                break;
+              case "attribution":
+                tile_attribution = jsonResponse[key];
+                break;
+              case "minzoom":
+                tile_minzoom = jsonResponse[key];
+                break;
+              case "maxzoom":
+                tile_maxzoom = jsonResponse[key];
+                break;
+            }
+        }
 
-		for (tile_url in tile_urls) {
-			L.tileLayer(tile_urls[tile_url], {
-				minZoom: tile_minzoom,
-				maxZoom: tile_maxzoom,
-				attribution: tile_attribution
-			}).addTo(map);
-		}
-		
-		map.eachLayer(function(layer) {
-		  // do not add scale prefix even if retina display is detected
-		  layer.scalePrefix = '.';
-		});
-	};
-	req.send(null);
+        for (tile_url in tile_urls) {
+            L.tileLayer(tile_urls[tile_url], {
+                minZoom: tile_minzoom,
+                maxZoom: tile_maxzoom,
+                attribution: tile_attribution
+            }).addTo(map);
+        }
+        
+        map.eachLayer(function(layer) {
+          // do not add scale prefix even if retina display is detected
+          layer.scalePrefix = '.';
+        });
+    };
+    req.send(null);
 
     setTimeout(function() {
       new L.Hash(map);

package/public/templates/viewer.tmpl

@@ -7,8 +7,8 @@
   <link rel="stylesheet" type="text/css" href="{{public_url}}maplibre-gl.css{{&key_query}}" />
   <link rel="stylesheet" type="text/css" href="{{public_url}}maplibre-gl-inspect.css{{&key_query}}" />
   <link rel="stylesheet" type="text/css" href="{{public_url}}leaflet.css{{&key_query}}" />
-  <script>if (typeof Symbol !== 'undefined') { document.write('<script src="{{public_url}}maplibre-gl.js{{&key_query}}"><\/script>'); } else { document.write('<script src="{{public_url}}maplibre-gl-compat.js{{&key_query}}"><\/script>'); }</script>
-  <script>if (typeof Symbol !== 'undefined') { document.write('<script src="{{public_url}}maplibre-gl-inspect.min.js{{&key_query}}"><\/script>'); } else { document.write('<script src="{{public_url}}maplibre-gl-inspect-compat.min.js{{&key_query}}"><\/script>'); }</script>
+  <script src="{{public_url}}maplibre-gl.js{{&key_query}}"></script>
+  <script src="{{public_url}}maplibre-gl-inspect.min.js{{&key_query}}"></script>
   <script src="{{public_url}}leaflet.js{{&key_query}}"></script>
   <script src="{{public_url}}leaflet-hash.js{{&key_query}}"></script>
   <script src="{{public_url}}L.TileLayer.NoGap.js{{&key_query}}"></script>
@@ -33,11 +33,27 @@
   <h1 style="display:none;">{{name}}</h1>
   <div id='map'></div>
   <script>
+    function isWebglSupported() {
+        if (window.WebGLRenderingContext) {
+            const canvas = document.createElement('canvas');
+            try {
+                const context = canvas.getContext('webgl2') || canvas.getContext('webgl');
+                if (context && typeof context.getParameter == 'function') {
+                    return true;
+                }
+            } catch (e) {
+                // WebGL is supported, but disabled
+            }
+            return false;
+        }
+        // WebGL not supported
+        return false;
+    }
     var q = (location.search || '').substr(1).split('&');
     var preference =
       q.indexOf('vector') >= 0 ? 'vector' :
         (q.indexOf('raster') >= 0 ? 'raster' :
-          (maplibregl.supported() ? 'vector' : 'raster'));
+          (isWebglSupported() ? 'vector' : 'raster'));
 
     var keyMatch = location.search.match(/[\?\&]key=([^&]+)/i);
     var keyParam = keyMatch ? '?key=' + keyMatch[1] : '';    
@@ -48,7 +64,8 @@
         container: 'map',
         style: '{{public_url}}styles/{{id}}/style.json' + keyParam,
         hash: true,
-        maplibreLogo: true
+        maplibreLogo: true,
+        maxPitch: 85
       });
       map.addControl(new maplibregl.NavigationControl({
          visualizePitch: true,