tileserver-gl-light 5.2.2-pre.0 → 5.3.0-pre.1

package/public/templates/data.tmpl

@@ -126,6 +126,9 @@
       style: style
     });
 
+    //disabled at the moment; clarify/disable coordinates off the globe to re-enable
+    //map.addControl(new maplibregl.GlobeControl());
+
     map.addControl(new maplibregl.NavigationControl({
       visualizePitch: true,
       showZoom: true,

package/public/templates/viewer.tmpl

@@ -58,18 +58,39 @@
     var keyParam = keyMatch ? '?key=' + keyMatch[1] : '';    
 
     if (preference == 'vector') {
-      maplibregl.setRTLTextPlugin('{{public_url}}mapbox-gl-rtl-text.js' + keyParam);
+      maplibregl.setRTLTextPlugin('{{public_url}}mapbox-gl-rtl-text.js' + keyParam, true);
       var map = new maplibregl.Map({
         container: 'map',
         style: '{{public_url}}styles/{{id}}/style.json' + keyParam,
         hash: true,
         maxPitch: 85
       });
+      map.addControl(new maplibregl.GlobeControl());
       map.addControl(new maplibregl.NavigationControl({
          visualizePitch: true,
          showZoom: true,
          showCompass: true
       }));
+
+      //check if terrain is available, before enabling the control
+      map.on('style.load', function () {
+        var terrainId = null;
+        Object.entries(map.getStyle().sources).some(function (source) {
+          if (source[1].type == "raster-dem") {
+            terrainId = source[0];
+            return true;
+          }
+        });
+
+        if (terrainId) {
+          map.addControl(
+            new maplibregl.TerrainControl({
+              source: terrainId,
+            })
+          );
+        }
+      });
+
       map.addControl(new MaplibreInspect({
          showMapPopupOnHover: false,
          showInspectMapPopupOnHover: false,

package/src/render.js

@@ -1,8 +1,7 @@
 'use strict';
 
 import { createCanvas, Image } from 'canvas';
-
-import SphericalMercator from '@mapbox/sphericalmercator';
+import { SphericalMercator } from '@mapbox/sphericalmercator';
 
 const mercator = new SphericalMercator();
 

package/src/serve_data.js

@@ -7,7 +7,7 @@ import clone from 'clone';
 import express from 'express';
 import Pbf from 'pbf';
 import { VectorTile } from '@mapbox/vector-tile';
-import SphericalMercator from '@mapbox/sphericalmercator';
+import { SphericalMercator } from '@mapbox/sphericalmercator';
 
 import {
   fixTileJSONCenter,

package/src/serve_rendered.js

@@ -20,7 +20,7 @@ import clone from 'clone';
 import Color from 'color';
 import express from 'express';
 import sanitize from 'sanitize-filename';
-import SphericalMercator from '@mapbox/sphericalmercator';
+import { SphericalMercator } from '@mapbox/sphericalmercator';
 import mlgl from '@maplibre/maplibre-gl-native';
 import polyline from '@mapbox/polyline';
 import proj4 from 'proj4';

package/src/server.js

@@ -10,7 +10,7 @@ import cors from 'cors';
 import enableShutdown from 'http-shutdown';
 import express from 'express';
 import handlebars from 'handlebars';
-import SphericalMercator from '@mapbox/sphericalmercator';
+import { SphericalMercator } from '@mapbox/sphericalmercator';
 const mercator = new SphericalMercator();
 import morgan from 'morgan';
 import { serve_data } from './serve_data.js';