@versatiles/style 5.9.4 → 5.10.0

package/dist/index.js

@@ -456,7 +456,7 @@ class RGB extends Color {
         const max = Math.max(r, g, b);
         const delta = max - min;
         let h = 0;
-        let s = 0;
+        let s;
         if (max === min)
             h = 0;
         else if (r === max)
@@ -1591,81 +1591,59 @@ function getShortbreadLayers(option) {
     ];
 }
 
-/**
- * @param {string | RegExp} a
- * @param {string | RegExp} b
- * @param {string} str
- */
-function balanced (a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
-
-  const r = range(a, b, str);
-
-  return (
-    r && {
-      start: r[0],
-      end: r[1],
-      pre: str.slice(0, r[0]),
-      body: str.slice(r[0] + a.length, r[1]),
-      post: str.slice(r[1] + b.length)
-    }
-  )
-}
-
-/**
- * @param {RegExp} reg
- * @param {string} str
- */
-function maybeMatch (reg, str) {
-  const m = str.match(reg);
-  return m ? m[0] : null
-}
-
-/**
- * @param {string} a
- * @param {string} b
- * @param {string} str
- */
-function range (a, b, str) {
-  let begs, beg, left, right, result;
-  let ai = str.indexOf(a);
-  let bi = str.indexOf(b, ai + 1);
-  let i = ai;
-
-  if (ai >= 0 && bi > 0) {
-    if (a === b) {
-      return [ai, bi]
-    }
-    begs = [];
-    left = str.length;
-
-    while (i >= 0 && !result) {
-      if (i === ai) {
-        begs.push(i);
-        ai = str.indexOf(a, i + 1);
-      } else if (begs.length === 1) {
-        result = [begs.pop(), bi];
-      } else {
-        beg = begs.pop();
-        if (beg < left) {
-          left = beg;
-          right = bi;
+const balanced = (a, b, str) => {
+    const ma = a instanceof RegExp ? maybeMatch(a, str) : a;
+    const mb = b instanceof RegExp ? maybeMatch(b, str) : b;
+    const r = ma !== null && mb != null && range(ma, mb, str);
+    return (r && {
+        start: r[0],
+        end: r[1],
+        pre: str.slice(0, r[0]),
+        body: str.slice(r[0] + ma.length, r[1]),
+        post: str.slice(r[1] + mb.length),
+    });
+};
+const maybeMatch = (reg, str) => {
+    const m = str.match(reg);
+    return m ? m[0] : null;
+};
+const range = (a, b, str) => {
+    let begs, beg, left, right = undefined, result;
+    let ai = str.indexOf(a);
+    let bi = str.indexOf(b, ai + 1);
+    let i = ai;
+    if (ai >= 0 && bi > 0) {
+        if (a === b) {
+            return [ai, bi];
+        }
+        begs = [];
+        left = str.length;
+        while (i >= 0 && !result) {
+            if (i === ai) {
+                begs.push(i);
+                ai = str.indexOf(a, i + 1);
+            }
+            else if (begs.length === 1) {
+                const r = begs.pop();
+                if (r !== undefined)
+                    result = [r, bi];
+            }
+            else {
+                beg = begs.pop();
+                if (beg !== undefined && beg < left) {
+                    left = beg;
+                    right = bi;
+                }
+                bi = str.indexOf(b, i + 1);
+            }
+            i = ai < bi && ai >= 0 ? ai : bi;
+        }
+        if (begs.length && right !== undefined) {
+            result = [left, right];
         }
-
-        bi = str.indexOf(b, i + 1);
-      }
-
-      i = ai < bi && ai >= 0 ? ai : bi;
-    }
-
-    if (begs.length) {
-      result = [left, right];
     }
-  }
-
-  return result
-}
+    return result;
+};
 
 const escSlash = '\0SLASH' + Math.random() + '\0';
 const escOpen = '\0OPEN' + Math.random() + '\0';
@@ -1681,224 +1659,183 @@ const slashPattern = /\\\\/g;
 const openPattern = /\\{/g;
 const closePattern = /\\}/g;
 const commaPattern = /\\,/g;
-const periodPattern = /\\./g;
-
-/**
- * @return {number}
- */
-function numeric (str) {
-  return !isNaN(str)
-    ? parseInt(str, 10)
-    : str.charCodeAt(0)
+const periodPattern = /\\\./g;
+const EXPANSION_MAX = 100_000;
+function numeric(str) {
+    return !isNaN(str) ? parseInt(str, 10) : str.charCodeAt(0);
 }
-
-/**
- * @param {string} str
- */
-function escapeBraces (str) {
-  return str.replace(slashPattern, escSlash)
-    .replace(openPattern, escOpen)
-    .replace(closePattern, escClose)
-    .replace(commaPattern, escComma)
-    .replace(periodPattern, escPeriod)
+function escapeBraces(str) {
+    return str
+        .replace(slashPattern, escSlash)
+        .replace(openPattern, escOpen)
+        .replace(closePattern, escClose)
+        .replace(commaPattern, escComma)
+        .replace(periodPattern, escPeriod);
 }
-
-/**
- * @param {string} str
- */
-function unescapeBraces (str) {
-  return str.replace(escSlashPattern, '\\')
-    .replace(escOpenPattern, '{')
-    .replace(escClosePattern, '}')
-    .replace(escCommaPattern, ',')
-    .replace(escPeriodPattern, '.')
+function unescapeBraces(str) {
+    return str
+        .replace(escSlashPattern, '\\')
+        .replace(escOpenPattern, '{')
+        .replace(escClosePattern, '}')
+        .replace(escCommaPattern, ',')
+        .replace(escPeriodPattern, '.');
 }
-
 /**
  * Basically just str.split(","), but handling cases
  * where we have nested braced sections, which should be
  * treated as individual members, like {a,{b,c},d}
- * @param {string} str
  */
-function parseCommaParts (str) {
-  if (!str) { return [''] }
-
-  const parts = [];
-  const m = balanced('{', '}', str);
-
-  if (!m) { return str.split(',') }
-
-  const { pre, body, post } = m;
-  const p = pre.split(',');
-
-  p[p.length - 1] += '{' + body + '}';
-  const postParts = parseCommaParts(post);
-  if (post.length) {
-    p[p.length - 1] += postParts.shift();
-    p.push.apply(p, postParts);
-  }
-
-  parts.push.apply(parts, p);
-
-  return parts
+function parseCommaParts(str) {
+    if (!str) {
+        return [''];
+    }
+    const parts = [];
+    const m = balanced('{', '}', str);
+    if (!m) {
+        return str.split(',');
+    }
+    const { pre, body, post } = m;
+    const p = pre.split(',');
+    p[p.length - 1] += '{' + body + '}';
+    const postParts = parseCommaParts(post);
+    if (post.length) {
+        p[p.length - 1] += postParts.shift();
+        p.push.apply(p, postParts);
+    }
+    parts.push.apply(parts, p);
+    return parts;
 }
-
-/**
- * @param {string} str
- */
-function expandTop (str) {
-  if (!str) { return [] }
-
-  // I don't know why Bash 4.3 does this, but it does.
-  // Anything starting with {} will have the first two bytes preserved
-  // but *only* at the top level, so {},a}b will not expand to anything,
-  // but a{},b}c will be expanded to [a}c,abc].
-  // One could argue that this is a bug in Bash, but since the goal of
-  // this module is to match Bash's rules, we escape a leading {}
-  if (str.slice(0, 2) === '{}') {
-    str = '\\{\\}' + str.slice(2);
-  }
-
-  return expand(escapeBraces(str), true).map(unescapeBraces)
+function expand(str, options = {}) {
+    if (!str) {
+        return [];
+    }
+    const { max = EXPANSION_MAX } = options;
+    // I don't know why Bash 4.3 does this, but it does.
+    // Anything starting with {} will have the first two bytes preserved
+    // but *only* at the top level, so {},a}b will not expand to anything,
+    // but a{},b}c will be expanded to [a}c,abc].
+    // One could argue that this is a bug in Bash, but since the goal of
+    // this module is to match Bash's rules, we escape a leading {}
+    if (str.slice(0, 2) === '{}') {
+        str = '\\{\\}' + str.slice(2);
+    }
+    return expand_(escapeBraces(str), max, true).map(unescapeBraces);
 }
-
-/**
- * @param {string} str
- */
-function embrace (str) {
-  return '{' + str + '}'
+function embrace(str) {
+    return '{' + str + '}';
 }
-
-/**
- * @param {string} el
- */
-function isPadded (el) {
-  return /^-?0\d/.test(el)
+function isPadded(el) {
+    return /^-?0\d/.test(el);
 }
-
-/**
- * @param {number} i
- * @param {number} y
- */
-function lte (i, y) {
-  return i <= y
+function lte(i, y) {
+    return i <= y;
 }
-
-/**
- * @param {number} i
- * @param {number} y
- */
-function gte (i, y) {
-  return i >= y
+function gte(i, y) {
+    return i >= y;
 }
-
-/**
- * @param {string} str
- * @param {boolean} [isTop]
- */
-function expand (str, isTop) {
-  /** @type {string[]} */
-  const expansions = [];
-
-  const m = balanced('{', '}', str);
-  if (!m) return [str]
-
-  // no need to expand pre, since it is guaranteed to be free of brace-sets
-  const pre = m.pre;
-  const post = m.post.length
-    ? expand(m.post, false)
-    : [''];
-
-  if (/\$$/.test(m.pre)) {
-    for (let k = 0; k < post.length; k++) {
-      const expansion = pre + '{' + m.body + '}' + post[k];
-      expansions.push(expansion);
-    }
-  } else {
-    const isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-    const isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-    const isSequence = isNumericSequence || isAlphaSequence;
-    const isOptions = m.body.indexOf(',') >= 0;
-    if (!isSequence && !isOptions) {
-      // {a},b}
-      if (m.post.match(/,(?!,).*\}/)) {
-        str = m.pre + '{' + m.body + escClose + m.post;
-        return expand(str)
-      }
-      return [str]
-    }
-
-    let n;
-    if (isSequence) {
-      n = m.body.split(/\.\./);
-    } else {
-      n = parseCommaParts(m.body);
-      if (n.length === 1) {
-        // x{{a,b}}y ==> x{a}y x{b}y
-        n = expand(n[0], false).map(embrace);
-        if (n.length === 1) {
-          return post.map(function (p) {
-            return m.pre + n[0] + p
-          })
+function expand_(str, max, isTop) {
+    /** @type {string[]} */
+    const expansions = [];
+    const m = balanced('{', '}', str);
+    if (!m)
+        return [str];
+    // no need to expand pre, since it is guaranteed to be free of brace-sets
+    const pre = m.pre;
+    const post = m.post.length ? expand_(m.post, max, false) : [''];
+    if (/\$$/.test(m.pre)) {
+        for (let k = 0; k < post.length && k < max; k++) {
+            const expansion = pre + '{' + m.body + '}' + post[k];
+            expansions.push(expansion);
         }
-      }
     }
-
-    // at this point, n is the parts, and we know it's not a comma set
-    // with a single entry.
-    let N;
-
-    if (isSequence) {
-      const x = numeric(n[0]);
-      const y = numeric(n[1]);
-      const width = Math.max(n[0].length, n[1].length);
-      let incr = n.length === 3
-        ? Math.abs(numeric(n[2]))
-        : 1;
-      let test = lte;
-      const reverse = y < x;
-      if (reverse) {
-        incr *= -1;
-        test = gte;
-      }
-      const pad = n.some(isPadded);
-
-      N = [];
-
-      for (let i = x; test(i, y); i += incr) {
-        let c;
-        if (isAlphaSequence) {
-          c = String.fromCharCode(i);
-          if (c === '\\') { c = ''; }
-        } else {
-          c = String(i);
-          if (pad) {
-            const need = width - c.length;
-            if (need > 0) {
-              const z = new Array(need + 1).join('0');
-              if (i < 0) { c = '-' + z + c.slice(1); } else { c = z + c; }
+    else {
+        const isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+        const isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+        const isSequence = isNumericSequence || isAlphaSequence;
+        const isOptions = m.body.indexOf(',') >= 0;
+        if (!isSequence && !isOptions) {
+            // {a},b}
+            if (m.post.match(/,(?!,).*\}/)) {
+                str = m.pre + '{' + m.body + escClose + m.post;
+                return expand_(str, max, true);
+            }
+            return [str];
+        }
+        let n;
+        if (isSequence) {
+            n = m.body.split(/\.\./);
+        }
+        else {
+            n = parseCommaParts(m.body);
+            if (n.length === 1 && n[0] !== undefined) {
+                // x{{a,b}}y ==> x{a}y x{b}y
+                n = expand_(n[0], max, false).map(embrace);
+                //XXX is this necessary? Can't seem to hit it in tests.
+                /* c8 ignore start */
+                if (n.length === 1) {
+                    return post.map(p => m.pre + n[0] + p);
+                }
+                /* c8 ignore stop */
+            }
+        }
+        // at this point, n is the parts, and we know it's not a comma set
+        // with a single entry.
+        let N;
+        if (isSequence && n[0] !== undefined && n[1] !== undefined) {
+            const x = numeric(n[0]);
+            const y = numeric(n[1]);
+            const width = Math.max(n[0].length, n[1].length);
+            let incr = n.length === 3 && n[2] !== undefined ? Math.abs(numeric(n[2])) : 1;
+            let test = lte;
+            const reverse = y < x;
+            if (reverse) {
+                incr *= -1;
+                test = gte;
+            }
+            const pad = n.some(isPadded);
+            N = [];
+            for (let i = x; test(i, y); i += incr) {
+                let c;
+                if (isAlphaSequence) {
+                    c = String.fromCharCode(i);
+                    if (c === '\\') {
+                        c = '';
+                    }
+                }
+                else {
+                    c = String(i);
+                    if (pad) {
+                        const need = width - c.length;
+                        if (need > 0) {
+                            const z = new Array(need + 1).join('0');
+                            if (i < 0) {
+                                c = '-' + z + c.slice(1);
+                            }
+                            else {
+                                c = z + c;
+                            }
+                        }
+                    }
+                }
+                N.push(c);
+            }
+        }
+        else {
+            N = [];
+            for (let j = 0; j < n.length; j++) {
+                N.push.apply(N, expand_(n[j], max, false));
+            }
+        }
+        for (let j = 0; j < N.length; j++) {
+            for (let k = 0; k < post.length && expansions.length < max; k++) {
+                const expansion = pre + N[j] + post[k];
+                if (!isTop || isSequence || expansion) {
+                    expansions.push(expansion);
+                }
             }
-          }
         }
-        N.push(c);
-      }
-    } else {
-      N = [];
-
-      for (let j = 0; j < n.length; j++) {
-        N.push.apply(N, expand(n[j], false));
-      }
-    }
-
-    for (let j = 0; j < N.length; j++) {
-      for (let k = 0; k < post.length; k++) {
-        const expansion = pre + N[j] + post[k];
-        if (!isTop || isSequence || expansion) { expansions.push(expansion); }
-      }
     }
-  }
-
-  return expansions
+    return expansions;
 }
 
 const propertyLookup = new Map();
@@ -2153,7 +2090,7 @@ function decorate(layers, rules, recolor) {
         if (layerStyle == null)
             return;
         // Expand any braces in IDs and filter them through a RegExp if necessary
-        const ids = expandTop(idDef).flatMap((id) => {
+        const ids = expand(idDef).flatMap((id) => {
             if (!id.includes('*'))
                 return id;
             const regExpString = id.replace(/[^a-z_:-]/g, (c) => {
@@ -4121,10 +4058,90 @@ async function buildSatelliteStyle(options) {
         minzoom: 0,
         ...(Object.keys(rasterPaint).length > 0 ? { paint: rasterPaint } : {}),
     });
+    // Elevation source (for terrain and/or hillshade)
+    const needsElevation = !!(options.terrain || options.hillshade);
+    if (needsElevation) {
+        const elevationTilejsonUrl = resolveUrl(baseUrl, options.elevationTilejson ?? '/tiles/elevation/tiles.json');
+        const elevationTilejson = (await fetch(elevationTilejsonUrl).then((res) => res.json()));
+        if (elevationTilejson.tiles) {
+            elevationTilejson.tiles = elevationTilejson.tiles.map((url) => resolveUrl(baseUrl, url));
+        }
+        style.sources.elevation = {
+            attribution: elevationTilejson.attribution,
+            bounds: elevationTilejson.bounds,
+            minzoom: elevationTilejson.minzoom,
+            maxzoom: elevationTilejson.maxzoom,
+            tiles: elevationTilejson.tiles,
+            encoding: elevationTilejson.encoding,
+            tileSize: elevationTilejson.tile_size ?? 512,
+            type: 'raster-dem',
+        };
+        switch (elevationTilejson.tile_schema) {
+            case 'dem/mapbox':
+                style.sources.elevation.encoding = 'mapbox';
+                break;
+            case 'dem/terrarium':
+                style.sources.elevation.encoding = 'terrarium';
+                break;
+        }
+    }
+    // 3D terrain
+    if (options.terrain) {
+        const terrainConfig = typeof options.terrain === 'object' ? options.terrain : {};
+        style.terrain = { source: 'elevation', exaggeration: terrainConfig.exaggeration ?? 1 };
+    }
+    // Hillshade layer
+    if (options.hillshade) {
+        const hsConfig = typeof options.hillshade === 'object' ? options.hillshade : {};
+        const paint = {};
+        paint['hillshade-exaggeration'] = hsConfig.exaggeration ?? ['interpolate', ['linear'], ['zoom'], 5, 0, 10, 0.3];
+        paint['hillshade-shadow-color'] = hsConfig.shadowColor ?? '#000000';
+        paint['hillshade-highlight-color'] = hsConfig.highlightColor ?? '#ffffff';
+        paint['hillshade-accent-color'] = hsConfig.accentColor ?? '#000000';
+        paint['hillshade-illumination-direction'] = hsConfig.illuminationDirection ?? 315;
+        paint['hillshade-illumination-altitude'] = hsConfig.illuminationAltitude ?? 45;
+        paint['hillshade-illumination-anchor'] = hsConfig.illuminationAnchor ?? 'map';
+        paint['hillshade-method'] = 'standard';
+        style.layers.splice(1, 0, {
+            id: 'hillshade',
+            type: 'hillshade',
+            source: 'elevation',
+            ...(Object.keys(paint).length > 0 ? { paint } : {}),
+        });
+    }
     style.name = 'versatiles-satellite';
     return style;
 }
 
+function getStyleVariants() {
+    const variants = [];
+    for (const { name, builder } of [
+        { name: 'colorful', builder: colorful },
+        { name: 'eclipse', builder: eclipse },
+        { name: 'empty', builder: empty },
+        { name: 'graybeard', builder: graybeard },
+        { name: 'neutrino', builder: neutrino },
+        { name: 'shadow', builder: shadow },
+    ]) {
+        variants.push({ name: name + '/style', build: () => builder({ language: undefined }) });
+        if (name === 'empty')
+            continue;
+        variants.push({ name: name + '/en', build: () => builder({ language: 'en' }) });
+        variants.push({ name: name + '/de', build: () => builder({ language: 'de' }) });
+        variants.push({ name: name + '/nolabel', build: () => builder({ hideLabels: true }) });
+    }
+    variants.push({ name: 'satellite/style', build: () => buildSatelliteStyle({ language: undefined }) });
+    variants.push({ name: 'satellite/en', build: () => buildSatelliteStyle({ language: 'en' }) });
+    variants.push({ name: 'satellite/de', build: () => buildSatelliteStyle({ language: 'de' }) });
+    variants.push({ name: 'satellite/nooverlay', build: () => buildSatelliteStyle({ overlay: false }) });
+    const terrain = { terrain: true, hillshade: true };
+    variants.push({ name: 'terrain/style', build: () => buildSatelliteStyle({ ...terrain, language: undefined }) });
+    variants.push({ name: 'terrain/en', build: () => buildSatelliteStyle({ ...terrain, language: 'en' }) });
+    variants.push({ name: 'terrain/de', build: () => buildSatelliteStyle({ ...terrain, language: 'de' }) });
+    variants.push({ name: 'terrain/nooverlay', build: () => buildSatelliteStyle({ ...terrain, overlay: false }) });
+    return variants;
+}
+
 // import styles
 function getStyleBuilder(styleBuilder) {
     const fn = function (options) {
@@ -4139,7 +4156,7 @@ const eclipse = getStyleBuilder(Eclipse);
 const graybeard = getStyleBuilder(Graybeard);
 const shadow = getStyleBuilder(Shadow);
 const neutrino = getStyleBuilder(Neutrino);
-getStyleBuilder(Empty);
+const empty = getStyleBuilder(Empty);
 
 /**
  * Checks if an object adheres to the TileJSON specification.
@@ -4511,5 +4528,5 @@ const styles = {
     satellite: buildSatelliteStyle,
 };
 
-export { Color, colorful, eclipse, graybeard, guessStyle, neutrino, buildSatelliteStyle as satellite, shadow, styles };
+export { Color, colorful, eclipse, getStyleVariants, graybeard, guessStyle, neutrino, buildSatelliteStyle as satellite, shadow, styles };
 //# sourceMappingURL=index.js.map