@versatiles/style 3.7.0 → 3.8.0

package/README.MD

@@ -125,7 +125,7 @@ interface {
 
 ### Method: `colorful(options)`
 
-<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/c839905/src/index.ts#L4">\[src]</a></sup>
+<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/326466c/src/index.ts#L4">\[src]</a></sup>
 
 **Parameters:**
 
@@ -135,7 +135,7 @@ interface {
 
 ### Method: `graybeard(options)`
 
-<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/c839905/src/index.ts#L9">\[src]</a></sup>
+<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/326466c/src/index.ts#L9">\[src]</a></sup>
 
 **Parameters:**
 
@@ -145,7 +145,7 @@ interface {
 
 ### Method: `guessStyle(opt)`
 
-<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/c839905/src/lib/style_guesser.ts#L12">\[src]</a></sup>
+<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/326466c/src/lib/style_guesser.ts#L12">\[src]</a></sup>
 
 **Parameters:**
 
@@ -155,7 +155,7 @@ interface {
 
 ### Method: `neutrino(options)`
 
-<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/c839905/src/index.ts#L14">\[src]</a></sup>
+<sup><a href="https://github.com/versatiles-org/versatiles-style/blob/326466c/src/index.ts#L14">\[src]</a></sup>
 
 **Parameters:**
 

package/dist/lib/shortbread/template.js

@@ -12,6 +12,7 @@ export default function getTemplate() {
         sprite: 'https://tiles.versatiles.org/sprites/sprites',
         sources: {
             'versatiles-shortbread': {
+                tilejson: '3.0.0',
                 attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
                 tiles: [
                     'https://tiles.versatiles.org/tiles/osm/{z}/{x}/{y}',

package/dist/lib/style_guesser.js

@@ -45,17 +45,29 @@ export default function guess(opt) {
     }
     if (!isTileJSONSpecification(tilejson))
         throw Error();
+    let style;
     switch (tilejson.type) {
         case 'raster':
-            return getImageStyle(tilejson);
+            style = getImageStyle(tilejson);
+            break;
         case 'vector':
             if (isShortbread(tilejson)) {
-                return getShortbreadStyle(tilejson, { baseUrl: opt.baseUrl, glyphs: opt.glyphs, sprite: opt.sprite });
+                style = getShortbreadStyle(tilejson, { baseUrl: opt.baseUrl, glyphs: opt.glyphs, sprite: opt.sprite });
             }
             else {
-                return getInspectorStyle(tilejson);
+                style = getInspectorStyle(tilejson);
             }
     }
+    if (opt.minzoom ?? 0)
+        style.zoom ??= opt.minzoom;
+    if (opt.bounds)
+        style.center ??= [
+            (opt.bounds[0] + opt.bounds[2]) / 2,
+            (opt.bounds[1] + opt.bounds[3]) / 2,
+        ];
+    if (opt.center)
+        style.center = opt.center;
+    return style;
 }
 function isShortbread(spec) {
     if (typeof spec !== 'object')
@@ -69,14 +81,13 @@ function isShortbread(spec) {
     return shortbreadIds.every(id => layerIds.has(id));
 }
 function getShortbreadStyle(spec, builderOption) {
-    const style = new Colorful().build({
+    return new Colorful().build({
         hideLabels: true,
         tiles: spec.tiles,
         baseUrl: builderOption.baseUrl,
         glyphs: builderOption.glyphs,
         sprite: builderOption.sprite,
     });
-    return style;
 }
 function getInspectorStyle(spec) {
     const sourceName = 'vectorSource';

package/dist/lib/style_guesser.test.js

@@ -1,7 +1,10 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import getTemplate from './shortbread/template.js';
 import guessStyle from './style_guesser.js';
 describe('guessStyle', () => {
     const tiles = ['https://example.com/tiles/{z}/{x}/{y}'];
+    const vectorLayersSomething = [{ id: 'geometry', fields: { label: 'String', height: 'Number' } }];
+    const vectorLayersShortbread = getTemplate().sources['versatiles-shortbread'].vector_layers;
     it('should build raster styles', () => {
         const type = 'raster';
         const format = 'avif';
@@ -12,14 +15,13 @@ describe('guessStyle', () => {
             layers: [{ id: 'raster', source: 'rasterSource', type }],
         });
     });
-    it('should build vector styles', () => {
+    it('should build vector inspector styles', () => {
         const type = 'vector';
         const format = 'pbf';
-        const vectorLayers = [{ id: 'geometry', fields: { label: 'String', height: 'Number' } }];
-        expect(guessStyle({ tiles, format, vectorLayers }))
+        expect(guessStyle({ tiles, format, vectorLayers: vectorLayersSomething }))
             .toStrictEqual({
             version: 8,
-            sources: { vectorSource: { format, tilejson: '3.0.0', tiles, type, vector_layers: vectorLayers } },
+            sources: { vectorSource: { format, tilejson: '3.0.0', tiles, type, vector_layers: vectorLayersSomething } },
             layers: [
                 {
                     id: 'background',
@@ -54,4 +56,69 @@ describe('guessStyle', () => {
             ],
         });
     });
+    it('should build shortbread vector styles', () => {
+        const type = 'vector';
+        const format = 'pbf';
+        const style = guessStyle({ tiles, format, vectorLayers: vectorLayersShortbread, baseUrl: 'http://example.com' });
+        expect(style.layers.length).toBe(236);
+        style.layers = [];
+        expect(style).toStrictEqual({
+            glyphs: 'http://example.com/assets/fonts/{fontstack}/{range}.pbf',
+            metadata: {
+                license: 'https://creativecommons.org/publicdomain/zero/1.0/',
+                'maputnik:renderer': 'mbgljs',
+            },
+            name: 'versatiles-colorful',
+            sprite: 'http://example.com/assets/sprites/sprites',
+            layers: [],
+            sources: {
+                'versatiles-shortbread': {
+                    attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+                    bounds: [-180, -85.0511287798066, 180, 85.0511287798066],
+                    format,
+                    maxzoom: 14,
+                    minzoom: 0,
+                    scheme: 'xyz',
+                    tilejson: '3.0.0',
+                    tiles,
+                    type,
+                    vector_layers: vectorLayersShortbread,
+                },
+            },
+            version: 8,
+        });
+    });
+    const cases = [
+        { type: 'image', options: { tiles, format: 'png' } },
+        { type: 'inspector', options: { tiles, format: 'pbf', vectorLayers: vectorLayersSomething } },
+        { type: 'shortbread', options: { tiles, format: 'pbf', vectorLayers: vectorLayersShortbread } },
+    ];
+    describe('minzoom sets zoom', () => {
+        cases.forEach(({ type, options }) => {
+            it(type, () => {
+                expect(guessStyle({ ...options, minzoom: 5 })).toHaveProperty('zoom', 5);
+            });
+        });
+    });
+    describe('bounds sets center', () => {
+        cases.forEach(({ type, options }) => {
+            it(type, () => {
+                expect(guessStyle({ ...options, bounds: [1, 2, 3, 4] })).toHaveProperty('center', [2, 3]);
+            });
+        });
+    });
+    describe('center sets center', () => {
+        cases.forEach(({ type, options }) => {
+            it(type, () => {
+                expect(guessStyle({ ...options, center: [12, 34] })).toHaveProperty('center', [12, 34]);
+            });
+        });
+    });
+    describe('center overrides bounds', () => {
+        cases.forEach(({ type, options }) => {
+            it(type, () => {
+                expect(guessStyle({ ...options, bounds: [1, 2, 3, 4], center: [12, 34] })).toHaveProperty('center', [12, 34]);
+            });
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versatiles/style",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "Generate StyleJSON for MapLibre",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",