@india-boundary-corrector/tilefixer 0.1.0 → 0.2.0

package/dist/index.cjs

@@ -22,11 +22,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 // src/index.js
 var index_exports = {};
 __export(index_exports, {
-  MIN_LINE_WIDTH: () => MIN_LINE_WIDTH,
   TileFetchError: () => TileFetchError,
   TileFixer: () => TileFixer,
-  buildFetchOptions: () => buildFetchOptions,
-  getLineWidth: () => getLineWidth
+  buildFetchOptions: () => buildFetchOptions
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -2274,6 +2272,26 @@ var CorrectionsSource = class {
 var configs_default = [
   {
     id: "cartodb-dark",
+    tileUrlTemplates: [
+      "https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png",
+      "https://basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png",
+      "https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png",
+      "https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png",
+      "https://basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png",
+      "https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}.png"
+    ],
+    lineWidthStops: { "0": 1, "2": 1, "3": 1, "10": 2, "12": 2 },
+    lineStyles: [
+      { color: "rgb(40, 40, 40)", layerSuffix: "ne", endZoom: 4 },
+      { color: "rgb(40, 40, 40)", layerSuffix: "ne-disp", endZoom: 4 },
+      { color: "rgb(40, 40, 40)", layerSuffix: "osm", startZoom: 5 },
+      { color: "rgb(40, 40, 40)", layerSuffix: "osm-disp", startZoom: 5 },
+      { color: "rgb(40, 40, 40)", layerSuffix: "osm-internal", startZoom: 5, widthFraction: 0.3, dashArray: [2, 2], delWidthFactor: 2 },
+      { color: "rgb(40, 40, 40)", layerSuffix: "ne-internal", startZoom: 4, endZoom: 4, widthFraction: 0.3, dashArray: [2, 2], delWidthFactor: 3 }
+    ]
+  },
+  {
+    id: "cartodb-dark-retina",
     tileUrlTemplates: [
       "https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png",
       "https://basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png",
@@ -2282,17 +2300,46 @@ var configs_default = [
       "https://basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}{r}.png",
       "https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}{r}.png"
     ],
-    lineWidthStops: { "0": 1, "2": 1, "3": 1, "10": 2.5 },
+    lineWidthStops: { "0": 1.5, "2": 1.5, "3": 1.5, "6": 2.5, "10": 3 },
     lineStyles: [
       { color: "rgb(40, 40, 40)", layerSuffix: "ne", endZoom: 4 },
       { color: "rgb(40, 40, 40)", layerSuffix: "ne-disp", endZoom: 4 },
       { color: "rgb(40, 40, 40)", layerSuffix: "osm", startZoom: 5 },
       { color: "rgb(40, 40, 40)", layerSuffix: "osm-disp", startZoom: 5 },
-      { color: "rgb(40, 40, 40)", layerSuffix: "osm-internal", startZoom: 4, widthFraction: 0.3, dashArray: [2, 2] }
+      { color: "rgb(40, 40, 40)", layerSuffix: "osm-internal", startZoom: 5, widthFraction: 0.3, dashArray: [4, 4], delWidthFactor: 2 },
+      { color: "rgb(40, 40, 40)", layerSuffix: "ne-internal", startZoom: 4, endZoom: 4, widthFraction: 0.3, dashArray: [4, 4], delWidthFactor: 3 }
     ]
   },
   {
     id: "cartodb-light",
+    tileUrlTemplates: [
+      "https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
+      "https://basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
+      "https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
+      "https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png",
+      "https://basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png",
+      "https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_nolabels/{z}/{x}/{y}.png",
+      "https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png",
+      "https://basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png",
+      "https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png",
+      "https://basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png",
+      "https://{s}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}.png",
+      "https://basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}.png"
+    ],
+    lineWidthStops: { "1": 0.5, "2": 0.75, "3": 0.75, "4": 1, "5": 1, "7": 1.5, "16": 2.5 },
+    lineStyles: [
+      { color: "rgb(235, 214, 214)", layerSuffix: "ne", endZoom: 4, lineExtensionFactor: 0.1, delWidthFactor: 2.5 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "ne-disp", endZoom: 4, delWidthFactor: 0 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm", alpha: 0.2, startZoom: 6, endZoom: 11, widthFraction: 5, lineExtensionFactor: 0.1 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm", alpha: 0.2, startZoom: 12, widthFraction: 4, lineExtensionFactor: 0.1 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm", startZoom: 5, lineExtensionFactor: 0.1 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm-disp", startZoom: 5, delWidthFactor: 0 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm-internal", startZoom: 5, widthFraction: 0.5, dashArray: [2, 2], delWidthFactor: 2 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "ne-internal", startZoom: 4, endZoom: 4, widthFraction: 0.5, dashArray: [2, 2], delWidthFactor: 2.5 }
+    ]
+  },
+  {
+    id: "cartodb-light-retina",
     tileUrlTemplates: [
       "https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",
       "https://basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",
@@ -2307,15 +2354,16 @@ var configs_default = [
       "https://{s}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}{r}.png",
       "https://basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}{r}.png"
     ],
-    lineWidthStops: { "1": 0.5, "2": 0.5, "3": 0.5, "4": 1, "5": 1.25, "7": 1.5, "16": 2.5 },
+    lineWidthStops: { "1": 0.75, "2": 0.75, "3": 0.75, "4": 1, "5": 1, "7": 1.5, "11": 2 },
     lineStyles: [
-      { color: "rgb(235, 214, 214)", layerSuffix: "ne", endZoom: 4, lineExtensionFactor: 0.1, delWidthFactor: 2 },
-      { color: "rgb(235, 214, 214)", layerSuffix: "ne-disp", endZoom: 4, lineExtensionFactor: 0 },
-      { color: "rgb(235, 214, 214)", layerSuffix: "osm", alpha: 0.2, startZoom: 6, widthFraction: 3, lineExtensionFactor: 0.1 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "ne", endZoom: 4, lineExtensionFactor: 0.1, delWidthFactor: 2.5 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "ne-disp", endZoom: 4, delWidthFactor: 0 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm", alpha: 0.1, startZoom: 6, endZoom: 11, widthFraction: 5, lineExtensionFactor: 0.1 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm", alpha: 0.1, startZoom: 12, widthFraction: 4, lineExtensionFactor: 0.1 },
       { color: "rgb(235, 214, 214)", layerSuffix: "osm", startZoom: 5, lineExtensionFactor: 0.1 },
-      { color: "rgb(235, 214, 214)", layerSuffix: "osm-disp", alpha: 0.2, startZoom: 6, widthFraction: 3, lineExtensionFactor: 0 },
-      { color: "rgb(235, 214, 214)", layerSuffix: "osm-disp", startZoom: 5, lineExtensionFactor: 0 },
-      { color: "rgb(235, 214, 214)", layerSuffix: "osm-internal", startZoom: 4, widthFraction: 0.75, dashArray: [2, 2], delWidthFactor: 2 }
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm-disp", startZoom: 5, delWidthFactor: 0 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "osm-internal", startZoom: 5, widthFraction: 0.5, dashArray: [4, 4], delWidthFactor: 2 },
+      { color: "rgb(235, 214, 214)", layerSuffix: "ne-internal", startZoom: 4, endZoom: 4, widthFraction: 0.5, dashArray: [4, 4], delWidthFactor: 2.5 }
     ]
   },
   {
@@ -2342,10 +2390,10 @@ var configs_default = [
     lineWidthStops: { "1": 0.5, "2": 0.6, "3": 0.7, "4": 1, "10": 3.75 },
     lineStyles: [
       { color: "rgb(200, 180, 200)", layerSuffix: "osm", startZoom: 1, endZoom: 3, delWidthFactor: 2.5, widthFraction: 1.5 },
-      { color: "rgb(200, 180, 200)", layerSuffix: "osm", startZoom: 4 },
-      { color: "rgb(160, 120, 160)", layerSuffix: "osm", startZoom: 4, widthFraction: 0.333, dashArray: [30, 2, 8, 2] },
+      { color: "rgb(200, 180, 200)", layerSuffix: "osm", startZoom: 4, delWidthFactor: 1.5 },
+      { color: "rgb(160, 120, 160)", layerSuffix: "osm", startZoom: 4, widthFraction: 0.333, dashArray: [30, 2, 8, 2], delWidthFactor: 0 },
       { color: "rgb(200, 180, 200)", layerSuffix: "osm-internal", startZoom: 4, widthFraction: 0.45 },
-      { color: "rgb(160, 120, 160)", layerSuffix: "osm-internal", startZoom: 4, widthFraction: 0.15, dashArray: [4, 2, 10] }
+      { color: "rgb(160, 120, 160)", layerSuffix: "osm-internal", startZoom: 4, widthFraction: 0.15, dashArray: [10, 4, 2] }
     ]
   },
   {
@@ -2358,13 +2406,17 @@ var configs_default = [
     lineStyles: [
       { color: "rgb(149, 175, 180)", layerSuffix: "osm", lineExtensionFactor: 0.25, startZoom: 2 },
       { color: "rgb(89, 117, 123)", layerSuffix: "osm", widthFraction: 0.33, lineExtensionFactor: 0.25, startZoom: 2 },
-      { color: "rgb(172, 163, 163)", layerSuffix: "osm-internal", widthFraction: 0.33, startZoom: 4, dashArray: [7, 7, 7] }
+      { color: "rgb(172, 163, 163)", layerSuffix: "osm-internal", widthFraction: 0.33, startZoom: 4, dashArray: [7, 7] }
     ]
   }
 ];
 var INFINITY = -1;
+var MIN_LINE_WIDTH = 0.1;
+var DEFAULT_LINE_WIDTH = 1;
 function templateToRegex(template) {
   const groups = [];
+  const hasRetina = template.includes("{r}");
+  const hasExtension = /\.(png|jpg|jpeg|webp|gif)$/i.test(template);
   let pattern = template.replace(/[.*+?^${}()|[\]\\]/g, (char) => {
     if (char === "{" || char === "}") return char;
     return "\\" + char;
@@ -2378,13 +2430,22 @@ function templateToRegex(template) {
       return "([a-z0-9]+)";
     }
     if (lowerName === "r") {
-      return "(@\\d+x)?";
+      return "(@\\d+x)";
     }
     return "(\\d+)";
   });
+  if (!hasRetina) {
+    if (hasExtension) {
+      pattern = pattern.replace(/(\\\.(png|jpg|jpeg|webp|gif))/, "(?!@\\d+x)$1");
+    } else {
+      pattern = pattern + "(?!@\\d+x)";
+    }
+  }
   return { pattern: new RegExp("^" + pattern + "(\\?.*)?$", "i"), groups };
 }
 function templateToTemplateRegex(template) {
+  const hasRetina = template.includes("{r}");
+  const hasExtension = /\.(png|jpg|jpeg|webp|gif)$/i.test(template);
   let pattern = template.replace(/[.*+?^${}()|[\]\\]/g, (char) => {
     if (char === "{" || char === "}") return char;
     return "\\" + char;
@@ -2394,10 +2455,17 @@ function templateToTemplateRegex(template) {
       return "(\\{s\\}|\\{[a-z0-9]-[a-z0-9]\\}|[a-z0-9]+)";
     }
     if (lowerName === "r") {
-      return "(\\{r\\}|@\\d+x)?";
+      return "(\\{r\\}|@\\d+x)";
     }
     return `\\{${lowerName}\\}`;
   });
+  if (!hasRetina) {
+    if (hasExtension) {
+      pattern = pattern.replace(/(\\\.(png|jpg|jpeg|webp|gif))/, "(?!@\\d+x|\\{r\\})$1");
+    } else {
+      pattern = pattern + "(?!@\\d+x|\\{r\\})";
+    }
+  }
   return new RegExp("^" + pattern + "(\\?.*)?$", "i");
 }
 function isValidColor(color) {
@@ -2466,7 +2534,7 @@ var LineStyle = class _LineStyle {
    * @param {number} [options.lineExtensionFactor=0.5] - Factor to extend lines by (multiplied by deletion line width)
    * @param {number} [options.delWidthFactor=1.5] - Factor to multiply line width for deletion blur
    */
-  constructor({ color, layerSuffix, widthFraction = 1, dashArray, alpha = 1, startZoom = 0, endZoom = INFINITY, lineExtensionFactor = 0.5, delWidthFactor = 1.5 }) {
+  constructor({ color, layerSuffix, widthFraction = 1, dashArray, alpha = 1, startZoom = 0, endZoom = INFINITY, lineExtensionFactor = 0, delWidthFactor = 1.5 }) {
     this.color = color;
     this.layerSuffix = layerSuffix;
     this.widthFraction = widthFraction;
@@ -2596,6 +2664,45 @@ var LayerConfig = class _LayerConfig {
     const activeStyles = this.getLineStylesForZoom(z2);
     return [...new Set(activeStyles.map((s) => s.layerSuffix))];
   }
+  /**
+   * Interpolate or extrapolate line width for a given zoom level.
+   * Uses the lineWidthStops map to calculate the appropriate width.
+   * @param {number} zoom - Zoom level
+   * @returns {number}
+   */
+  getLineWidth(zoom) {
+    const zooms = Object.keys(this.lineWidthStops).map(Number).sort((a, b2) => a - b2);
+    if (this.lineWidthStops[zoom] !== void 0) {
+      return this.lineWidthStops[zoom];
+    }
+    if (zoom < zooms[0]) {
+      const z1 = zooms[0];
+      const z2 = zooms[1];
+      const w1 = this.lineWidthStops[z1];
+      const w2 = this.lineWidthStops[z2];
+      const slope = (w2 - w1) / (z2 - z1);
+      return Math.max(MIN_LINE_WIDTH, w1 + slope * (zoom - z1));
+    }
+    if (zoom > zooms[zooms.length - 1]) {
+      const z1 = zooms[zooms.length - 2];
+      const z2 = zooms[zooms.length - 1];
+      const w1 = this.lineWidthStops[z1];
+      const w2 = this.lineWidthStops[z2];
+      const slope = (w2 - w1) / (z2 - z1);
+      return Math.max(MIN_LINE_WIDTH, w2 + slope * (zoom - z2));
+    }
+    for (let i = 0; i < zooms.length - 1; i++) {
+      if (zoom > zooms[i] && zoom < zooms[i + 1]) {
+        const z1 = zooms[i];
+        const z2 = zooms[i + 1];
+        const w1 = this.lineWidthStops[z1];
+        const w2 = this.lineWidthStops[z2];
+        const t = (zoom - z1) / (z2 - z1);
+        return w1 + t * (w2 - w1);
+      }
+    }
+    return DEFAULT_LINE_WIDTH;
+  }
   /**
    * Check if this config matches the given template URLs (with {z}/{x}/{y} placeholders)
    * @param {string | string[]} templates - Single template URL or array of template URLs
@@ -2788,9 +2895,7 @@ var TileFetchError = class _TileFetchError extends Error {
     return new _TileFetchError(response.status, response.url, body);
   }
 };
-var MIN_LINE_WIDTH = 0.1;
 var DEFAULT_TILE_EXTENT = 4096;
-var DEFAULT_LINE_WIDTH = 1;
 function buildFetchOptions(crossOrigin, referrerPolicy) {
   const options = {};
   if (crossOrigin === "use-credentials") {
@@ -2808,39 +2913,6 @@ function buildFetchOptions(crossOrigin, referrerPolicy) {
   }
   return options;
 }
-function getLineWidth(zoom, lineWidthStops) {
-  const zooms = Object.keys(lineWidthStops).map(Number).sort((a, b2) => a - b2);
-  if (lineWidthStops[zoom] !== void 0) {
-    return lineWidthStops[zoom];
-  }
-  if (zoom < zooms[0]) {
-    const z1 = zooms[0];
-    const z2 = zooms[1];
-    const w1 = lineWidthStops[z1];
-    const w2 = lineWidthStops[z2];
-    const slope = (w2 - w1) / (z2 - z1);
-    return Math.max(MIN_LINE_WIDTH, w1 + slope * (zoom - z1));
-  }
-  if (zoom > zooms[zooms.length - 1]) {
-    const z1 = zooms[zooms.length - 2];
-    const z2 = zooms[zooms.length - 1];
-    const w1 = lineWidthStops[z1];
-    const w2 = lineWidthStops[z2];
-    const slope = (w2 - w1) / (z2 - z1);
-    return Math.max(MIN_LINE_WIDTH, w2 + slope * (zoom - z2));
-  }
-  for (let i = 0; i < zooms.length - 1; i++) {
-    if (zoom > zooms[i] && zoom < zooms[i + 1]) {
-      const z1 = zooms[i];
-      const z2 = zooms[i + 1];
-      const w1 = lineWidthStops[z1];
-      const w2 = lineWidthStops[z2];
-      const t = (zoom - z1) / (z2 - z1);
-      return w1 + t * (w2 - w1);
-    }
-  }
-  return DEFAULT_LINE_WIDTH;
-}
 function getFeaturesBoundingBox(features, tileSize, padding = 0) {
   let minX = Infinity, minY = Infinity;
   let maxX = -Infinity, maxY = -Infinity;
@@ -3101,7 +3173,6 @@ var _TileFixer = class _TileFixer {
    * @returns {Promise<ArrayBuffer>} The corrected tile as ArrayBuffer (PNG)
    */
   async fixTile(corrections, rasterTile, layerConfig, zoom) {
-    const { lineWidthStops } = layerConfig;
     let activeLineStyles;
     if (layerConfig.getLineStylesForZoom) {
       activeLineStyles = layerConfig.getLineStylesForZoom(zoom);
@@ -3126,7 +3197,7 @@ var _TileFixer = class _TileFixer {
     const canvas = this._canvas;
     const ctx = canvas.getContext("2d", { willReadFrequently: true });
     ctx.drawImage(imageBitmap, 0, 0, tileSize, tileSize);
-    const baseLineWidth = getLineWidth(zoom, lineWidthStops);
+    const baseLineWidth = layerConfig.getLineWidth(zoom);
     const delLineWidthBySuffix = {};
     for (const suffix of layerSuffixes) {
       const stylesForSuffix = activeLineStyles.filter((s) => s.layerSuffix === suffix);