itowns 2.44.3-next.30 → 2.44.3-next.32

package/lib/Source/VectorTilesSource.js

@@ -20,6 +20,15 @@ function mergeCollections(collections) {
   return collection;
 }
 
+// A deprecated (but still in use) Mapbox spec allows using 'ref' as a propertie to reference an other layer
+// instead of duplicating the following properties: 'type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'
+function getPropertiesFromRefLayer(layers, layer) {
+  const refLayer = layers.filter(l => l.id === layer.ref)[0];
+  ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'].forEach(prop => {
+    layer[prop] = refLayer[prop];
+  });
+}
+
 /**
  * VectorTilesSource are object containing informations on how to fetch vector
  * tiles resources.
@@ -69,36 +78,41 @@ class VectorTilesSource extends TMSSource {
     let promise;
     this.isVectorTileSource = true;
     this.accessToken = source.accessToken;
+    let mvtStyleUrl;
     if (source.style) {
       if (typeof source.style == 'string') {
-        const styleUrl = urlParser.normalizeStyleURL(source.style, this.accessToken);
-        promise = Fetcher.json(styleUrl, this.networkOptions);
+        mvtStyleUrl = urlParser.normalizeStyleURL(source.style, this.accessToken);
+        promise = Fetcher.json(mvtStyleUrl, this.networkOptions);
       } else {
         promise = Promise.resolve(source.style);
       }
     } else {
       throw new Error('New VectorTilesSource: style is required');
     }
-    this.whenReady = promise.then(style => {
-      this.jsonStyle = style;
-      const baseurl = source.sprite || style.sprite;
+    this.whenReady = promise.then(mvtStyle => {
+      this.jsonStyle = mvtStyle;
+      let baseurl = source.sprite || mvtStyle.sprite;
       if (baseurl) {
+        baseurl = new URL(baseurl, mvtStyleUrl).toString();
         const spriteUrl = urlParser.normalizeSpriteURL(baseurl, '', '.json', this.accessToken);
         return Fetcher.json(spriteUrl, this.networkOptions).then(sprites => {
           this.sprites = sprites;
           const imgUrl = urlParser.normalizeSpriteURL(baseurl, '', '.png', this.accessToken);
           this.sprites.source = imgUrl;
-          return style;
+          return mvtStyle;
         });
       }
-      return style;
-    }).then(style => {
-      style.layers.forEach((layer, order) => {
+      return mvtStyle;
+    }).then(mvtStyle => {
+      mvtStyle.layers.forEach((layer, order) => {
         layer.sourceUid = this.uid;
         if (layer.type === 'background') {
           this.backgroundLayer = layer;
         } else if (ffilter(layer)) {
-          const style = Style.setFromVectorTileLayer(layer, this.sprites, order, this.symbolToCircle);
+          if (layer['source-layer'] === undefined) {
+            getPropertiesFromRefLayer(mvtStyle.layers, layer);
+          }
+          const style = Style.setFromVectorTileLayer(layer, this.sprites, this.symbolToCircle);
           this.styles[layer.id] = style;
           if (!this.layers[layer['source-layer']]) {
             this.layers[layer['source-layer']] = [];
@@ -106,20 +120,18 @@ class VectorTilesSource extends TMSSource {
           this.layers[layer['source-layer']].push({
             id: layer.id,
             order,
-            filterExpression: featureFilter(layer.filter),
-            zoom: {
-              min: layer.minzoom || 0,
-              max: layer.maxzoom || 24
-            }
+            filterExpression: featureFilter(layer.filter)
           });
         }
       });
       if (this.url == '.') {
-        const TMSUrlList = Object.values(style.sources).map(sourceVT => {
+        const TMSUrlList = Object.values(mvtStyle.sources).map(sourceVT => {
           if (sourceVT.url) {
+            sourceVT.url = new URL(sourceVT.url, mvtStyleUrl).toString();
             const urlSource = urlParser.normalizeSourceURL(sourceVT.url, this.accessToken);
             return Fetcher.json(urlSource, this.networkOptions).then(tileJSON => {
               if (tileJSON.tiles[0]) {
+                tileJSON.tiles[0] = decodeURIComponent(new URL(tileJSON.tiles[0], urlSource).toString());
                 return toTMSUrl(tileJSON.tiles[0]);
               }
             });
@@ -130,7 +142,7 @@ class VectorTilesSource extends TMSSource {
         });
         return Promise.all(TMSUrlList);
       }
-      return Promise.resolve([this.url]);
+      return Promise.resolve([toTMSUrl(this.url)]);
     }).then(TMSUrlList => {
       this.urls = Array.from(new Set(TMSUrlList));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.30",
+  "version": "2.44.3-next.32",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",