@craft-native/ts-maps 0.0.247 → 0.0.249

package/dist/adapters.js

@@ -1,51 +1,3 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
-// src/types.ts
-var defaultMapConfiguration = {
-  provider: "ts_maps",
-  map_type: "standard",
-  shows_user_location: false,
-  user_tracking_mode: "none",
-  shows_compass: true,
-  shows_scale: true,
-  shows_traffic: false,
-  shows_buildings: true,
-  is_rotate_enabled: true,
-  is_scroll_enabled: true,
-  is_zoom_enabled: true,
-  is_pitch_enabled: true,
-  min_zoom: 0,
-  max_zoom: 22
-};
-var defaultMapCamera = {
-  center: { latitude: 0, longitude: 0 },
-  zoom: 15,
-  pitch: 0,
-  heading: 0
-};
-var markerColorHex = {
-  red: "#ff3b30",
-  green: "#34c759",
-  blue: "#007aff",
-  yellow: "#ffcc00",
-  orange: "#ff9500",
-  purple: "#af52de",
-  cyan: "#32ade6",
-  magenta: "#ff2d55"
-};
-var strokePatternDashes = {
-  solid: [],
-  dashed: [10, 5],
-  dotted: [2, 2],
-  dash_dot: [10, 5, 2, 5]
-};
-
 // ../../node_modules/ts-maps/dist/index.js
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -891,7 +843,7 @@ var Evented;
 var init_Events = __esm(() => {
   init_Util();
   init_Class();
-  Evented = class Evented2 extends Class {
+  Evented = class Evented extends Class {
     static __REMOVED_EVENTS = ["mousedown", "mouseup", "mouseover", "mouseout", "mousemove"];
     on(types, fn, context) {
       assertEventTypes("on", types);
@@ -928,7 +880,7 @@ var init_Events = __esm(() => {
       return this;
     }
     _on(type, fn, context, _once) {
-      if (Evented2.__REMOVED_EVENTS.includes(type)) {
+      if (Evented.__REMOVED_EVENTS.includes(type)) {
         console.error(`The event ${type} has been removed. Use the PointerEvent variant instead.`);
       }
       if (typeof fn !== "function") {
@@ -1152,7 +1104,7 @@ function cubicBezier(x1, y1, x2, y2) {
 var Animation;
 var init_Animation = __esm(() => {
   init_Events();
-  Animation = class Animation2 extends Evented {
+  Animation = class Animation extends Evented {
     constructor() {
       super();
       this._easing = easeInOutCubic;
@@ -1237,7 +1189,7 @@ var PosAnimation;
 var init_PosAnimation = __esm(() => {
   init_DomUtil();
   init_Events();
-  PosAnimation = class PosAnimation2 extends Evented {
+  PosAnimation = class PosAnimation extends Evented {
     run(el, newPos, duration, easeLinearity) {
       this.stop();
       this._el = el;
@@ -1654,7 +1606,7 @@ var init_CRS = __esm(() => {
 var EarthCRS;
 var init_EarthCRS = __esm(() => {
   init_CRS();
-  EarthCRS = class EarthCRS2 extends CRS {
+  EarthCRS = class EarthCRS extends CRS {
     static wrapLng = [-180, 180];
     static R = 6371000;
     static distance(latlng1, latlng2) {
@@ -1792,7 +1744,7 @@ var init_EPSG3857 = __esm(() => {
   init_Transformation();
   init_Projection_SphericalMercator();
   init_EarthCRS();
-  EPSG3857 = class EPSG38572 extends EarthCRS {
+  EPSG3857 = class EPSG3857 extends EarthCRS {
     static code = "EPSG:3857";
     static projection = SphericalMercator;
     static transformation = (() => {
@@ -1800,7 +1752,7 @@ var init_EPSG3857 = __esm(() => {
       return new Transformation(scale, 0.5, -scale, 0.5);
     })();
   };
-  EPSG900913 = class EPSG9009132 extends EPSG3857 {
+  EPSG900913 = class EPSG900913 extends EPSG3857 {
     static code = "EPSG:900913";
   };
 });
@@ -1845,10 +1797,10 @@ function parseHex(hex) {
 function parseRgbComponent(input) {
   const s = input.trim();
   if (s.endsWith("%")) {
-    const n2 = Number.parseFloat(s.slice(0, -1));
-    if (Number.isNaN(n2))
+    const n = Number.parseFloat(s.slice(0, -1));
+    if (Number.isNaN(n))
       return Number.NaN;
-    return clamp01(n2 / 100);
+    return clamp01(n / 100);
   }
   const n = Number.parseFloat(s);
   if (Number.isNaN(n))
@@ -1858,10 +1810,10 @@ function parseRgbComponent(input) {
 function parseAlpha(input) {
   const s = input.trim();
   if (s.endsWith("%")) {
-    const n2 = Number.parseFloat(s.slice(0, -1));
-    if (Number.isNaN(n2))
+    const n = Number.parseFloat(s.slice(0, -1));
+    if (Number.isNaN(n))
       return Number.NaN;
-    return clamp01(n2 / 100);
+    return clamp01(n / 100);
   }
   const n = Number.parseFloat(s);
   if (Number.isNaN(n))
@@ -2137,7 +2089,7 @@ var init_Color = __esm(() => {
 });
 var ExpressionError;
 var init_errors = __esm(() => {
-  ExpressionError = class ExpressionError2 extends Error {
+  ExpressionError = class ExpressionError extends Error {
     constructor(message, expression, path = []) {
       const prefix = path.length > 0 ? `[${path.map((p) => JSON.stringify(p)).join("][")}] ` : "";
       super(`${prefix}${message}`);
@@ -3006,11 +2958,11 @@ function registerLogicalOps() {
       throw new ExpressionError('"in" expects at least 1 argument', ["in", ...args], path);
     if (args.length === 2 && Array.isArray(args[1])) {
       const needle = compile(args[0], "value", path.concat(1));
-      const haystack2 = compile(args[1], "value", path.concat(2));
+      const haystack = compile(args[1], "value", path.concat(2));
       return {
         evaluate: (ctx) => {
           const x = needle.evaluate(ctx);
-          const hay = haystack2.evaluate(ctx);
+          const hay = haystack.evaluate(ctx);
           if (Array.isArray(hay))
             return hay.some((value) => strictEq(x, value));
           if (typeof hay === "string")
@@ -3018,7 +2970,7 @@ function registerLogicalOps() {
           return false;
         },
         returnType: "boolean",
-        ...mergeDeps4([needle, haystack2])
+        ...mergeDeps4([needle, haystack])
       };
     }
     const input = compile(args[0], "value", path.concat(1));
@@ -3354,12 +3306,12 @@ function registerMathOps() {
   registerOperator("-", (args, compile, path) => {
     if (args.length !== 1 && args.length !== 2)
       throw new ExpressionError(`"-" expects 1 or 2 arguments, got ${args.length}`, ["-", ...args], path);
-    const children = args.map((a2, i) => compile(a2, "number", path.concat(i + 1)));
+    const children = args.map((a, i) => compile(a, "number", path.concat(i + 1)));
     const expr = ["-", ...args];
     if (children.length === 1) {
-      const a2 = children[0];
+      const a = children[0];
       return {
-        evaluate: (ctx) => -expectNumber(a2.evaluate(ctx), "-", expr),
+        evaluate: (ctx) => -expectNumber(a.evaluate(ctx), "-", expr),
         returnType: "number",
         ...mergeDeps5(children)
       };
@@ -4816,7 +4768,7 @@ var init_header = __esm(() => {
   };
   MAGIC = [80, 77, 84, 105, 108, 101, 115];
   TWO_32 = 2 ** 32;
-  PMTilesFormatError = class PMTilesFormatError2 extends Error {
+  PMTilesFormatError = class PMTilesFormatError extends Error {
     constructor(message) {
       super(message);
       this.name = "PMTilesFormatError";
@@ -5440,10 +5392,10 @@ function decodeDirectory(bytes) {
   if (count * 4 > bytes.length)
     throw new RangeError(`PMTiles: directory claims ${count} entries in ${bytes.length} bytes`);
   const entries = Array.from({ length: count });
-  let lastId2 = 0;
+  let lastId = 0;
   for (let i = 0;i < count; i++) {
-    lastId2 += read();
-    entries[i] = { tileId: lastId2, offset: 0, length: 0, runLength: 1 };
+    lastId += read();
+    entries[i] = { tileId: lastId, offset: 0, length: 0, runLength: 1 };
   }
   for (let i = 0;i < count; i++)
     entries[i].runLength = read();
@@ -5532,7 +5484,7 @@ class FetchSource {
 var PMTilesChangedError;
 var MAX_WHOLE_FILE_BYTES;
 var init_sources = __esm(() => {
-  PMTilesChangedError = class PMTilesChangedError2 extends Error {
+  PMTilesChangedError = class PMTilesChangedError extends Error {
     constructor(key) {
       super(`PMTiles: ${key} changed while it was being read`);
       this.name = "PMTilesChangedError";
@@ -6090,7 +6042,7 @@ async function saveOfflineRegion(options, emitter) {
   const concurrency = Math.max(1, options.concurrency ?? 4);
   const coords = computeTileCoords(options.bounds, options.zoomRange);
   const total = coords.length;
-  const template2 = isPMTilesUrl(options.tileUrl) ? pmtilesTileUrl(options.tileUrl) : options.tileUrl;
+  const template = isPMTilesUrl(options.tileUrl) ? pmtilesTileUrl(options.tileUrl) : options.tileUrl;
   const result = { saved: 0, failed: 0, skipped: 0 };
   if (isPMTilesUrl(options.tileUrl))
     await cachedFetch(pmtilesSourceUrl(options.tileUrl), { cache, signal: options.signal }).catch(() => {});
@@ -6100,7 +6052,7 @@ async function saveOfflineRegion(options, emitter) {
     while (cursor < coords.length) {
       const idx = cursor++;
       const c = coords[idx];
-      const url = fillTileUrl(template2, c);
+      const url = fillTileUrl(template, c);
       try {
         const res = await cachedFetch(url, { cache, signal: options.signal });
         if (res.fromCache)
@@ -6478,9 +6430,9 @@ class VectorTile {
 var init_VectorTile = __esm(() => {
   init_VectorTileLayer();
 });
-function glyphUrl(template2, fontstack, rangeStart) {
+function glyphUrl(template, fontstack, rangeStart) {
   const range = `${rangeStart}-${rangeStart + 255}`;
-  return template2.replace("{fontstack}", encodeURIComponent(fontstack)).replace("{range}", range);
+  return template.replace("{fontstack}", encodeURIComponent(fontstack)).replace("{range}", range);
 }
 function rangeStartFor(codePoint) {
   return Math.floor(codePoint / 256) * 256;
@@ -6548,8 +6500,8 @@ class GlyphSource {
   _fetch;
   _ranges;
   _pending;
-  constructor(template2, options = {}) {
-    this._template = template2;
+  constructor(template, options = {}) {
+    this._template = template;
     this._fetch = options.fetch ?? globalThis.fetch;
     this._ranges = new Map;
     this._pending = new Map;
@@ -6703,12 +6655,12 @@ function rangeCount(r) {
 function isVectorUrl(url) {
   return /\.(?:pbf|mvt)(?:$|\?)/i.test(url);
 }
-function fill(template2, x, y, z) {
-  return template2.replace("{z}", String(z)).replace("{x}", String(x)).replace("{y}", String(y));
+function fill(template, x, y, z) {
+  return template.replace("{z}", String(z)).replace("{x}", String(x)).replace("{y}", String(y));
 }
 function jobForSource(source, minZoom, maxZoom) {
-  const template2 = isPMTilesUrl(source.url) ? pmtilesTileUrl(source.url) : source.url;
-  const kind = source.type ?? (isVectorUrl(template2) || isPMTilesUrl(template2) ? "vector" : "raster");
+  const template = isPMTilesUrl(source.url) ? pmtilesTileUrl(source.url) : source.url;
+  const kind = source.type ?? (isVectorUrl(template) || isPMTilesUrl(template) ? "vector" : "raster");
   const tileSize = source.tileSize ?? (kind === "vector" ? 512 : 256);
   const shift = Math.round(Math.log2(tileSize / 256));
   const srcMin = source.minZoom ?? 0;
@@ -6719,9 +6671,9 @@ function jobForSource(source, minZoom, maxZoom) {
     zooms.push({ z, gridZ: z, mapZ: z + shift });
   return {
     kind,
-    template: template2,
+    template,
     zooms,
-    url: (x, y, z) => fill(template2, x, y, z),
+    url: (x, y, z) => fill(template, x, y, z),
     indexAt: kind === "vector" ? top : undefined,
     server: (x, y, z) => ({ x, y, z })
   };
@@ -6733,8 +6685,8 @@ function jobForLayer(layer, minZoom, maxZoom) {
   if (options.localSource)
     return;
   const vector = typeof layer._subTile === "function";
-  const template2 = vector ? options.url : layer._url;
-  if (!template2)
+  const template = vector ? options.url : layer._url;
+  if (!template)
     return;
   const tileSize = layer.getTileSize().x;
   const gridShift = Math.round(Math.log2(tileSize / 256));
@@ -6753,7 +6705,7 @@ function jobForLayer(layer, minZoom, maxZoom) {
     zooms.push({ z, gridZ: z - gridShift, mapZ: z });
   return {
     kind: vector ? "vector" : "raster",
-    template: template2,
+    template,
     zooms,
     url: (x, y, z) => layer.getTileUrl({ x, y, z }),
     indexAt: vector ? top : undefined,
@@ -6945,7 +6897,7 @@ function extractTile(bytes, x, y, z, layers = {}) {
     return { places, roads };
   }
   const n = 2 ** z;
-  const toLatLng2 = (p, extent) => [
+  const toLatLng = (p, extent) => [
     unitToLat((y + p[1] / extent) / n),
     unitToLng((x + p[0] / extent) / n)
   ];
@@ -6999,7 +6951,7 @@ function extractTile(bytes, x, y, z, layers = {}) {
     const p = anchor(geometry, type, extent);
     if (!name || !p)
       return;
-    const [lat, lng] = toLatLng2(p, extent);
+    const [lat, lng] = toLatLng(p, extent);
     places.push({ name, lat, lng, kind, rank });
   };
   eachFeature(names.place, (props, g, type, extent) => {
@@ -7083,18 +7035,18 @@ function extractTile(bytes, x, y, z, layers = {}) {
     const level = typeof props.layer === "number" && props.layer !== 0 ? props.layer : props.brunnel === "bridge" ? 1 : props.brunnel === "tunnel" ? -1 : 0;
     for (const line of g) {
       for (const piece of clipLine(line, extent)) {
-        const names2 = piece.slice(1).map((p, i) => nameFor(piece[i], p, kind, extent));
-        for (let i = 1;i < names2.length - 1; i++) {
-          if (names2[i] === undefined && names2[i - 1] !== undefined && names2[i - 1] === names2.slice(i + 1).find((n2) => n2 !== undefined))
-            names2[i] = names2[i - 1];
+        const names = piece.slice(1).map((p, i) => nameFor(piece[i], p, kind, extent));
+        for (let i = 1;i < names.length - 1; i++) {
+          if (names[i] === undefined && names[i - 1] !== undefined && names[i - 1] === names.slice(i + 1).find((n) => n !== undefined))
+            names[i] = names[i - 1];
         }
         let start = 0;
-        for (let i = 1;i <= names2.length; i++) {
-          if (i < names2.length && names2[i] === names2[start])
+        for (let i = 1;i <= names.length; i++) {
+          if (i < names.length && names[i] === names[start])
             continue;
           const coords = [];
           for (const p of piece.slice(start, i + 1)) {
-            const [lat, lng] = toLatLng2(p, extent);
+            const [lat, lng] = toLatLng(p, extent);
             coords.push(lat, lng);
           }
           const road = { coords, kind: kind === "path" && props.subclass ? `path:${props.subclass}` : kind, oneway };
@@ -7102,8 +7054,8 @@ function extractTile(bytes, x, y, z, layers = {}) {
             road.ramp = true;
           if (level)
             road.level = level;
-          if (names2[start])
-            road.name = names2[start];
+          if (names[start])
+            road.name = names[start];
           roads.push(road);
           start = i;
         }
@@ -7544,11 +7496,11 @@ function laneIcon(lane, maneuver) {
 function maneuverIcon(maneuver) {
   const stroke = 'stroke="currentColor" stroke-width="5.5" stroke-linecap="round" stroke-linejoin="round" fill="none"';
   const wrap = (body) => `<svg viewBox="0 0 48 48" width="48" height="48" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">${body}</svg>`;
-  const head = (x, y, angle2) => {
+  const head = (x, y, angle) => {
     const s = 8;
-    const tip = [x + Math.sin(angle2) * s, y - Math.cos(angle2) * s];
-    const left = [x + Math.sin(angle2 - 2.3) * s * 0.9, y - Math.cos(angle2 - 2.3) * s * 0.9];
-    const right = [x + Math.sin(angle2 + 2.3) * s * 0.9, y - Math.cos(angle2 + 2.3) * s * 0.9];
+    const tip = [x + Math.sin(angle) * s, y - Math.cos(angle) * s];
+    const left = [x + Math.sin(angle - 2.3) * s * 0.9, y - Math.cos(angle - 2.3) * s * 0.9];
+    const right = [x + Math.sin(angle + 2.3) * s * 0.9, y - Math.cos(angle + 2.3) * s * 0.9];
     return `<path d="M${tip[0].toFixed(1)} ${tip[1].toFixed(1)}L${left[0].toFixed(1)} ${left[1].toFixed(1)}L${right[0].toFixed(1)} ${right[1].toFixed(1)}Z" fill="currentColor"/>`;
   };
   const sign = maneuver.direction === "left" ? -1 : 1;
@@ -7561,9 +7513,9 @@ function maneuverIcon(maneuver) {
   }
   if (maneuver.kind === "roundabout" || maneuver.kind === "roundabout-exit") {
     const exitAngle = maneuver.direction === "straight" ? 0 : sign * Math.PI / 2;
-    const ex2 = 24 + Math.sin(exitAngle) * 18;
-    const ey2 = 20 - Math.cos(exitAngle) * 18;
-    return wrap(`<circle cx="24" cy="20" r="9" ${stroke}/><path d="M24 42V29" ${stroke}/><path d="M${24 + Math.sin(exitAngle) * 9} ${20 - Math.cos(exitAngle) * 9}L${ex2 - Math.sin(exitAngle) * 5} ${ey2 + Math.cos(exitAngle) * 5}" ${stroke}/>${head(ex2, ey2, exitAngle)}`);
+    const ex = 24 + Math.sin(exitAngle) * 18;
+    const ey = 20 - Math.cos(exitAngle) * 18;
+    return wrap(`<circle cx="24" cy="20" r="9" ${stroke}/><path d="M24 42V29" ${stroke}/><path d="M${24 + Math.sin(exitAngle) * 9} ${20 - Math.cos(exitAngle) * 9}L${ex - Math.sin(exitAngle) * 5} ${ey + Math.cos(exitAngle) * 5}" ${stroke}/>${head(ex, ey, exitAngle)}`);
   }
   let angle = 0;
   if (maneuver.direction !== "straight") {
@@ -7662,7 +7614,7 @@ class RoadGraph {
     this._junctionDelays();
   }
   _junctionDelays() {
-    const delay2 = JUNCTION_DELAY[this.profile];
+    const delay = JUNCTION_DELAY[this.profile];
     const neighbours = this.edges.map(() => new Set);
     this.edges.forEach((list, from) => {
       for (const edge of list) {
@@ -7675,7 +7627,7 @@ class RoadGraph {
     for (const list of this.edges) {
       for (const edge of list) {
         if (edge.road >= 0 && neighbours[edge.to].size >= 3)
-          edge.cost += delay2;
+          edge.cost += delay;
       }
     }
   }
@@ -7739,7 +7691,7 @@ class RoadGraph {
       else
         byRoad.set(s.i, [point]);
     };
-    const touch2 = (px, py, b) => {
+    const touch = (px, py, b) => {
       const vx = b.bx - b.ax;
       const vy = b.by - b.ay;
       const len = vx * vx + vy * vy;
@@ -7781,10 +7733,10 @@ class RoadGraph {
             }
           }
           for (const [p, other] of [[a, b], [b, a]]) {
-            const ta = touch2(p.ax, p.ay, other);
+            const ta = touch(p.ax, p.ay, other);
             if (ta !== undefined)
               split(other, ta, p.a[0], p.a[1]);
-            const tb = touch2(p.bx, p.by, other);
+            const tb = touch(p.bx, p.by, other);
             if (tb !== undefined)
               split(other, tb, p.b[0], p.b[1]);
           }
@@ -8138,14 +8090,14 @@ function describe(graph, found, from, to) {
   let code = "depart";
   const flush = (endHop, nextCode) => {
     const slice = hops.slice(stepStart, endHop);
-    const geometry2 = [slice[0].from, ...slice.map((h) => h.to)];
+    const geometry = [slice[0].from, ...slice.map((h) => h.to)];
     const road = slice.find((h) => h.road?.name)?.road ?? slice[0].road;
     const name = road?.name;
     const step = {
       distance: slice.reduce((s, h) => s + h.length, 0),
       duration: slice.reduce((s, h) => s + h.cost, 0),
       instruction: formatInstruction(parseManeuver(code), { name }),
-      geometry: geometry2,
+      geometry,
       maneuver: code
     };
     if (name)
@@ -8386,19 +8338,19 @@ function withOfflineFallback(online, offline) {
   };
   const isEmpty = (r) => r.length === 0;
   if ("getDirections" in online) {
-    const on3 = online;
-    const off3 = offline;
+    const on = online;
+    const off = offline;
     return {
-      name: `${on3.name}+offline`,
-      getDirections: wrap(on3.getDirections.bind(on3), off3.getDirections.bind(off3), isEmpty)
+      name: `${on.name}+offline`,
+      getDirections: wrap(on.getDirections.bind(on), off.getDirections.bind(off), isEmpty)
     };
   }
-  const on2 = online;
-  const off2 = offline;
+  const on = online;
+  const off = offline;
   return {
-    name: `${on2.name}+offline`,
-    search: wrap(on2.search.bind(on2), off2.search.bind(off2), isEmpty),
-    reverse: wrap(on2.reverse.bind(on2), off2.reverse.bind(off2), isEmpty)
+    name: `${on.name}+offline`,
+    search: wrap(on.search.bind(on), off.search.bind(off), isEmpty),
+    reverse: wrap(on.reverse.bind(on), off.reverse.bind(off), isEmpty)
   };
 }
 var PLACE_TYPES;
@@ -8486,7 +8438,7 @@ var init_OfflineMaps = __esm(() => {
   init_plan();
   init_router();
   init_search();
-  OfflineMaps = class OfflineMaps2 extends Evented {
+  OfflineMaps = class OfflineMaps extends Evented {
     store;
     concurrency;
     maxTiles;
@@ -8993,7 +8945,7 @@ function buildTerrainMesh(opts) {
   const upm = opts.unitsPerMeter ?? 1;
   const verticesPerSide = resolution + 1;
   const vertexCount = verticesPerSide * verticesPerSide;
-  const positions2 = new Float32Array(vertexCount * 6);
+  const positions = new Float32Array(vertexCount * 6);
   const step = tileSize / resolution;
   const demStep = (demSize - 1) / resolution;
   for (let j = 0;j < verticesPerSide; j++) {
@@ -9005,12 +8957,12 @@ function buildTerrainMesh(opts) {
       const metres = sampleElevationBilinear(opts.elevation, demSize, du, dv);
       const z = metres * exaggeration * upm;
       const vi = (j * verticesPerSide + i) * 6;
-      positions2[vi] = x;
-      positions2[vi + 1] = y;
-      positions2[vi + 2] = z;
-      positions2[vi + 3] = 0;
-      positions2[vi + 4] = 0;
-      positions2[vi + 5] = 1;
+      positions[vi] = x;
+      positions[vi + 1] = y;
+      positions[vi + 2] = z;
+      positions[vi + 3] = 0;
+      positions[vi + 4] = 0;
+      positions[vi + 5] = 1;
     }
   }
   for (let j = 0;j < verticesPerSide; j++) {
@@ -9019,10 +8971,10 @@ function buildTerrainMesh(opts) {
       const ip = Math.min(verticesPerSide - 1, i + 1);
       const jm = Math.max(0, j - 1);
       const jp = Math.min(verticesPerSide - 1, j + 1);
-      const zL = positions2[(j * verticesPerSide + im) * 6 + 2];
-      const zR = positions2[(j * verticesPerSide + ip) * 6 + 2];
-      const zU = positions2[(jm * verticesPerSide + i) * 6 + 2];
-      const zD = positions2[(jp * verticesPerSide + i) * 6 + 2];
+      const zL = positions[(j * verticesPerSide + im) * 6 + 2];
+      const zR = positions[(j * verticesPerSide + ip) * 6 + 2];
+      const zU = positions[(jm * verticesPerSide + i) * 6 + 2];
+      const zD = positions[(jp * verticesPerSide + i) * 6 + 2];
       const dx = (ip - im) * step || 1;
       const dy = (jp - jm) * step || 1;
       const nx = -(zR - zL) / dx;
@@ -9030,9 +8982,9 @@ function buildTerrainMesh(opts) {
       const nz = 1;
       const len = Math.hypot(nx, ny, nz) || 1;
       const base = (j * verticesPerSide + i) * 6;
-      positions2[base + 3] = nx / len;
-      positions2[base + 4] = ny / len;
-      positions2[base + 5] = nz / len;
+      positions[base + 3] = nx / len;
+      positions[base + 4] = ny / len;
+      positions[base + 5] = nz / len;
     }
   }
   const indices = new Uint32Array(resolution * resolution * 6);
@@ -9052,7 +9004,7 @@ function buildTerrainMesh(opts) {
     }
   }
   return {
-    positions: positions2,
+    positions,
     indices,
     vertexCount,
     indexCount: indices.length,
@@ -9400,7 +9352,7 @@ function earcutLinked(earIn, triangles, dim, minX, minY, invSize, pass) {
   let ear = earIn;
   if (pass === 0 && invSize)
     indexCurve(ear, minX, minY, invSize);
-  let stop2 = ear;
+  let stop = ear;
   while (ear.prev !== ear.next) {
     const prev = ear.prev;
     const next = ear.next;
@@ -9408,11 +9360,11 @@ function earcutLinked(earIn, triangles, dim, minX, minY, invSize, pass) {
       triangles.push(prev.i / dim | 0, ear.i / dim | 0, next.i / dim | 0);
       removeNode(ear);
       ear = next.next;
-      stop2 = next.next;
+      stop = next.next;
       continue;
     }
     ear = next;
-    if (ear === stop2) {
+    if (ear === stop) {
       if (pass === 0) {
         earcutLinked(filterPoints(ear, null), triangles, dim, minX, minY, invSize, 1);
       } else if (pass === 1) {
@@ -9575,7 +9527,7 @@ function findHoleBridge(hole, outerNode) {
   } while (p !== outerNode);
   if (!m)
     return null;
-  const stop2 = m;
+  const stop = m;
   const mx = m.x;
   const my = m.y;
   let tanMin = Infinity;
@@ -9590,7 +9542,7 @@ function findHoleBridge(hole, outerNode) {
       }
     }
     p = p.next;
-  } while (p !== stop2);
+  } while (p !== stop);
   return m;
 }
 function indexCurve(startIn, minX, minY, invSize) {
@@ -9876,7 +9828,7 @@ ${src}`);
 }
 var WebGLUnsupportedError;
 var init_GLContext = __esm(() => {
-  WebGLUnsupportedError = class WebGLUnsupportedError2 extends Error {
+  WebGLUnsupportedError = class WebGLUnsupportedError extends Error {
     constructor(message) {
       super(message ?? "WebGL2 is not supported in this environment.");
       this.name = "WebGLUnsupportedError";
@@ -10102,8 +10054,8 @@ class WebGLTileRenderer {
     gl.drawArrays(gl.TRIANGLES, 0, 6);
     this._disposeBuffer(buf);
   }
-  drawTerrain(positions2, indices, color, opacity, projectionMatrix) {
-    if (positions2.length === 0 || indices.length === 0)
+  drawTerrain(positions, indices, color, opacity, projectionMatrix) {
+    if (positions.length === 0 || indices.length === 0)
       return 0;
     const prog = this._fillExtrusion ?? (this._fillExtrusion = this._buildFillExtrusionProgram());
     const gl = this.ctx.gl;
@@ -10115,7 +10067,7 @@ class WebGLTileRenderer {
       gl.uniform4f(prog.u_color, color[0], color[1], color[2], color[3]);
     if (prog.u_opacity)
       gl.uniform1f(prog.u_opacity, opacity);
-    const vbo = this.ctx.createBuffer(positions2);
+    const vbo = this.ctx.createBuffer(positions);
     this._buffers.push(vbo);
     gl.bindBuffer(gl.ARRAY_BUFFER, vbo);
     const stride = 6 * 4;
@@ -10187,11 +10139,11 @@ class WebGLTileRenderer {
       const cx = centers[i * 2];
       const cy = centers[i * 2 + 1];
       for (let v = 0;v < 6; v++) {
-        const off2 = (i * 6 + v) * 4;
-        verts[off2] = cx;
-        verts[off2 + 1] = cy;
-        verts[off2 + 2] = quadCorners[v * 2];
-        verts[off2 + 3] = quadCorners[v * 2 + 1];
+        const off = (i * 6 + v) * 4;
+        verts[off] = cx;
+        verts[off + 1] = cy;
+        verts[off + 2] = quadCorners[v * 2];
+        verts[off + 3] = quadCorners[v * 2 + 1];
       }
     }
     const buf = this.ctx.createBuffer(verts);
@@ -10294,10 +10246,10 @@ function tessellateLine(linestrip) {
       ty += dy / len;
     }
     if (i < n - 1) {
-      const nx2 = linestrip[(i + 1) * 2];
-      const ny2 = linestrip[(i + 1) * 2 + 1];
-      const dx = nx2 - x;
-      const dy = ny2 - y;
+      const nx = linestrip[(i + 1) * 2];
+      const ny = linestrip[(i + 1) * 2 + 1];
+      const dx = nx - x;
+      const dy = ny - y;
       const len = Math.hypot(dx, dy) || 1;
       tx += dx / len;
       ty += dy / len;
@@ -10366,15 +10318,15 @@ class GlyphAtlas {
     this._shelfH = 0;
   }
   getOrAddGlyph(codePoint, style) {
-    const key2 = {
+    const key = {
       codePoint,
       italic: !!style?.italic,
       bold: !!style?.bold
     };
-    const existing = this._glyphs.get(cacheKey(key2));
+    const existing = this._glyphs.get(cacheKey(key));
     if (existing)
       return existing;
-    return this._rasterize(key2);
+    return this._rasterize(key);
   }
   measure(text, style) {
     let width = 0;
@@ -10528,11 +10480,11 @@ class GlyphAtlas {
     }
     return out;
   }
-  _rasterize(key2) {
+  _rasterize(key) {
     const ctx = this._ctx;
     if (!ctx) {
-      const metrics2 = {
-        codePoint: key2.codePoint,
+      const metrics = {
+        codePoint: key.codePoint,
         x: 0,
         y: 0,
         width: 0,
@@ -10541,12 +10493,12 @@ class GlyphAtlas {
         bearingX: 0,
         bearingY: 0
       };
-      this._glyphs.set(cacheKey(key2), metrics2);
-      return metrics2;
+      this._glyphs.set(cacheKey(key), metrics);
+      return metrics;
     }
-    const font = this._buildFontSpec(key2);
+    const font = this._buildFontSpec(key);
     ctx.font = font;
-    const ch = String.fromCodePoint(key2.codePoint);
+    const ch = String.fromCodePoint(key.codePoint);
     const m = ctx.measureText(ch);
     const advance = m.width && m.width > 0 ? m.width : this._fontSize * 0.6;
     const ascent = m.actualBoundingBoxAscent && m.actualBoundingBoxAscent > 0 ? m.actualBoundingBoxAscent : this._fontSize * 0.8;
@@ -10585,7 +10537,7 @@ class GlyphAtlas {
     if (bmpH > this._shelfH)
       this._shelfH = bmpH;
     const metrics = {
-      codePoint: key2.codePoint,
+      codePoint: key.codePoint,
       x: dx,
       y: dy,
       width: bmpW,
@@ -10594,14 +10546,14 @@ class GlyphAtlas {
       bearingX: -pad,
       bearingY: ascent + pad
     };
-    this._glyphs.set(cacheKey(key2), metrics);
+    this._glyphs.set(cacheKey(key), metrics);
     return metrics;
   }
-  _buildFontSpec(key2) {
+  _buildFontSpec(key) {
     const parts = [];
-    if (key2.italic)
+    if (key.italic)
       parts.push("italic");
-    if (key2.bold)
+    if (key.bold)
       parts.push("bold");
     parts.push(`${this._fontSize}px`);
     parts.push(this._fontFamily);
@@ -10695,7 +10647,7 @@ var init_Layer = __esm(() => {
   init_Util();
   init_Events();
   init_Map();
-  Layer = class Layer2 extends Evented {
+  Layer = class Layer extends Evented {
     getEvents() {
       return {};
     }
@@ -10869,7 +10821,7 @@ var init_GridLayer = __esm(() => {
   init_Bounds();
   init_Point();
   init_Layer();
-  GridLayer = class GridLayer2 extends Layer {
+  GridLayer = class GridLayer extends Layer {
     _onMove;
     initialize(options) {
       setOptions(this, options);
@@ -10964,16 +10916,16 @@ var init_GridLayer = __esm(() => {
       if (this._container && this.options.zIndex !== undefined && this.options.zIndex !== null)
         this._container.style.zIndex = this.options.zIndex;
     }
-    _setAutoZIndex(compare2) {
+    _setAutoZIndex(compare) {
       const layers = this.getPane().children;
-      let edgeZIndex = -compare2(-Infinity, Infinity);
+      let edgeZIndex = -compare(-Infinity, Infinity);
       for (const layer of Array.from(layers)) {
         const zIndex = layer.style.zIndex;
         if (layer !== this._container && zIndex)
-          edgeZIndex = compare2(edgeZIndex, +zIndex);
+          edgeZIndex = compare(edgeZIndex, +zIndex);
       }
       if (Number.isFinite(edgeZIndex)) {
-        this.options.zIndex = edgeZIndex + compare2(-1, 1);
+        this.options.zIndex = edgeZIndex + compare(-1, 1);
         this._updateZIndex();
       }
     }
@@ -11075,20 +11027,20 @@ var init_GridLayer = __esm(() => {
             this._retainChildren(coords.x, coords.y, coords.z, coords.z + 2);
         }
       }
-      for (const [key2, tile] of Object.entries(this._tiles)) {
+      for (const [key, tile] of Object.entries(this._tiles)) {
         if (!tile.retain)
-          this._removeTile(key2);
+          this._removeTile(key);
       }
     }
     _removeTilesAtZoom(zoom) {
-      for (const [key2, tile] of Object.entries(this._tiles)) {
+      for (const [key, tile] of Object.entries(this._tiles)) {
         if (tile.coords.z === zoom)
-          this._removeTile(key2);
+          this._removeTile(key);
       }
     }
     _removeAllTiles() {
-      for (const key2 of Object.keys(this._tiles))
-        this._removeTile(key2);
+      for (const key of Object.keys(this._tiles))
+        this._removeTile(key);
     }
     _invalidateAll() {
       for (const z of Object.keys(this._levels)) {
@@ -11105,8 +11057,8 @@ var init_GridLayer = __esm(() => {
       const z2 = z - 1;
       const coords2 = new Point(x2, y2);
       coords2.z = z2;
-      const key2 = this._tileCoordsToKey(coords2);
-      const tile = this._tiles[key2];
+      const key = this._tileCoordsToKey(coords2);
+      const tile = this._tiles[key];
       if (tile?.active) {
         tile.retain = true;
         return true;
@@ -11122,8 +11074,8 @@ var init_GridLayer = __esm(() => {
         for (let j = 2 * y;j < 2 * y + 2; j++) {
           const coords = new Point(i, j);
           coords.z = z + 1;
-          const key2 = this._tileCoordsToKey(coords);
-          const tile = this._tiles[key2];
+          const key = this._tileCoordsToKey(coords);
+          const tile = this._tiles[key];
           if (tile?.active) {
             tile.retain = true;
             continue;
@@ -11241,9 +11193,9 @@ var init_GridLayer = __esm(() => {
       });
       const pitch = map._pitch;
       const geometry = pitch ? map._cameraGeometry() : null;
-      const bearing2 = -map._bearing * Math.PI / 180;
-      const sinB = Math.sin(bearing2);
-      const cosB = Math.cos(bearing2);
+      const bearing = -map._bearing * Math.PI / 180;
+      const sinB = Math.sin(bearing);
+      const cosB = Math.cos(bearing);
       const sinT = Math.sin(pitch * Math.PI / 180);
       const magnification = (x, y) => {
         if (!geometry)
@@ -11262,11 +11214,11 @@ var init_GridLayer = __esm(() => {
         coords.z = z;
         if (!this._isValidTile(coords))
           return;
-        const k2 = map.getZoomScale(mapZoom, z);
-        const x0 = x * T * k2 - centerPx.x;
-        const y0 = y * T * k2 - centerPx.y;
-        const x1 = x0 + T * k2;
-        const y1 = y0 + T * k2;
+        const k = map.getZoomScale(mapZoom, z);
+        const x0 = x * T * k - centerPx.x;
+        const y0 = y * T * k - centerPx.y;
+        const x1 = x0 + T * k;
+        const y1 = y0 + T * k;
         if (!rectTouchesPolygon(x0, y0, x1, y1, poly))
           return;
         const s = Math.max(magnification(x0, y0), magnification(x1, y0), magnification(x0, y1), magnification(x1, y1));
@@ -11295,11 +11247,11 @@ var init_GridLayer = __esm(() => {
         for (let x = Math.floor((centerPx.x + minX) / k);x <= Math.floor((centerPx.x + maxX) / k); x++)
           visit(x, y, minZ);
       }
-      const distance2 = (c) => {
+      const distance = (c) => {
         const kk = map.getZoomScale(mapZoom, c.z) * T;
         return Math.hypot((c.x + 0.5) * kk - centerPx.x, (c.y + 0.5) * kk - centerPx.y);
       };
-      return out.sort((a, b) => b.z - a.z || distance2(a) - distance2(b));
+      return out.sort((a, b) => b.z - a.z || distance(a) - distance(b));
     }
     _onMoveEnd() {
       if (!this._map || this._map._animatingZoom)
@@ -11338,12 +11290,12 @@ var init_GridLayer = __esm(() => {
       if (this._tileZoom === undefined)
         return;
       const pixelBounds = this._getTiledPixelBounds(center);
-      const tileRange2 = this._pxBoundsToTileRange(pixelBounds);
-      const tileCenter = tileRange2.getCenter();
+      const tileRange = this._pxBoundsToTileRange(pixelBounds);
+      const tileCenter = tileRange.getCenter();
       const queue = [];
       const margin = this.options.keepBuffer;
-      const noPruneRange = new Bounds(tileRange2.getBottomLeft().subtract([margin, -margin]), tileRange2.getTopRight().add([margin, -margin]));
-      if (!(Number.isFinite(tileRange2.min.x) && Number.isFinite(tileRange2.min.y) && Number.isFinite(tileRange2.max.x) && Number.isFinite(tileRange2.max.y))) {
+      const noPruneRange = new Bounds(tileRange.getBottomLeft().subtract([margin, -margin]), tileRange.getTopRight().add([margin, -margin]));
+      if (!(Number.isFinite(tileRange.min.x) && Number.isFinite(tileRange.min.y) && Number.isFinite(tileRange.max.x) && Number.isFinite(tileRange.max.y))) {
         throw new Error("Attempted to load an infinite number of tiles");
       }
       for (const tile of Object.values(this._tiles)) {
@@ -11359,8 +11311,8 @@ var init_GridLayer = __esm(() => {
         this._updateCovering(center);
         return;
       }
-      for (let j = tileRange2.min.y;j <= tileRange2.max.y; j++) {
-        for (let i = tileRange2.min.x;i <= tileRange2.max.x; i++) {
+      for (let j = tileRange.min.y;j <= tileRange.max.y; j++) {
+        for (let i = tileRange.min.x;i <= tileRange.max.x; i++) {
           const coords = new Point(i, j);
           coords.z = this._tileZoom;
           if (!this._isValidTile(coords))
@@ -11427,8 +11379,8 @@ var init_GridLayer = __esm(() => {
       const tileBounds = this._tileCoordsToBounds(coords);
       return new LatLngBounds(this.options.bounds).overlaps(tileBounds);
     }
-    _keyToBounds(key2) {
-      return this._tileCoordsToBounds(this._keyToTileCoords(key2));
+    _keyToBounds(key) {
+      return this._tileCoordsToBounds(this._keyToTileCoords(key));
     }
     _tileCoordsToNwSe(coords) {
       const map = this._map;
@@ -11449,19 +11401,19 @@ var init_GridLayer = __esm(() => {
     _tileCoordsToKey(coords) {
       return `${coords.x}:${coords.y}:${coords.z}`;
     }
-    _keyToTileCoords(key2) {
-      const k = key2.split(":");
+    _keyToTileCoords(key) {
+      const k = key.split(":");
       const coords = new Point(+k[0], +k[1]);
       coords.z = +k[2];
       return coords;
     }
-    _removeTile(key2) {
-      const tile = this._tiles[key2];
+    _removeTile(key) {
+      const tile = this._tiles[key];
       if (!tile)
         return;
       tile.el.remove();
-      delete this._tiles[key2];
-      this.fire("tileunload", { tile: tile.el, coords: this._keyToTileCoords(key2) });
+      delete this._tiles[key];
+      this.fire("tileunload", { tile: tile.el, coords: this._keyToTileCoords(key) });
     }
     _initTile(tile) {
       tile.classList.add("tsmap-tile");
@@ -11473,21 +11425,21 @@ var init_GridLayer = __esm(() => {
     }
     _addTile(coords, container) {
       const tilePos = this._getTilePos(coords);
-      const key2 = this._tileCoordsToKey(coords);
+      const key = this._tileCoordsToKey(coords);
       const tile = this.createTile(this._wrapCoords(coords), this._tileReady.bind(this, coords));
       this._initTile(tile);
       if (this.createTile.length < 2)
         requestAnimationFrame(this._tileReady.bind(this, coords, null, tile));
       setPosition(tile, tilePos);
-      this._tiles[key2] = { el: tile, coords, current: true };
+      this._tiles[key] = { el: tile, coords, current: true };
       container.appendChild(tile);
       this.fire("tileloadstart", { tile, coords });
     }
     _tileReady(coords, err, tile) {
       if (err)
         this.fire("tileerror", { error: err, tile, coords });
-      const key2 = this._tileCoordsToKey(coords);
-      const entry = this._tiles[key2];
+      const key = this._tileCoordsToKey(coords);
+      const entry = this._tiles[key];
       if (!entry)
         return;
       entry.loaded = Date.now();
@@ -11558,7 +11510,7 @@ var init_TileLayer = __esm(() => {
   init_OfflineMaps();
   init_storage();
   init_GridLayer();
-  TileLayer = class TileLayer2 extends GridLayer {
+  TileLayer = class TileLayer extends GridLayer {
     initialize(url, options) {
       super.initialize(options);
       this._url = url;
@@ -11712,8 +11664,8 @@ var init_TileLayer = __esm(() => {
         }
       }
     }
-    _removeTile(key2) {
-      const tile = this._tiles[key2];
+    _removeTile(key) {
+      const tile = this._tiles[key];
       if (!tile)
         return;
       const el = tile.el;
@@ -11725,7 +11677,7 @@ var init_TileLayer = __esm(() => {
         this._activeBlobUrls.delete(src);
       }
       el.setAttribute("src", "");
-      super._removeTile(key2);
+      super._removeTile(key);
     }
     _tileReady(coords, err, tile) {
       if (!this._map || tile && tile.getAttribute("src") === "")
@@ -11773,9 +11725,9 @@ class FlatTileFeature {
     const start = layer.tagStart[this._index];
     const end = layer.tagStart[this._index + 1];
     for (let i = start;i + 1 < end; i += 2) {
-      const key2 = layer.keys[layer.tags[i]];
-      if (key2 !== undefined)
-        out[key2] = layer.values[layer.tags[i + 1]];
+      const key = layer.keys[layer.tags[i]];
+      if (key !== undefined)
+        out[key] = layer.values[layer.tags[i + 1]];
     }
     this._properties = out;
     return out;
@@ -11890,33 +11842,33 @@ function decodeMvtFlat(bytes) {
     value |= (byte & 15) << 28;
     high = (byte & 112) >> 4;
     if (byte < 128)
-      return toNum2(value, high, isSigned === true);
+      return toNum(value, high, isSigned === true);
     const shifts = [3, 10, 17, 24];
     for (const shift of shifts) {
       byte = buf[pos++];
       high |= (byte & 127) << shift;
       if (byte < 128)
-        return toNum2(value, high, isSigned === true);
+        return toNum(value, high, isSigned === true);
     }
     byte = buf[pos++];
     high |= (byte & 1) << 31;
     if (byte < 128)
-      return toNum2(value, high, isSigned === true);
+      return toNum(value, high, isSigned === true);
     throw new Error("Expected varint not more than 10 bytes");
   }
-  function toNum2(low, high, isSigned) {
-    const SHIFT_LEFT_322 = (1 << 16) * (1 << 16);
+  function toNum(low, high, isSigned) {
+    const SHIFT_LEFT_32 = (1 << 16) * (1 << 16);
     if (isSigned && (high & 2147483648) !== 0) {
       const negLow = ~low + 1 >>> 0;
       let negHigh = ~high >>> 0;
       if (negLow === 0)
         negHigh = negHigh + 1 >>> 0;
-      const mag = negHigh * SHIFT_LEFT_322 + negLow;
+      const mag = negHigh * SHIFT_LEFT_32 + negLow;
       if (mag > Number.MAX_SAFE_INTEGER)
         throw new Error("Varint exceeds safe integer range");
       return -mag;
     }
-    const val = (high >>> 0) * SHIFT_LEFT_322 + (low >>> 0);
+    const val = (high >>> 0) * SHIFT_LEFT_32 + (low >>> 0);
     if (val > Number.MAX_SAFE_INTEGER)
       throw new Error("Varint exceeds safe integer range");
     return val;
@@ -11962,9 +11914,9 @@ function decodeMvtFlat(bytes) {
     const end = readVarint() + pos;
     let value = null;
     while (pos < end) {
-      const key2 = readVarint();
-      const tag = key2 >> 3;
-      const wire = key2 & 7;
+      const key = readVarint();
+      const tag = key >> 3;
+      const wire = key & 7;
       if (tag === 1) {
         value = readString(readVarint() + pos);
       } else if (tag === 2) {
@@ -11988,9 +11940,9 @@ function decodeMvtFlat(bytes) {
   }
   const layers = [];
   while (pos < len) {
-    const key2 = readVarint();
-    const tag = key2 >> 3;
-    const wire = key2 & 7;
+    const key = readVarint();
+    const tag = key >> 3;
+    const wire = key & 7;
     if (tag !== 3) {
       skip(wire);
       continue;
@@ -12629,14 +12581,14 @@ class RTree {
       let minArea = bboxArea(target.bbox);
       for (let i = 1;i < children.length; i++) {
         const c = children[i];
-        const area2 = bboxArea(c.bbox);
-        const enlargement = enlargedArea(c.bbox, record.bbox) - area2;
+        const area = bboxArea(c.bbox);
+        const enlargement = enlargedArea(c.bbox, record.bbox) - area;
         if (enlargement < minEnlargement) {
           minEnlargement = enlargement;
-          minArea = area2;
+          minArea = area;
           target = c;
-        } else if (enlargement === minEnlargement && area2 < minArea) {
-          minArea = area2;
+        } else if (enlargement === minEnlargement && area < minArea) {
+          minArea = area;
           target = c;
         }
       }
@@ -12667,11 +12619,11 @@ class RTree {
       let minArea = bboxArea(target.bbox);
       for (let i = 1;i < children.length; i++) {
         const c = children[i];
-        const area2 = bboxArea(c.bbox);
-        const enlargement = enlargedArea(c.bbox, sub.bbox) - area2;
+        const area = bboxArea(c.bbox);
+        const enlargement = enlargedArea(c.bbox, sub.bbox) - area;
         if (enlargement < minEnlargement) {
           minEnlargement = enlargement;
-          minArea = area2;
+          minArea = area;
           target = c;
         }
       }
@@ -12758,13 +12710,13 @@ class RTree {
       for (let k = i;k < total; k++)
         extend(rightBBox, children[k].bbox);
       const overlap = intersectionArea(leftBBox, rightBBox);
-      const area2 = bboxArea(leftBBox) + bboxArea(rightBBox);
+      const area = bboxArea(leftBBox) + bboxArea(rightBBox);
       if (overlap < minOverlap) {
         minOverlap = overlap;
-        minArea = area2;
+        minArea = area;
         index = i;
-      } else if (overlap === minOverlap && area2 < minArea) {
-        minArea = area2;
+      } else if (overlap === minOverlap && area < minArea) {
+        minArea = area;
         index = i;
       }
     }
@@ -12831,9 +12783,9 @@ function compareCentroidX(a, b) {
 function compareCentroidY(a, b) {
   return a.bbox[1] + a.bbox[3] - (b.bbox[1] + b.bbox[3]);
 }
-function multiSelectSort(arr, left, right, step, compare2) {
+function multiSelectSort(arr, left, right, step, compare) {
   const slice = arr.slice(left, right + 1);
-  slice.sort(compare2);
+  slice.sort(compare);
   for (let i = 0;i < slice.length; i++)
     arr[left + i] = slice[i];
 }
@@ -12893,15 +12845,15 @@ class CollisionIndex {
     const cells = this._ownerCells.get(owner);
     if (!cells)
       return;
-    for (const key2 of cells) {
-      const bucket = this._cells.get(key2);
+    for (const key of cells) {
+      const bucket = this._cells.get(key);
       if (!bucket)
         continue;
       const kept = bucket.filter((box) => box.owner !== owner);
       if (kept.length)
-        this._cells.set(key2, kept);
+        this._cells.set(key, kept);
       else
-        this._cells.delete(key2);
+        this._cells.delete(key);
     }
     this._ownerCells.delete(owner);
   }
@@ -12937,13 +12889,13 @@ class CollisionIndex {
     }
     for (let cy = range.y0;cy <= range.y1; cy++) {
       for (let cx = range.x0;cx <= range.x1; cx++) {
-        const key2 = cellKey(cx, cy);
-        const bucket = this._cells.get(key2);
+        const key = cellKey(cx, cy);
+        const bucket = this._cells.get(key);
         if (bucket)
           bucket.push(box);
         else
-          this._cells.set(key2, [box]);
-        ownerCells?.add(key2);
+          this._cells.set(key, [box]);
+        ownerCells?.add(key);
       }
     }
   }
@@ -13004,22 +12956,22 @@ function drawSections(ctx, atlas, sections, x, y, base) {
 }
 function renderSdfPixels(field, width, height, options) {
   const out = new Uint8ClampedArray(width * height * 4);
-  const fill2 = parseColor2(options.color);
+  const fill = parseColor2(options.color);
   const haloWidth = options.haloWidth ?? 0;
   const halo = options.haloColor && haloWidth > 0 ? parseColor2(options.haloColor) : null;
   const haloEdge = halo ? Math.max(0.02, 0.5 - haloWidth / 16) : 0;
   const band = 0.06;
   for (let i = 0;i < width * height; i++) {
-    const distance2 = field[i * 4 + 3] / 255;
-    const inside = smoothstep(0.5 - band, 0.5 + band, distance2);
-    const outline = halo ? smoothstep(haloEdge - band, haloEdge + band, distance2) : 0;
+    const distance = field[i * 4 + 3] / 255;
+    const inside = smoothstep(0.5 - band, 0.5 + band, distance);
+    const outline = halo ? smoothstep(haloEdge - band, haloEdge + band, distance) : 0;
     const alpha = inside + outline * (1 - inside);
     if (alpha <= 0)
       continue;
     const weight = outline * (1 - inside);
-    out[i * 4] = halo ? (fill2[0] * inside + halo[0] * weight) / alpha : fill2[0];
-    out[i * 4 + 1] = halo ? (fill2[1] * inside + halo[1] * weight) / alpha : fill2[1];
-    out[i * 4 + 2] = halo ? (fill2[2] * inside + halo[2] * weight) / alpha : fill2[2];
+    out[i * 4] = halo ? (fill[0] * inside + halo[0] * weight) / alpha : fill[0];
+    out[i * 4 + 1] = halo ? (fill[1] * inside + halo[1] * weight) / alpha : fill[1];
+    out[i * 4 + 2] = halo ? (fill[2] * inside + halo[2] * weight) / alpha : fill[2];
     out[i * 4 + 3] = Math.round(alpha * 255);
   }
   return out;
@@ -13060,10 +13012,10 @@ function parseColor2(color) {
 function probeColor(color) {
   if (typeof document === "undefined")
     return [0, 0, 0];
-  const probe2 = document.createElement("canvas");
-  probe2.width = 1;
-  probe2.height = 1;
-  const ctx = probe2.getContext("2d");
+  const probe = document.createElement("canvas");
+  probe.width = 1;
+  probe.height = 1;
+  const ctx = probe.getContext("2d");
   if (!ctx)
     return [0, 0, 0];
   ctx.fillStyle = color;
@@ -13153,13 +13105,13 @@ class GlyphBitmapCache {
     this._limit = limit;
   }
   get(glyph, options) {
-    const key2 = `${glyph.id}|${options.color}|${options.haloColor ?? ""}|${options.haloWidth ?? 0}`;
-    if (this._entries.has(key2))
-      return this._entries.get(key2) ?? null;
+    const key = `${glyph.id}|${options.color}|${options.haloColor ?? ""}|${options.haloWidth ?? 0}`;
+    if (this._entries.has(key))
+      return this._entries.get(key) ?? null;
     const bitmap = renderGlyphBitmap(glyph, options);
     if (this._entries.size >= this._limit)
       this._entries.clear();
-    this._entries.set(key2, bitmap);
+    this._entries.set(key, bitmap);
     return bitmap;
   }
   clear() {
@@ -13376,8 +13328,8 @@ class IconAtlas {
     const color = opts?.color ?? "#000000";
     const haloColor = opts?.haloColor;
     const haloWidth = opts?.haloWidth ?? 0;
-    const key2 = `${entry.id}|${color}|${haloColor ?? ""}|${haloWidth}`;
-    const cached = this._sdfCache.get(key2);
+    const key = `${entry.id}|${color}|${haloColor ?? ""}|${haloWidth}`;
+    const cached = this._sdfCache.get(key);
     if (cached)
       return cached;
     const w = entry.width;
@@ -13400,7 +13352,7 @@ class IconAtlas {
     octx.putImageData(pixels, 0, 0);
     if (this._sdfCache.size > 128)
       this._sdfCache.clear();
-    this._sdfCache.set(key2, out);
+    this._sdfCache.set(key, out);
     return out;
   }
   _grow(newSide) {
@@ -13503,8 +13455,8 @@ function lineLength(line) {
   }
   return total;
 }
-function pointAtDistance(line, distance2) {
-  if (line.length < 2 || distance2 < 0)
+function pointAtDistance(line, distance) {
+  if (line.length < 2 || distance < 0)
     return null;
   let travelled = 0;
   for (let i = 1;i < line.length; i++) {
@@ -13515,8 +13467,8 @@ function pointAtDistance(line, distance2) {
     const segment = Math.hypot(dx, dy);
     if (segment === 0)
       continue;
-    if (travelled + segment >= distance2) {
-      const t = (distance2 - travelled) / segment;
+    if (travelled + segment >= distance) {
+      const t = (distance - travelled) / segment;
       return { x: a.x + dx * t, y: a.y + dy * t, angle: Math.atan2(dy, dx) };
     }
     travelled += segment;
@@ -13609,10 +13561,10 @@ class LabelPlacer {
     for (const seen of this._lastSeen.get(label.identity) ?? []) {
       const dx = seen.x - x;
       const dy = seen.y - y;
-      const distance2 = dx * dx + dy * dy;
-      if (distance2 <= bestDistance) {
+      const distance = dx * dx + dy * dy;
+      if (distance <= bestDistance) {
         best = seen.state;
-        bestDistance = distance2;
+        bestDistance = distance;
       }
     }
     if (best)
@@ -13721,9 +13673,9 @@ class LabelPlacer {
       if (state.opacity > 0)
         shown.push(item);
     }
-    for (const key2 of this._states.keys()) {
-      if (!seen.has(key2))
-        this._states.delete(key2);
+    for (const key of this._states.keys()) {
+      if (!seen.has(key))
+        this._states.delete(key);
     }
     this._lastSeen = points;
     for (let i = shown.length - 1;i >= 0; i--) {
@@ -13761,25 +13713,25 @@ class LabelPlacer {
       ctx.drawImage(sprite.canvas, -sprite.ox, -sprite.oy);
     }
   }
-  _sprite(key2, build) {
-    const cached = this._sprites.get(key2);
+  _sprite(key, build) {
+    const cached = this._sprites.get(key);
     if (cached !== undefined) {
-      this._sprites.delete(key2);
-      this._sprites.set(key2, cached);
+      this._sprites.delete(key);
+      this._sprites.set(key, cached);
       return cached;
     }
     const sprite = build();
-    this._sprites.set(key2, sprite);
+    this._sprites.set(key, sprite);
     return sprite;
   }
   _trimSprites() {
     if (this._sprites.size <= SPRITE_CACHE_LIMIT)
       return;
     let excess = this._sprites.size - SPRITE_CACHE_LIMIT * 0.75;
-    for (const key2 of this._sprites.keys()) {
+    for (const key of this._sprites.keys()) {
       if (excess-- <= 0)
         break;
-      this._sprites.delete(key2);
+      this._sprites.delete(key);
     }
   }
 }
@@ -14101,13 +14053,13 @@ function buildBuildingMesh(buildings, tileSize) {
     for (const ring of building.rings) {
       if (ring.length < 3)
         continue;
-      const area2 = ringArea(ring);
-      if (area2 === 0)
+      const area = ringArea(ring);
+      if (area === 0)
         continue;
-      const sign2 = Math.sign(area2);
+      const sign = Math.sign(area);
       if (outerSign === 0)
-        outerSign = sign2;
-      if (sign2 === outerSign || polygons.length === 0)
+        outerSign = sign;
+      if (sign === outerSign || polygons.length === 0)
         polygons.push([ring]);
       else
         polygons[polygons.length - 1].push(ring);
@@ -14383,11 +14335,11 @@ class BuildingOverlay {
     this.buffers.set(draw.key, { buffer, mesh: draw.mesh });
     return buffer;
   }
-  release(key2) {
-    const cached = this.buffers.get(key2);
+  release(key) {
+    const cached = this.buffers.get(key);
     if (cached && this.gl)
       this.gl.deleteBuffer(cached.buffer);
-    this.buffers.delete(key2);
+    this.buffers.delete(key);
   }
   remove() {
     const ext = this.gl?.getExtension?.("WEBGL_lose_context");
@@ -14517,16 +14469,16 @@ class OccluderIndex {
       return false;
     const length = Math.hypot(ex - ax, ey - ay);
     const steps = Math.max(1, Math.ceil(length / (CELL / 2)));
-    const stamp2 = ++this.query;
+    const stamp = ++this.query;
     for (let s = 0;s <= steps; s++) {
       const x = ax + (ex - ax) * s / steps;
       const y = ay + (ey - ay) * s / steps;
       if (x < lo || x > hi || y < lo || y > hi)
         continue;
       for (const i of this.cells[this._cell(y) * this.cols + this._cell(x)]) {
-        if (this.stamps[i] === stamp2)
+        if (this.stamps[i] === stamp)
           continue;
-        this.stamps[i] = stamp2;
+        this.stamps[i] = stamp;
         const b = this.buildings[i];
         if (Math.max(ax, ex) < b.minX || Math.min(ax, ex) > b.maxX || Math.max(ay, ey) < b.minY || Math.min(ay, ey) > b.maxY)
           continue;
@@ -14635,12 +14587,12 @@ class GlyphProvider {
     this.cache = new GlyphBitmapCache;
   }
   needsServer(fontStack) {
-    const key2 = stackKey(fontStack);
-    const cached = this._availability.get(key2);
+    const key = stackKey(fontStack);
+    const cached = this._availability.get(key);
     if (cached !== undefined)
       return !cached;
     const available = this._available(fontStack);
-    this._availability.set(key2, available);
+    this._availability.set(key, available);
     return !available;
   }
   glyphs(fontStack, text) {
@@ -14661,10 +14613,10 @@ class GlyphProvider {
       if (codePoint === undefined)
         continue;
       const start = rangeStartFor(codePoint);
-      const key2 = `${stack}/${start}`;
-      if (this._requested.has(key2))
+      const key = `${stack}/${start}`;
+      if (this._requested.has(key))
         continue;
-      this._requested.add(key2);
+      this._requested.add(key);
       this._source.load(stack, codePoint).then(() => this._onLoad()).catch(() => {});
     }
   }
@@ -14869,12 +14821,12 @@ function wrapText(text, maxWidth, measure) {
   const words = text.split(/\s+/).filter(Boolean);
   if (words.length < 2 || maxWidth <= 0 || measure(text) <= maxWidth)
     return [text];
-  const greedy = (limit2) => {
+  const greedy = (limit) => {
     const lines = [];
     let line = "";
     for (const word of words) {
       const next = line ? `${line} ${word}` : word;
-      if (line && measure(next) > limit2) {
+      if (line && measure(next) > limit) {
         lines.push(line);
         line = word;
       } else {
@@ -14902,34 +14854,34 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
     return;
   const layout = styleLayer.layout;
   const paint = styleLayer.paint;
-  const resolve2 = (value) => resolveLayoutExpression(value, zoom, feature, featureState);
-  const rawText = resolve2(layout?.["text-field"]);
+  const resolve = (value) => resolveLayoutExpression(value, zoom, feature, featureState);
+  const rawText = resolve(layout?.["text-field"]);
   const formatted = isFormatted(rawText) && !isUniform(rawText.sections) ? rawText : null;
-  const textTransform = resolve2(layout?.["text-transform"]);
+  const textTransform = resolve(layout?.["text-transform"]);
   const text = formatted ? formatted.toString() : transformText(coerceString(isFormatted(rawText) ? rawText.toString() : rawText), textTransform);
-  const textSize = resolve2(layout?.["text-size"]) ?? 16;
+  const textSize = resolve(layout?.["text-size"]) ?? 16;
   const font = glyphAtlas.resolveFont(layout?.["text-font"]);
-  const italic = font.italic || !!resolve2(layout?.["text-italic"]);
-  const bold = font.bold || !!resolve2(layout?.["text-bold"]);
-  const textColor = resolve2(paint?.["text-color"]) ?? "#000";
-  const haloColor = resolve2(paint?.["text-halo-color"]);
-  const haloWidth = resolve2(paint?.["text-halo-width"]);
-  const textOpacity = resolve2(paint?.["text-opacity"]);
-  const iconId = coerceString(resolve2(layout?.["icon-image"]));
-  const iconSize = resolve2(layout?.["icon-size"]);
-  const iconRotate = resolve2(layout?.["icon-rotate"]);
+  const italic = font.italic || !!resolve(layout?.["text-italic"]);
+  const bold = font.bold || !!resolve(layout?.["text-bold"]);
+  const textColor = resolve(paint?.["text-color"]) ?? "#000";
+  const haloColor = resolve(paint?.["text-halo-color"]);
+  const haloWidth = resolve(paint?.["text-halo-width"]);
+  const textOpacity = resolve(paint?.["text-opacity"]);
+  const iconId = coerceString(resolve(layout?.["icon-image"]));
+  const iconSize = resolve(layout?.["icon-size"]);
+  const iconRotate = resolve(layout?.["icon-rotate"]);
   const iconEntry = iconId && iconAtlas ? builtinIcon(iconAtlas, iconId) : undefined;
-  const iconOpacity = resolve2(paint?.["icon-opacity"]);
-  const iconColor = iconEntry?.sdf ? resolve2(paint?.["icon-color"]) ?? "#000000" : undefined;
-  const iconHaloColor = iconEntry?.sdf ? resolve2(paint?.["icon-halo-color"]) : undefined;
-  const iconHaloWidth = iconEntry?.sdf ? resolve2(paint?.["icon-halo-width"]) : undefined;
-  const sortKeyValue = resolve2(layout?.["symbol-sort-key"]);
+  const iconOpacity = resolve(paint?.["icon-opacity"]);
+  const iconColor = iconEntry?.sdf ? resolve(paint?.["icon-color"]) ?? "#000000" : undefined;
+  const iconHaloColor = iconEntry?.sdf ? resolve(paint?.["icon-halo-color"]) : undefined;
+  const iconHaloWidth = iconEntry?.sdf ? resolve(paint?.["icon-halo-width"]) : undefined;
+  const sortKeyValue = resolve(layout?.["symbol-sort-key"]);
   const legacyPriority = layout?.["symbol-priority"];
   const sortKey = typeof sortKeyValue === "number" ? sortKeyValue : typeof legacyPriority === "number" ? -legacyPriority : 0;
-  const allowOverlap = !!(resolve2(layout?.["text-allow-overlap"]) ?? resolve2(layout?.["icon-allow-overlap"]));
-  const ignorePlacement = !!(resolve2(layout?.["text-ignore-placement"]) ?? resolve2(layout?.["icon-ignore-placement"]));
-  const padding = resolve2(layout?.["text-padding"]) ?? 2;
-  const letterSpacing = (resolve2(layout?.["text-letter-spacing"]) ?? 0) * textSize;
+  const allowOverlap = !!(resolve(layout?.["text-allow-overlap"]) ?? resolve(layout?.["icon-allow-overlap"]));
+  const ignorePlacement = !!(resolve(layout?.["text-ignore-placement"]) ?? resolve(layout?.["icon-ignore-placement"]));
+  const padding = resolve(layout?.["text-padding"]) ?? 2;
+  const letterSpacing = (resolve(layout?.["text-letter-spacing"]) ?? 0) * textSize;
   const textStyle = { italic, bold, family: font.family, letterSpacing };
   const drawOptions = { color: textColor, haloColor, haloWidth, size: textSize, italic, bold, family: font.family, letterSpacing };
   const bleed = Math.ceil((haloWidth ?? 0) + 2);
@@ -14953,10 +14905,10 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
     if (labelWidth <= 0)
       return;
     const height = glyphAtlas.measureText(text, textSize, textStyle).height;
-    const spacing = resolve2(layout?.["symbol-spacing"]) ?? 250;
-    const maxAngle = resolve2(layout?.["text-max-angle"]) ?? 45;
+    const spacing = resolve(layout?.["symbol-spacing"]) ?? 250;
+    const maxAngle = resolve(layout?.["text-max-angle"]) ?? 45;
     const centreOnly = layout?.["symbol-placement"] === "line-center";
-    const signature2 = `${styleLayer.id}\x00${textSize}\x00${font.family ?? ""}\x00${italic}${bold}\x00${textColor}\x00${haloColor ?? ""}\x00${haloWidth ?? 0}\x00${letterSpacing}\x00${alpha}`;
+    const signature = `${styleLayer.id}\x00${textSize}\x00${font.family ?? ""}\x00${italic}${bold}\x00${textColor}\x00${haloColor ?? ""}\x00${haloWidth ?? 0}\x00${letterSpacing}\x00${alpha}`;
     for (const ring of rings) {
       if (ring.length < 2)
         continue;
@@ -14964,8 +14916,8 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
       const length = lineLength(line);
       const starts = centreOnly ? length >= labelWidth ? [(length - labelWidth) / 2] : [] : repeatDistances(length, labelWidth, spacing);
       for (const start of starts) {
-        const anchor2 = start + labelWidth / 2;
-        const at = pointAtDistance(line, anchor2);
+        const anchor = start + labelWidth / 2;
+        const at = pointAtDistance(line, anchor);
         if (!at)
           continue;
         out.push({
@@ -14974,7 +14926,7 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
           key: `${styleLayer.id}\x00${text}\x00${context.spot(at.x, at.y, 18)}`,
           order: context.next(),
           line,
-          anchor: anchor2,
+          anchor,
           text,
           repeatDistance: Math.max(labelWidth * 1.5, spacing * 0.75),
           chars: advances.map((a) => a.char),
@@ -14982,7 +14934,7 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
           width: labelWidth,
           height,
           maxAngle,
-          signature: signature2,
+          signature,
           paintGlyph: (ctx, char) => {
             ctx.globalAlpha = alpha;
             glyphAtlas.drawText(ctx, char, 0, height * 0.35, drawOptions);
@@ -14994,15 +14946,15 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
   }
   if (feature.type !== 1)
     return;
-  const anchor = resolve2(layout?.["text-anchor"]) ?? "center";
-  const offset = offsetPixels(resolve2(layout?.["text-offset"]), textSize);
-  const rotateDeg = resolve2(layout?.["text-rotate"]) ?? 0;
-  const rotate2 = rotateDeg * Math.PI / 180;
+  const anchor = resolve(layout?.["text-anchor"]) ?? "center";
+  const offset = offsetPixels(resolve(layout?.["text-offset"]), textSize);
+  const rotateDeg = resolve(layout?.["text-rotate"]) ?? 0;
+  const rotate = rotateDeg * Math.PI / 180;
   const needsServer = !!text && !formatted && !!glyphProvider?.needsServer(layout?.["text-font"]);
   const serverGlyphs = needsServer ? glyphProvider.glyphs(layout?.["text-font"], text) : null;
   if (needsServer && serverGlyphs === null)
     return;
-  const maxWidthEm = resolve2(layout?.["text-max-width"]) ?? 10;
+  const maxWidthEm = resolve(layout?.["text-max-width"]) ?? 10;
   const lines = text && !formatted && !serverGlyphs ? wrapText(text, maxWidthEm * textSize, (s) => glyphAtlas.measureText(s, textSize, textStyle).width) : [text];
   let textWidth = 0;
   let textHeight = 0;
@@ -15036,7 +14988,7 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
   const textY = shift.y + offset.y;
   let box = { minX: 0, minY: 0, maxX: 0, maxY: 0 };
   if (text && textWidth > 0) {
-    const bounds = rotate2 === 0 ? { minX: textX, minY: textY, maxX: textX + textWidth, maxY: textY + textHeight } : rotatedBounds(textX, textY, textWidth, textHeight, rotate2, 0, 0);
+    const bounds = rotate === 0 ? { minX: textX, minY: textY, maxX: textX + textWidth, maxY: textY + textHeight } : rotatedBounds(textX, textY, textWidth, textHeight, rotate, 0, 0);
     box = { ...bounds };
   }
   if (iconEntry) {
@@ -15063,8 +15015,8 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
       return;
     ctx.save();
     ctx.globalAlpha = alpha;
-    if (rotate2 !== 0)
-      ctx.rotate(rotate2);
+    if (rotate !== 0)
+      ctx.rotate(rotate);
     const baselineY = textY + ascent;
     if (serverGlyphs)
       drawGlyphs(ctx, serverGlyphs, textX, baselineY, drawOptions, glyphProvider?.cache);
@@ -15080,19 +15032,19 @@ function buildSymbolCandidates(out, rings, styleLayer, feature, zoom, featureSta
   for (const ring of rings) {
     for (const pt of ring) {
       const at = context.toTile(pt.x, pt.y);
-      const key2 = `${identity}\x00${context.spot(at.x, at.y, 21)}`;
+      const key = `${identity}\x00${context.spot(at.x, at.y, 21)}`;
       out.push({
         ...base,
         kind: "point",
         identity,
         occludable: !!iconEntry,
-        key: key2,
+        key,
         order: context.next(),
         x: at.x,
         y: at.y,
         box,
         paint: paintLabel,
-        signature: signature || key2
+        signature: signature || key
       });
     }
   }
@@ -15155,12 +15107,12 @@ function evaluateFilterLegacy(filter, feature) {
   if (op === "none")
     return rest.every((child) => !evaluateFilterLegacy(child, feature));
   if (op === "has") {
-    const key2 = rest[0];
-    return typeof key2 === "string" && key2 in feature.properties;
+    const key = rest[0];
+    return typeof key === "string" && key in feature.properties;
   }
   if (op === "!has") {
-    const key2 = rest[0];
-    return typeof key2 === "string" && !(key2 in feature.properties);
+    const key = rest[0];
+    return typeof key === "string" && !(key in feature.properties);
   }
   const left = resolveLegacyKey(rest[0], feature);
   if (op === "==" || op === "!=") {
@@ -15353,8 +15305,8 @@ function pointInPolygon2(p, rings) {
       const yi = ring[i].y;
       const xj = ring[j].x;
       const yj = ring[j].y;
-      const intersects2 = yi > p.y !== yj > p.y && p.x < (xj - xi) * (p.y - yi) / (yj - yi || 1) + xi;
-      if (intersects2)
+      const intersects = yi > p.y !== yj > p.y && p.x < (xj - xi) * (p.y - yi) / (yj - yi || 1) + xi;
+      if (intersects)
         inside = !inside;
     }
   }
@@ -15524,7 +15476,7 @@ var init_VectorTileMapLayer = __esm(() => {
   init_WebGLTileRenderer();
   init_GridLayer();
   init_urlTemplate();
-  VectorTileMapLayer = class VectorTileMapLayer2 extends GridLayer {
+  VectorTileMapLayer = class VectorTileMapLayer extends GridLayer {
     initialize(options) {
       super.initialize(options);
       this._styleLayers = this.options.layers ?? [];
@@ -15561,12 +15513,12 @@ var init_VectorTileMapLayer = __esm(() => {
       return archive.loading;
     }
     async _loadArchiveTileJSON() {
-      const key2 = pmtilesSourceUrl(this.options.url);
+      const key = pmtilesSourceUrl(this.options.url);
       const maps = await activeOfflineMaps();
       const offline = async () => {
-        const hit = (maps?.enabled ? await maps.lookup(key2).catch(() => {
+        const hit = (maps?.enabled ? await maps.lookup(key).catch(() => {
           return;
-        }) : undefined) ?? await this._offlineCache?.get(key2).catch(() => {
+        }) : undefined) ?? await this._offlineCache?.get(key).catch(() => {
           return;
         });
         return hit?.data.byteLength ? JSON.parse(new TextDecoder().decode(hit.data)) : undefined;
@@ -15574,12 +15526,12 @@ var init_VectorTileMapLayer = __esm(() => {
       if (maps?.enabled && maps.onlyOffline) {
         const stored = await offline();
         if (!stored)
-          throw new Error(`Only using offline maps, and ${key2} is not downloaded`);
+          throw new Error(`Only using offline maps, and ${key} is not downloaded`);
         return stored;
       }
       try {
-        const tilejson = await pmtilesTileJSON(key2);
-        this._offlineCache?.put(key2, new TextEncoder().encode(JSON.stringify(tilejson)), "application/json").catch(() => {});
+        const tilejson = await pmtilesTileJSON(key);
+        this._offlineCache?.put(key, new TextEncoder().encode(JSON.stringify(tilejson)), "application/json").catch(() => {});
         return tilejson;
       } catch (error) {
         const stored = await offline();
@@ -15764,10 +15716,10 @@ var init_VectorTileMapLayer = __esm(() => {
               continue;
             const id = feature.id;
             if (id !== undefined) {
-              const key2 = `${layerName}|${typeof id}|${id}`;
-              if (seen.has(key2))
+              const key = `${layerName}|${typeof id}|${id}`;
+              if (seen.has(key))
                 continue;
-              seen.add(key2);
+              seen.add(key);
             }
             out.push({ feature, sourceLayer: layerName, tile: entry.coords });
           }
@@ -15839,8 +15791,8 @@ var init_VectorTileMapLayer = __esm(() => {
       this._sourceCache.clear();
       super.onRemove(map);
     }
-    _removeTile(key2) {
-      const tile = this._tiles?.[key2];
+    _removeTile(key) {
+      const tile = this._tiles?.[key];
       if (tile) {
         const entry = this._decodedTiles.get(tile.el);
         if (entry) {
@@ -15850,7 +15802,7 @@ var init_VectorTileMapLayer = __esm(() => {
           this._decodedTiles.delete(tile.el);
         }
       }
-      super._removeTile(key2);
+      super._removeTile(key);
       this._refreshSymbols();
     }
     getTileUrl(coords) {
@@ -16008,9 +15960,9 @@ var init_VectorTileMapLayer = __esm(() => {
       return !!this._buildingOverlay?.active;
     }
     _buildingsFor(entry, layers) {
-      const key2 = this._sourceKey(entry.coords);
+      const key = this._sourceKey(entry.coords);
       this._buildingMeshes ??= new Map;
-      const cached = this._buildingMeshes.get(key2);
+      const cached = this._buildingMeshes.get(key);
       if (cached && cached.version === this._labelVersion)
         return cached.meshes;
       for (const item of cached?.meshes ?? [])
@@ -16038,12 +15990,12 @@ var init_VectorTileMapLayer = __esm(() => {
             let featureState;
             if (lookup && feature.id !== undefined)
               featureState = lookup(sourceId, styleLayer.sourceLayer, feature.id);
-            const resolve2 = (value) => resolvePaintExpression(value, source.z, feature, featureState);
-            const height = Number(resolve2(paint?.["fill-extrusion-height"]) ?? 0);
-            const base = Number(resolve2(paint?.["fill-extrusion-base"]) ?? 0);
+            const resolve = (value) => resolvePaintExpression(value, source.z, feature, featureState);
+            const height = Number(resolve(paint?.["fill-extrusion-height"]) ?? 0);
+            const base = Number(resolve(paint?.["fill-extrusion-base"]) ?? 0);
             if (!(height > base))
               continue;
-            const color = parseCssColor(resolve2(paint?.["fill-extrusion-color"]) ?? "#000", 1);
+            const color = parseCssColor(resolve(paint?.["fill-extrusion-color"]) ?? "#000", 1);
             const rings = feature.loadGeometry().map((ring) => ring.map((pt) => ({ x: pt.x * scale, y: pt.y * scale })));
             footprints.push({ rings, height, base, color: [color[0], color[1], color[2], color[3]] });
             const outer = rings[0];
@@ -16068,7 +16020,7 @@ var init_VectorTileMapLayer = __esm(() => {
             meshes.push({ layer: styleLayer.id, mesh: buildBuildingMesh(footprints, size) });
         }
       }
-      this._buildingMeshes.set(key2, { version: this._labelVersion, meshes, occluders: new OccluderIndex(occluders, this.getTileSize().x) });
+      this._buildingMeshes.set(key, { version: this._labelVersion, meshes, occluders: new OccluderIndex(occluders, this.getTileSize().x) });
       return meshes;
     }
     _occlusionTest(occlusion) {
@@ -16078,11 +16030,11 @@ var init_VectorTileMapLayer = __esm(() => {
       if (!memo || memo.signature !== signature)
         memo = this._occlusionMemo = { signature, results: new Map };
       const results = memo.results;
-      return (x, y, key2) => {
-        let hidden = results.get(key2);
+      return (x, y, key) => {
+        let hidden = results.get(key);
         if (hidden === undefined) {
           hidden = occluded(occlusion.sources, map.containerPointToLayerPoint([x, y]), occlusion.camera, occlusion.rise);
-          results.set(key2, hidden);
+          results.set(key, hidden);
         }
         return hidden;
       };
@@ -16123,10 +16075,10 @@ var init_VectorTileMapLayer = __esm(() => {
       const drawn = new Set;
       const ready = (e) => meshes.get(this._sourceKey(e.coords))?.version === this._labelVersion;
       for (const entry of this._labelEntries(ready)) {
-        const key2 = this._sourceKey(entry.coords);
-        if (drawn.has(key2))
+        const key = this._sourceKey(entry.coords);
+        if (drawn.has(key))
           continue;
-        drawn.add(key2);
+        drawn.add(key);
         const { x, y, z } = this._subTile(entry.coords);
         const k = map.getZoomScale(mapZoom, z);
         const matrix = buildingMatrix(camera, k, [x * tileSize * k - origin.x, y * tileSize * k - origin.y]);
@@ -16153,7 +16105,7 @@ var init_VectorTileMapLayer = __esm(() => {
           if (layerOpacity >= 0.5)
             solid = true;
         }
-        const cached = meshes.get(key2);
+        const cached = meshes.get(key);
         if (solid && cached)
           occlusionSources.push({ index: cached.occluders, scale: k, origin: [x * tileSize * k - origin.x, y * tileSize * k - origin.y], pxPerMetre: heightScale });
       }
@@ -16171,12 +16123,12 @@ var init_VectorTileMapLayer = __esm(() => {
       const held = new Set;
       for (const entry of this._decodedTiles.values())
         held.add(this._sourceKey(entry.coords));
-      for (const [key2, cached] of meshes) {
-        if (held.has(key2))
+      for (const [key, cached] of meshes) {
+        if (held.has(key))
           continue;
         for (const item of cached.meshes)
           overlay.release(item);
-        meshes.delete(key2);
+        meshes.delete(key);
       }
       return pending;
     }
@@ -16313,33 +16265,33 @@ var init_VectorTileMapLayer = __esm(() => {
     }
     _abortLoading() {
       const wanted = new Set;
-      for (const key2 of Object.keys(this._tiles ?? {})) {
-        const tile = this._tiles[key2];
+      for (const key of Object.keys(this._tiles ?? {})) {
+        const tile = this._tiles[key];
         if (tile?.current && tile.coords)
           wanted.add(this._sourceKey(tile.coords));
       }
-      for (const [key2, pending] of [...this._sourcePending.entries()]) {
-        if (wanted.has(key2))
+      for (const [key, pending] of [...this._sourcePending.entries()]) {
+        if (wanted.has(key))
           continue;
         pending.abort.abort();
-        this._sourcePending.delete(key2);
+        this._sourcePending.delete(key);
       }
     }
     _sourceKey(coords) {
       const sub = this._subTile(coords);
       return `${sub.z}/${sub.x}/${sub.y}`;
     }
-    async _acquireSource(key2, url, entry) {
-      const cached = this._sourceCache.get(key2);
+    async _acquireSource(key, url, entry) {
+      const cached = this._sourceCache.get(key);
       if (cached) {
         cached.refs += 1;
-        entry.sourceKey = key2;
+        entry.sourceKey = key;
         return { tile: cached.tile, index: cached.index };
       }
-      const pending = this._sourcePending.get(key2);
+      const pending = this._sourcePending.get(key);
       if (pending) {
         pending.refs += 1;
-        entry.sourceKey = key2;
+        entry.sourceKey = key;
         entry.sourcePending = true;
         return pending.promise;
       }
@@ -16351,16 +16303,16 @@ var init_VectorTileMapLayer = __esm(() => {
           const bytes = await this._fetchTileBytes(url, { abort });
           const decoded = await this._decode(bytes);
           const built = { tile: decoded, index: buildTileIndex(decoded) };
-          const waiting = this._sourcePending.get(key2)?.refs ?? 1;
-          this._sourcePending.delete(key2);
-          this._sourceCache.set(key2, { ...built, refs: waiting });
+          const waiting = this._sourcePending.get(key)?.refs ?? 1;
+          this._sourcePending.delete(key);
+          this._sourceCache.set(key, { ...built, refs: waiting });
           return built;
         })()
       };
-      this._sourcePending.set(key2, record);
-      entry.sourceKey = key2;
+      this._sourcePending.set(key, record);
+      entry.sourceKey = key;
       entry.sourcePending = true;
-      record.promise.catch(() => this._sourcePending.delete(key2));
+      record.promise.catch(() => this._sourcePending.delete(key));
       return record.promise;
     }
     async _decode(bytes) {
@@ -16385,23 +16337,23 @@ var init_VectorTileMapLayer = __esm(() => {
       return pool.size() > 0 ? pool : null;
     }
     _releaseSource(entry) {
-      const key2 = entry.sourceKey;
-      if (!key2)
+      const key = entry.sourceKey;
+      if (!key)
         return;
       entry.sourceKey = undefined;
-      const cached = this._sourceCache.get(key2);
+      const cached = this._sourceCache.get(key);
       if (cached) {
         cached.refs -= 1;
         if (cached.refs <= 0)
-          this._sourceCache.delete(key2);
+          this._sourceCache.delete(key);
         return;
       }
-      const pending = this._sourcePending.get(key2);
+      const pending = this._sourcePending.get(key);
       if (pending) {
         pending.refs -= 1;
         if (pending.refs <= 0) {
           pending.abort.abort();
-          this._sourcePending.delete(key2);
+          this._sourcePending.delete(key);
         }
       }
     }
@@ -16621,7 +16573,7 @@ var HillshadeLayer;
 var init_RasterDEMLayer = __esm(() => {
   init_DomEvent();
   init_TileLayer();
-  RasterDEMLayer = class RasterDEMLayer2 extends TileLayer {
+  RasterDEMLayer = class RasterDEMLayer extends TileLayer {
     initialize(url, options) {
       super.initialize(url, { tileSize: 512, crossOrigin: true, ...options });
       this._encoding = options?.encoding ?? "mapbox";
@@ -17097,9 +17049,9 @@ function swapItem(ids, coords, i, j) {
 function rangeKD(ids, coords, minX, minY, maxX, maxY, left, right, axis, nodeSize, out) {
   if (right - left <= nodeSize) {
     for (let i = left;i <= right; i++) {
-      const x2 = coords[2 * i];
-      const y2 = coords[2 * i + 1];
-      if (x2 >= minX && x2 <= maxX && y2 >= minY && y2 <= maxY)
+      const x = coords[2 * i];
+      const y = coords[2 * i + 1];
+      if (x >= minX && x <= maxX && y >= minY && y <= maxY)
         out.push(ids[i]);
     }
     return;
@@ -17461,7 +17413,7 @@ var init_HeatmapLayer = __esm(() => {
     0.8: "yellow",
     1: "red"
   };
-  HeatmapLayer = class HeatmapLayer2 extends Layer {
+  HeatmapLayer = class HeatmapLayer extends Layer {
     initialize(options) {
       setOptions(this, options);
       this._data = options?.data ? [...options.data] : [];
@@ -17615,8 +17567,8 @@ var init_HeatmapLayer = __esm(() => {
         return this._gradientTexture;
       }
       const g = ctx.createLinearGradient(0, 0, 0, 256);
-      for (const [stop2, colour] of Object.entries(gradient)) {
-        g.addColorStop(Number(stop2), colour);
+      for (const [stop, colour] of Object.entries(gradient)) {
+        g.addColorStop(Number(stop), colour);
       }
       ctx.fillStyle = g;
       ctx.fillRect(0, 0, 1, 256);
@@ -17707,10 +17659,10 @@ async function fetchDemTile(url, demSize) {
     if (!res.ok)
       return null;
     const blob = await res.blob();
-    const img = await new Promise((resolve2, reject) => {
+    const img = await new Promise((resolve, reject) => {
       const el = new Image;
       el.crossOrigin = "anonymous";
-      el.onload = () => resolve2(el);
+      el.onload = () => resolve(el);
       el.onerror = reject;
       el.src = URL.createObjectURL(blob);
     });
@@ -17733,13 +17685,13 @@ async function loadSpriteImage(url) {
     return;
   });
   const blobUrl = hit?.data.byteLength ? URL.createObjectURL(new Blob([hit.data], { type: hit.mime })) : undefined;
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     const image = new Image;
     image.crossOrigin = "anonymous";
     image.onload = () => {
       if (blobUrl)
         URL.revokeObjectURL(blobUrl);
-      resolve2(image);
+      resolve(image);
     };
     image.onerror = () => {
       if (blobUrl)
@@ -17771,7 +17723,7 @@ var init_Map = __esm(() => {
   init_terrainMesh();
   init_TerrainSource();
   init_WebGLTileRenderer();
-  TsMap = class TsMap2 extends Evented {
+  TsMap = class TsMap extends Evented {
     static _pointerEvents = ["click", "dblclick", "pointerover", "pointerout", "contextmenu"];
     _sizeChanged = true;
     _initControlPos;
@@ -17845,8 +17797,8 @@ var init_Map = __esm(() => {
       const containerPoint = latlng instanceof Point ? latlng : this.latLngToContainerPoint(latlng);
       if (this._bearing || this._pitch) {
         const offset = this._groundOffset(containerPoint).multiplyBy(1 - 1 / scale);
-        const newCenter2 = this.layerPointToLatLng(this._getCenterLayerPoint().add(offset));
-        return this.setView(newCenter2, zoom, { zoom: options });
+        const newCenter = this.layerPointToLatLng(this._getCenterLayerPoint().add(offset));
+        return this.setView(newCenter, zoom, { zoom: options });
       }
       const centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale);
       const newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset));
@@ -18004,7 +17956,7 @@ var init_Map = __esm(() => {
           const center = this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom);
           const zoom = this.getScaleZoom(w0 / w(s), startZoom);
           if (bearingChanged)
-            this._bearing = TsMap2._lerpBearing(startBearing, targetBearing, t);
+            this._bearing = TsMap._lerpBearing(startBearing, targetBearing, t);
           if (pitchChanged)
             this._pitch = startPitch + (targetPitch - startPitch) * t;
           this._move(center, zoom, { flyTo: true });
@@ -18269,8 +18221,8 @@ var init_Map = __esm(() => {
     getBearing() {
       return this._bearing;
     }
-    setBearing(bearing2) {
-      const wrapped = (bearing2 % 360 + 360) % 360;
+    setBearing(bearing) {
+      const wrapped = (bearing % 360 + 360) % 360;
       if (wrapped === this._bearing)
         return this;
       this.fire("rotatestart", { bearing: this._bearing });
@@ -18280,11 +18232,11 @@ var init_Map = __esm(() => {
       this.fire("rotateend", { bearing: wrapped });
       return this;
     }
-    rotateTo(bearing2, options) {
+    rotateTo(bearing, options) {
       if (!options?.animate)
-        return this.setBearing(bearing2);
+        return this.setBearing(bearing);
       return this.easeTo({
-        bearing: bearing2,
+        bearing,
         duration: options.duration ?? 300,
         easing: options.easing
       });
@@ -18379,7 +18331,7 @@ var init_Map = __esm(() => {
           const px = fromPx.add(toPx.subtract(fromPx).multiplyBy(t));
           const center = this.unproject(px, startZoom);
           if (bearingChanged)
-            this._bearing = TsMap2._lerpBearing(startBearing, endBearing, t);
+            this._bearing = TsMap._lerpBearing(startBearing, endBearing, t);
           if (pitchChanged)
             this._pitch = startPitch + (endPitch - startPitch) * t;
           this._move(center, lerpZoom, { easeTo: true });
@@ -18811,7 +18763,7 @@ var init_Map = __esm(() => {
       }
       for (const t of targets) {
         t.fire(type, data, true);
-        if (data.originalEvent._stopped || t.options?.bubblingPointerEvents === false && TsMap2._pointerEvents.includes(type)) {
+        if (data.originalEvent._stopped || t.options?.bubblingPointerEvents === false && TsMap._pointerEvents.includes(type)) {
           return;
         }
       }
@@ -18850,13 +18802,13 @@ var init_Map = __esm(() => {
       const pos = this._getMapPanePos();
       if (this._pitch && (pos.x || pos.y) && this._loaded) {
         const pitch = this._pitch;
-        const bearing2 = this._bearing;
+        const bearing = this._bearing;
         this._pitch = this._appliedPitch ?? 0;
-        this._bearing = this._appliedBearing ?? bearing2;
-        const center2 = this.getCenter();
+        this._bearing = this._appliedBearing ?? bearing;
+        const center = this.getCenter();
         this._pitch = pitch;
-        this._bearing = bearing2;
-        this._resetView(center2, this._zoom, true);
+        this._bearing = bearing;
+        this._resetView(center, this._zoom, true);
       }
       const size = this.getSize();
       const center = size.divideBy(2);
@@ -19279,8 +19231,8 @@ var init_Map = __esm(() => {
       if (!names.length)
         return true;
       try {
-        const probe2 = new GlyphAtlas;
-        const { family } = probe2.resolveFont(names);
+        const probe = new GlyphAtlas;
+        const { family } = probe.resolveFont(names);
         return fonts.check(`16px ${family}`);
       } catch {
         return true;
@@ -19689,12 +19641,12 @@ var init_Map = __esm(() => {
     }
     setFeatureState(lookup, state) {
       const store = this._ensureFeatureStateMap();
-      const key2 = this._featureStateKey(lookup);
-      const existing = store.get(key2);
+      const key = this._featureStateKey(lookup);
+      const existing = store.get(key);
       if (existing)
         Object.assign(existing, state);
       else
-        store.set(key2, { ...state });
+        store.set(key, { ...state });
       this._repaintSource(lookup.source);
       return this;
     }
@@ -19702,20 +19654,20 @@ var init_Map = __esm(() => {
       const store = this._featureState;
       if (!store)
         return {};
-      const key2 = this._featureStateKey(lookup);
-      return store.get(key2) ?? {};
+      const key = this._featureStateKey(lookup);
+      return store.get(key) ?? {};
     }
-    removeFeatureState(lookup, key2) {
+    removeFeatureState(lookup, key) {
       const store = this._featureState;
       if (!store)
         return this;
       const fullKey = this._featureStateKey(lookup);
-      if (key2 === undefined) {
+      if (key === undefined) {
         store.delete(fullKey);
       } else {
         const existing = store.get(fullKey);
         if (existing) {
-          delete existing[key2];
+          delete existing[key];
           if (Object.keys(existing).length === 0)
             store.delete(fullKey);
         }
@@ -19808,10 +19760,10 @@ var init_Map = __esm(() => {
     setSky(sky) {
       if (sky !== null) {
         const numericFields = ["fog-ground-blend", "sun-intensity"];
-        for (const key2 of numericFields) {
-          const value = sky[key2];
+        for (const key of numericFields) {
+          const value = sky[key];
           if (value !== undefined && Number.isNaN(value))
-            throw new RangeError(`setSky: ${key2} is NaN.`);
+            throw new RangeError(`setSky: ${key} is NaN.`);
         }
         if (sky["sun-position"] !== undefined) {
           const [az, alt] = sky["sun-position"];
@@ -19999,15 +19951,15 @@ var init_Map = __esm(() => {
       this._theme = theme;
       this.options.theme = theme;
       if (theme === "auto") {
-        const resolve2 = () => {
-          const page2 = this._pageTheme();
-          const dark = page2 !== undefined ? page2 === "dark" : Boolean(this._themeQuery?.matches);
+        const resolve = () => {
+          const page = this._pageTheme();
+          const dark = page !== undefined ? page === "dark" : Boolean(this._themeQuery?.matches);
           if (dark !== this._container?.classList.contains("tsmap-dark"))
             this._applyTheme(dark);
         };
         if (typeof matchMedia === "function") {
           const query = matchMedia("(prefers-color-scheme: dark)");
-          const listener = () => resolve2();
+          const listener = () => resolve();
           if (typeof query.addEventListener === "function")
             query.addEventListener("change", listener);
           else
@@ -20017,7 +19969,7 @@ var init_Map = __esm(() => {
         }
         const root = typeof document !== "undefined" ? document.documentElement : undefined;
         if (root && typeof MutationObserver === "function") {
-          this._themeObserver = new MutationObserver(resolve2);
+          this._themeObserver = new MutationObserver(resolve);
           this._themeObserver.observe(root, { attributes: true, attributeFilter: ["data-theme", "data-color-mode", "class"] });
         }
         const page = this._pageTheme();
@@ -20128,10 +20080,10 @@ var init_Map = __esm(() => {
     }
     toBlob(type = "image/png", quality) {
       this._requestExportFrame();
-      return new Promise((resolve2) => {
+      return new Promise((resolve) => {
         const canvas = this.toCanvas();
         if (typeof canvas.toBlob === "function") {
-          canvas.toBlob((blob) => resolve2(blob), type, quality);
+          canvas.toBlob((blob) => resolve(blob), type, quality);
         } else {
           try {
             const dataUrl = canvas.toDataURL(type, quality);
@@ -20141,9 +20093,9 @@ var init_Map = __esm(() => {
             const bytes = new Uint8Array(binary.length);
             for (let i = 0;i < binary.length; i++)
               bytes[i] = binary.charCodeAt(i);
-            resolve2(new Blob([bytes], { type }));
+            resolve(new Blob([bytes], { type }));
           } catch {
-            resolve2(null);
+            resolve(null);
           }
         }
       });
@@ -20325,10 +20277,10 @@ var init_Map = __esm(() => {
       const spec = this._style.spec.sources?.[this._terrain.source];
       if (!spec || spec.type !== "raster-dem")
         return;
-      const template2 = Array.isArray(spec.tiles) ? spec.tiles[0] : undefined;
-      if (!template2 || typeof template2 !== "string")
+      const template = Array.isArray(spec.tiles) ? spec.tiles[0] : undefined;
+      if (!template || typeof template !== "string")
         return;
-      const url = template2.replace(/\{z\}/g, String(coord.z)).replace(/\{x\}/g, String(coord.x)).replace(/\{y\}/g, String(coord.y));
+      const url = template.replace(/\{z\}/g, String(coord.z)).replace(/\{x\}/g, String(coord.x)).replace(/\{y\}/g, String(coord.y));
       if (!this._terrainFetchInFlight)
         this._terrainFetchInFlight = new globalThis.Map;
       if (this._terrainFetchInFlight.has(url))
@@ -20981,9 +20933,9 @@ function assemblePolygons(rings) {
         continue;
       if (!pointInRing2(samples[i], kept[j]))
         continue;
-      const area2 = Math.abs(ringSignedArea(kept[j]));
-      if (area2 < bestArea) {
-        bestArea = area2;
+      const area = Math.abs(ringSignedArea(kept[j]));
+      if (area < bestArea) {
+        bestArea = area;
         bestParent = j;
       }
       depths[i]++;
@@ -21206,7 +21158,7 @@ function prepareClaim(ring) {
 }
 var InvalidGeometryError;
 var init_validate3 = __esm(() => {
-  InvalidGeometryError = class InvalidGeometryError2 extends Error {
+  InvalidGeometryError = class InvalidGeometryError extends Error {
     constructor(message) {
       super(message);
       this.name = "InvalidGeometryError";
@@ -21218,7 +21170,7 @@ var init_TerritoryStore = __esm(() => {
   init_Events();
   init_area();
   init_validate3();
-  TerritoryStore = class TerritoryStore2 extends Evented {
+  TerritoryStore = class TerritoryStore extends Evented {
     initialize(options = {}) {
       this._byOwner = new Map;
       this._options = {
@@ -21807,11 +21759,11 @@ init_Point();
 
 class Draggable extends Evented {
   static _dragging = false;
-  initialize(element, dragStartTarget, preventOutline2, options) {
+  initialize(element, dragStartTarget, preventOutline, options) {
     setOptions(this, options);
     this._element = element;
     this._dragStartTarget = dragStartTarget ?? element;
-    this._preventOutline = preventOutline2;
+    this._preventOutline = preventOutline;
   }
   enable() {
     if (this._enabled)
@@ -22396,16 +22348,16 @@ function distanceToStretch(p, a, b, kx) {
 }
 function cutEvery(points, every) {
   const cuts = [0];
-  let run2 = 0;
+  let run = 0;
   for (let i = 1;i < points.length - 1; i++) {
-    run2 += distanceMeters(points[i - 1], points[i]);
-    if (run2 >= every) {
+    run += distanceMeters(points[i - 1], points[i]);
+    if (run >= every) {
       cuts.push(i);
-      run2 = 0;
+      run = 0;
     }
   }
-  run2 += distanceMeters(points[points.length - 2], points[points.length - 1]);
-  if (cuts.length > 1 && run2 < every / 2)
+  run += distanceMeters(points[points.length - 2], points[points.length - 1]);
+  if (cuts.length > 1 && run < every / 2)
     cuts.pop();
   cuts.push(points.length - 1);
   return cuts;
@@ -22536,7 +22488,7 @@ class RouteBuilder {
     return this.add(start, opts);
   }
   outAndBack() {
-    const run2 = async () => {
+    const run = async () => {
       const { waypoints, segments, straight } = this.state;
       if (waypoints.length < 2)
         return;
@@ -22547,7 +22499,7 @@ class RouteBuilder {
         straight: [...straight, ...straight.slice().reverse()]
       };
     };
-    return this.enqueue(run2);
+    return this.enqueue(run);
   }
   undo() {
     return this.enqueue(async () => {
@@ -22612,10 +22564,10 @@ class RouteBuilder {
         const found = await reverse;
         return { ...found, segment: found.segment.slice().reverse() };
       }
-      const key3 = pairKey(from, to);
-      if (!jobs.has(key3))
-        jobs.set(key3, this.route(from, to, router));
-      return jobs.get(key3);
+      const key = pairKey(from, to);
+      if (!jobs.has(key))
+        jobs.set(key, this.route(from, to, router));
+      return jobs.get(key);
     }));
     this.lastError = results.find((r) => r.error)?.error ?? null;
     return results.map(({ segment, straight }) => ({ segment, straight }));
@@ -22725,8 +22677,8 @@ class Navigator extends Evented {
       const last = points[points.length - 1];
       starts.push(first && last && first.lat === last.lat && first.lng === last.lng ? points.length - 1 : points.length);
       for (const p of step.geometry) {
-        const last2 = points[points.length - 1];
-        if (!last2 || last2.lat !== p.lat || last2.lng !== p.lng)
+        const last = points[points.length - 1];
+        if (!last || last.lat !== p.lat || last.lng !== p.lng)
           points.push(p);
       }
     }
@@ -22754,8 +22706,8 @@ class Navigator extends Evented {
   get steps() {
     return this.route.steps;
   }
-  pointAt(distance2) {
-    const d = Math.max(0, Math.min(this.length, distance2));
+  pointAt(distance) {
+    const d = Math.max(0, Math.min(this.length, distance));
     let i = 1;
     while (i < this.along.length - 1 && this.along[i] < d)
       i++;
@@ -22798,29 +22750,29 @@ class Navigator extends Evented {
   }
   update(fix) {
     const time = fix.time ?? Date.now();
-    const { distance: distance2, offset } = this.snap(fix);
+    const { distance, offset } = this.snap(fix);
     let speed = typeof fix.speed === "number" && fix.speed >= 0 ? fix.speed : 0;
     if (!(speed > 0) && this._last && time > this._last.time)
-      speed = Math.max(0, (distance2 - this._last.distance) / ((time - this._last.time) / 1000));
-    this._last = { distance: distance2, time };
-    const stepIndex = this._stepAt(distance2);
+      speed = Math.max(0, (distance - this._last.distance) / ((time - this._last.time) / 1000));
+    this._last = { distance, time };
+    const stepIndex = this._stepAt(distance);
     const next = this.route.steps[stepIndex + 1];
     const stepEnd = this.stepStarts[stepIndex + 1] ?? this.length;
-    const distanceToManeuver = Math.max(0, stepEnd - distance2);
+    const distanceToManeuver = Math.max(0, stepEnd - distance);
     const nextManeuver = parseManeuver(next?.maneuver ?? "arrive", next?.exit);
     const after = this.route.steps[stepIndex + 2];
     const afterGap = (this.stepStarts[stepIndex + 2] ?? this.length) - stepEnd;
     const thenManeuver = after && afterGap < (this.options.profile === "walking" ? 40 : 150) ? parseManeuver(after.maneuver, after.exit) : undefined;
-    const distanceRemaining = Math.max(0, this.length - distance2);
-    const durationRemaining = this._durationFrom(distance2, stepIndex);
-    const { heading } = this.pointAt(distance2);
+    const distanceRemaining = Math.max(0, this.length - distance);
+    const durationRemaining = this._durationFrom(distance, stepIndex);
+    const { heading } = this.pointAt(distance);
     const progress = {
-      location: this.pointAt(distance2).location,
+      location: this.pointAt(distance).location,
       raw: fix,
       offRouteDistance: offset,
       heading,
       speed,
-      distanceTraveled: distance2,
+      distanceTraveled: distance,
       distanceRemaining,
       durationRemaining,
       arrival: new Date(time + durationRemaining * 1000),
@@ -22857,19 +22809,19 @@ class Navigator extends Evented {
     this.fire("progress", { progress });
     return progress;
   }
-  _stepAt(distance2) {
+  _stepAt(distance) {
     let i = 0;
-    while (i + 1 < this.stepStarts.length && this.stepStarts[i + 1] <= distance2)
+    while (i + 1 < this.stepStarts.length && this.stepStarts[i + 1] <= distance)
       i++;
     return i;
   }
-  _durationFrom(distance2, stepIndex) {
+  _durationFrom(distance, stepIndex) {
     const steps = this.route.steps;
     if (!steps.length)
-      return this.length > 0 ? this.route.duration * (1 - distance2 / this.length) : 0;
+      return this.length > 0 ? this.route.duration * (1 - distance / this.length) : 0;
     const start = this.stepStarts[stepIndex] ?? 0;
     const end = this.stepStarts[stepIndex + 1] ?? this.length;
-    const fraction = end > start ? (end - distance2) / (end - start) : 0;
+    const fraction = end > start ? (end - distance) / (end - start) : 0;
     let total = (steps[stepIndex]?.duration ?? 0) * Math.max(0, Math.min(1, fraction));
     for (let i = stepIndex + 1;i < steps.length; i++)
       total += steps[i].duration;
@@ -22889,8 +22841,8 @@ class Navigator extends Evented {
         continue;
       if (stage === "early" && stepLength < at * 1.2)
         return;
-      const key3 = `${progress.stepIndex}:${stage}`;
-      if (this._announced.has(key3))
+      const key = `${progress.stepIndex}:${stage}`;
+      if (this._announced.has(key))
         return;
       for (let j = i;j < stages.length; j++)
         this._announced.add(`${progress.stepIndex}:${stages[j][0]}`);
@@ -22938,11 +22890,11 @@ class RouteSimulator {
       clearInterval(this._timer);
     this._timer = null;
   }
-  speedAt(distance2) {
+  speedAt(distance) {
     const starts = this.navigator.stepStarts;
     let nearest = Infinity;
     for (let i = 1;i < starts.length; i++)
-      nearest = Math.min(nearest, Math.abs(starts[i] - distance2));
+      nearest = Math.min(nearest, Math.abs(starts[i] - distance));
     const slow = this.speed * 0.35;
     const reach = 60;
     return nearest >= reach ? this.speed : slow + (this.speed - slow) * (nearest / reach);
@@ -23143,10 +23095,10 @@ function stepToStep(step) {
 function routeToRoute(r) {
   const legs = r.legs ?? [];
   const steps = legs.flatMap((l) => (l.steps ?? []).map(stepToStep));
-  const distance2 = legs.reduce((sum, l) => sum + (l.distance?.value ?? 0), 0);
+  const distance = legs.reduce((sum, l) => sum + (l.distance?.value ?? 0), 0);
   const duration = legs.reduce((sum, l) => sum + (l.duration?.value ?? 0), 0);
   const geometry = r.overview_polyline ? decodePolyline(r.overview_polyline.points) : steps.flatMap((s) => s.geometry);
-  return { distance: distance2, duration, geometry, steps };
+  return { distance, duration, geometry, steps };
 }
 
 class GoogleDirections {
@@ -23551,12 +23503,12 @@ class NominatimGeocoder {
   constructor(opts = {}) {
     this.baseUrl = (opts.baseUrl ?? "https://nominatim.openstreetmap.org").replace(/\/$/, "");
     this.userAgent = opts.userAgent ?? "ts-maps";
-    this.scheduleRequest = throttle((run2) => run2(), 250);
+    this.scheduleRequest = throttle((run) => run(), 250);
   }
   gate(work) {
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve, reject) => {
       this.scheduleRequest(() => {
-        work().then(resolve2, reject);
+        work().then(resolve, reject);
       });
     });
   }
@@ -23620,8 +23572,8 @@ var profileMap3 = {
   walking: "foot",
   cycling: "bike"
 };
-function coordsToLatLng(coords2) {
-  return coords2.map(([lng, lat]) => ({ lat, lng }));
+function coordsToLatLng(coords) {
+  return coords.map(([lng, lat]) => ({ lat, lng }));
 }
 function stepInstruction(step) {
   if (step.maneuver?.instruction)
@@ -23692,13 +23644,13 @@ class OSRMDirections {
     if (waypoints.length < 2)
       throw new Error("OSRM requires at least two waypoints");
     const profile = profileMap3[opts?.profile ?? "driving"] ?? "driving";
-    const coords2 = waypoints.map((w) => `${w.lng},${w.lat}`).join(";");
+    const coords = waypoints.map((w) => `${w.lng},${w.lat}`).join(";");
     const params = new URLSearchParams;
     params.set("overview", "full");
     params.set("geometries", "geojson");
     params.set("steps", "true");
     params.set("alternatives", opts?.alternatives ? "true" : "false");
-    const url = `${this.baseUrl}/route/v1/${profile}/${coords2}?${params.toString()}`;
+    const url = `${this.baseUrl}/route/v1/${profile}/${coords}?${params.toString()}`;
     const res = await fetch(url, { signal: opts?.signal });
     if (!res.ok)
       throw new Error(`OSRM request failed: ${res.status} ${res.statusText}`);
@@ -23720,7 +23672,7 @@ class OSRMMatrix {
       throw new Error("OSRM matrix requires at least one origin and one destination");
     const profile = profileMap3[opts?.profile ?? "driving"] ?? "driving";
     const all = [...origins, ...destinations];
-    const coords2 = all.map((w) => `${w.lng},${w.lat}`).join(";");
+    const coords = all.map((w) => `${w.lng},${w.lat}`).join(";");
     const sources = origins.map((_, i) => i).join(";");
     const destinationsParam = destinations.map((_, i) => origins.length + i).join(";");
     const annotations = opts?.metric === "distance" ? "distance" : "duration";
@@ -23728,7 +23680,7 @@ class OSRMMatrix {
     params.set("sources", sources);
     params.set("destinations", destinationsParam);
     params.set("annotations", annotations);
-    const url = `${this.baseUrl}/table/v1/${profile}/${coords2}?${params.toString()}`;
+    const url = `${this.baseUrl}/table/v1/${profile}/${coords}?${params.toString()}`;
     const res = await fetch(url, { signal: opts?.signal });
     if (!res.ok)
       throw new Error(`OSRM matrix request failed: ${res.status} ${res.statusText}`);
@@ -23781,10 +23733,10 @@ function buildLabel(props) {
   return parts.filter(Boolean).join(", ");
 }
 function toResult4(f) {
-  const coords2 = f.geometry?.coordinates ?? [0, 0];
+  const coords = f.geometry?.coordinates ?? [0, 0];
   const out = {
     text: buildLabel(f.properties),
-    center: { lat: coords2[1], lng: coords2[0] },
+    center: { lat: coords[1], lng: coords[0] },
     properties: f.properties
   };
   if (f.properties?.extent) {
@@ -24216,12 +24168,12 @@ class GeocoderControl extends Control {
       this._renderList();
       return;
     }
-    const run2 = () => this._request(trimmed);
+    const run = () => this._request(trimmed);
     const wait = options.debounce ?? 300;
     if (wait > 0)
-      this._timer = setTimeout(run2, wait);
+      this._timer = setTimeout(run, wait);
     else
-      run2();
+      run();
   }
   _request(query) {
     const options = this.options;
@@ -24991,12 +24943,12 @@ class NavigationControl extends Control {
     if (!map || !needle)
       return;
     const options = this.options;
-    const bearing2 = map.getBearing?.() ?? 0;
-    const transforms = [`rotate(${-bearing2}deg)`];
+    const bearing = map.getBearing?.() ?? 0;
+    const transforms = [`rotate(${-bearing}deg)`];
     if (options.visualizePitch)
       transforms.unshift(`rotateX(${map.getPitch?.() ?? 0}deg)`);
     needle.style.transform = transforms.join(" ");
-    this._compassButton?.setAttribute("data-bearing", String(Math.round(bearing2)));
+    this._compassButton?.setAttribute("data-bearing", String(Math.round(bearing)));
   }
   _updateDisabled() {
     const map = this._map;
@@ -25063,7 +25015,7 @@ __export(exports_PolyUtil, {
 init_LatLng();
 init_LatLngBounds();
 init_Point();
-function clipPolygon(points, bounds, round2) {
+function clipPolygon(points, bounds, round) {
   let clippedPoints;
   const edges = [1, 4, 2, 8];
   for (let i = 0, len = points.length;i < len; i++) {
@@ -25077,13 +25029,13 @@ function clipPolygon(points, bounds, round2) {
       const b = points[j];
       if (!(a._code & edge)) {
         if (b._code & edge) {
-          const p = _getEdgeIntersection(b, a, edge, bounds, round2);
+          const p = _getEdgeIntersection(b, a, edge, bounds, round);
           p._code = _getBitCode(p, bounds);
           clippedPoints.push(p);
         }
         clippedPoints.push(a);
       } else if (!(b._code & edge)) {
-        const p = _getEdgeIntersection(b, a, edge, bounds, round2);
+        const p = _getEdgeIntersection(b, a, edge, bounds, round);
         p._code = _getBitCode(p, bounds);
         clippedPoints.push(p);
       }
@@ -25111,7 +25063,7 @@ function polygonCenter(latlngs, crs) {
     const latlng = new LatLng(latlngs[i]);
     points.push(crs.project(new LatLng(latlng.lat - centroidLatLng.lat, latlng.lng - centroidLatLng.lng)));
   }
-  let area2 = 0, x = 0, y = 0;
+  let area = 0, x = 0, y = 0;
   let center;
   for (let i = 0, j = len - 1;i < len; j = i++) {
     const p1 = points[i];
@@ -25119,21 +25071,21 @@ function polygonCenter(latlngs, crs) {
     const f = p1.y * p2.x - p2.y * p1.x;
     x += (p1.x + p2.x) * f;
     y += (p1.y + p2.y) * f;
-    area2 += f * 3;
+    area += f * 3;
   }
-  if (area2 === 0) {
+  if (area === 0) {
     center = points[0];
   } else {
-    center = [x / area2, y / area2];
+    center = [x / area, y / area];
   }
   const latlngCenter = crs.unproject(new Point(center));
   return new LatLng(latlngCenter.lat + centroidLatLng.lat, latlngCenter.lng + centroidLatLng.lng);
 }
-function centroid(coords2) {
+function centroid(coords) {
   let latSum = 0;
   let lngSum = 0;
   let len = 0;
-  for (const coord of coords2) {
+  for (const coord of coords) {
     const latlng = new LatLng(coord);
     latSum += latlng.lat;
     lngSum += latlng.lng;
@@ -25171,10 +25123,10 @@ function _simplifyDPStep(points, markers, sqTolerance, first, last) {
   let maxSqDist = 0;
   let index = 0;
   for (let i = first + 1;i <= last - 1; i++) {
-    const sqDist2 = _sqClosestPointOnSegment(points[i], points[first], points[last], true);
-    if (sqDist2 > maxSqDist) {
+    const sqDist = _sqClosestPointOnSegment(points[i], points[first], points[last], true);
+    if (sqDist > maxSqDist) {
       index = i;
-      maxSqDist = sqDist2;
+      maxSqDist = sqDist;
     }
   }
   if (maxSqDist > sqTolerance) {
@@ -25197,7 +25149,7 @@ function _reducePoints(points, sqTolerance) {
   return reducedPoints;
 }
 var _lastCode;
-function clipSegment(a, b, bounds, useLastCode, round2) {
+function clipSegment(a, b, bounds, useLastCode, round) {
   let codeA = useLastCode ? _lastCode : _getBitCode(a, bounds);
   let codeB = _getBitCode(b, bounds);
   _lastCode = codeB;
@@ -25207,7 +25159,7 @@ function clipSegment(a, b, bounds, useLastCode, round2) {
     if (codeA & codeB)
       return false;
     const codeOut = codeA || codeB;
-    const p = _getEdgeIntersection(a, b, codeOut, bounds, round2);
+    const p = _getEdgeIntersection(a, b, codeOut, bounds, round);
     const newCode = _getBitCode(p, bounds);
     if (codeOut === codeA) {
       a = p;
@@ -25218,7 +25170,7 @@ function clipSegment(a, b, bounds, useLastCode, round2) {
     }
   }
 }
-function _getEdgeIntersection(a, b, code, bounds, round2) {
+function _getEdgeIntersection(a, b, code, bounds, round) {
   const dx = b.x - a.x;
   const dy = b.y - a.y;
   const min = bounds.min;
@@ -25237,7 +25189,7 @@ function _getEdgeIntersection(a, b, code, bounds, round2) {
     x = min.x;
     y = a.y + dy * (min.x - a.x) / dx;
   }
-  return new Point(x, y, round2);
+  return new Point(x, y, round);
 }
 function _getBitCode(p, bounds) {
   let code = 0;
@@ -25256,7 +25208,7 @@ function _sqDist(p1, p2) {
   const dy = p2.y - p1.y;
   return dx * dx + dy * dy;
 }
-function _sqClosestPointOnSegment(p, p1, p2, sqDist2) {
+function _sqClosestPointOnSegment(p, p1, p2, sqDist) {
   let { x, y } = p1;
   let dx = p2.x - x, dy = p2.y - y;
   const dot = dx * dx + dy * dy;
@@ -25273,7 +25225,7 @@ function _sqClosestPointOnSegment(p, p1, p2, sqDist2) {
   }
   dx = p.x - x;
   dy = p.y - y;
-  return sqDist2 ? dx * dx + dy * dy : new Point(x, y);
+  return sqDist ? dx * dx + dy * dy : new Point(x, y);
 }
 function isFlat(latlngs) {
   return !Array.isArray(latlngs[0]) || typeof latlngs[0][0] !== "object" && typeof latlngs[0][0] !== "undefined";
@@ -25355,9 +25307,9 @@ class Polyline extends Path {
       for (let i = 1, len = points.length;i < len; i++) {
         const p1 = points[i - 1];
         const p2 = points[i];
-        const sqDist2 = closest(p, p1, p2, true);
-        if (sqDist2 < minDistance) {
-          minDistance = sqDist2;
+        const sqDist = closest(p, p1, p2, true);
+        if (sqDist < minDistance) {
+          minDistance = sqDist;
           minPoint = closest(p, p1, p2);
         }
       }
@@ -25727,9 +25679,9 @@ class OfflineMapsControl extends Control {
     this._button?.classList.add(`${CLASS5}-button-active`);
     this._nameEdited = false;
     this._frame = { top: 0, left: 0, right: 0, bottom: 0 };
-    const select2 = this._select = create("div", `${CLASS5}-select`, map.getContainer());
-    select2.innerHTML = `<div class="${CLASS5}-frame"></div>${["nw", "ne", "sw", "se"].map((c) => `<div class="${CLASS5}-handle ${CLASS5}-handle-${c}" data-corner="${c}"></div>`).join("")}`;
-    for (const handle of select2.querySelectorAll(`.${CLASS5}-handle`))
+    const select = this._select = create("div", `${CLASS5}-select`, map.getContainer());
+    select.innerHTML = `<div class="${CLASS5}-frame"></div>${["nw", "ne", "sw", "se"].map((c) => `<div class="${CLASS5}-handle ${CLASS5}-handle-${c}" data-corner="${c}"></div>`).join("")}`;
+    for (const handle of select.querySelectorAll(`.${CLASS5}-handle`))
       this._dragHandle(handle);
     const card = this._card = this._panel(`${CLASS5}-card ${CLASS5}-card-select`);
     card.innerHTML = `
@@ -25897,14 +25849,14 @@ class OfflineMapsControl extends Control {
     this._outline = undefined;
   }
   _layoutSelection() {
-    const select2 = this._select;
+    const select = this._select;
     const f = this._frame;
-    if (!select2 || !f)
+    if (!select || !f)
       return;
-    const frame = select2.querySelector(`.${CLASS5}-frame`);
+    const frame = select.querySelector(`.${CLASS5}-frame`);
     Object.assign(frame.style, { top: `${f.top}px`, left: `${f.left}px`, right: `${f.right}px`, bottom: `${f.bottom}px` });
     const place = (corner, x, y) => {
-      const el = select2.querySelector(`.${CLASS5}-handle-${corner}`);
+      const el = select.querySelector(`.${CLASS5}-handle-${corner}`);
       if (el)
         Object.assign(el.style, { left: x, top: y });
     };
@@ -25965,7 +25917,7 @@ class OfflineMapsControl extends Control {
     const card = this._card;
     if (!bounds || !card)
       return;
-    const area2 = { bounds, map: this._map };
+    const area = { bounds, map: this._map };
     const render = (estimate) => {
       const el = card.querySelector(`.${CLASS5}-estimate`);
       const button = card.querySelector(`.${CLASS5}-download`);
@@ -25982,10 +25934,10 @@ class OfflineMapsControl extends Control {
         button.disabled = false;
       }
     };
-    render(this.maps.quickEstimate(area2));
+    render(this.maps.quickEstimate(area));
     if (sample) {
       const token = this._estimateToken = (this._estimateToken ?? 0) + 1;
-      this.maps.estimate(area2).then((estimate) => {
+      this.maps.estimate(area).then((estimate) => {
         if (token === this._estimateToken && this._select)
           render(estimate);
       }, () => {});
@@ -26079,8 +26031,8 @@ function nameFromLabels(map, bounds) {
       const lng = unitToLng((sub.x + p.x / feature.extent) / 2 ** z);
       if (lng < w || lng > e || lat < s || lat > n)
         continue;
-      const off2 = Math.hypot((lng - cx) / (e - w || 1), (lat - cy) / (n - s || 1));
-      const score = rank + (typeof props.rank === "number" ? props.rank / 100 : 0) + off2;
+      const off = Math.hypot((lng - cx) / (e - w || 1), (lat - cy) / (n - s || 1));
+      const score = rank + (typeof props.rank === "number" ? props.rank / 100 : 0) + off;
       if (!best || score < best.score)
         best = { name, score };
     }
@@ -26359,12 +26311,12 @@ class StreetIndex {
           const segment = { name: feature.name, a, b };
           for (let cx = Math.floor(Math.min(a.lat, b.lat) * 500);cx <= Math.floor(Math.max(a.lat, b.lat) * 500); cx++) {
             for (let cy = Math.floor(Math.min(a.lng, b.lng) * 500);cy <= Math.floor(Math.max(a.lng, b.lng) * 500); cy++) {
-              const key3 = `${cx},${cy}`;
-              const list = this._cells.get(key3);
+              const key = `${cx},${cy}`;
+              const list = this._cells.get(key);
               if (list)
                 list.push(segment);
               else
-                this._cells.set(key3, [segment]);
+                this._cells.set(key, [segment]);
             }
           }
         }
@@ -26449,8 +26401,8 @@ class SearchEngine {
       return false;
     if (typeof navigator !== "undefined" && navigator.onLine === false)
       return false;
-    const shared3 = offlineMapsNow();
-    const maps = this.offline ?? (typeof shared3 === "object" ? shared3 : undefined);
+    const shared = offlineMapsNow();
+    const maps = this.offline ?? (typeof shared === "object" ? shared : undefined);
     return !maps?.onlyOffline;
   }
   async local(query, options = {}) {
@@ -26494,11 +26446,11 @@ class SearchEngine {
     return out;
   }
   _score(place, match, near) {
-    const distance2 = near ? distanceMeters2(near, place.center) : undefined;
+    const distance = near ? distanceMeters2(near, place.center) : undefined;
     let score = match * 10 - place.rank * 0.3;
-    if (distance2 !== undefined)
-      score -= Math.log10(1 + distance2 / 400) * 1.6;
-    return { ...place, distance: distance2, score };
+    if (distance !== undefined)
+      score -= Math.log10(1 + distance / 400) * 1.6;
+    return { ...place, distance, score };
   }
   async suggest(query, options = {}) {
     const limit = options.limit ?? 8;
@@ -26585,9 +26537,9 @@ class SearchEngine {
     if (!needs.length || !this.map)
       return places;
     const c = this.map.getCenter?.();
-    const key3 = `${c?.lat.toFixed(3)},${c?.lng.toFixed(3)},${this.map.getZoom?.()?.toFixed(1)}`;
-    if (this._streets?.key !== key3)
-      this._streets = { key: key3, index: new StreetIndex(this.map) };
+    const key = `${c?.lat.toFixed(3)},${c?.lng.toFixed(3)},${this.map.getZoom?.()?.toFixed(1)}`;
+    if (this._streets?.key !== key)
+      this._streets = { key, index: new StreetIndex(this.map) };
     const index = this._streets.index;
     for (const place of needs) {
       const street = index.nearest(place.center);
@@ -26613,10 +26565,10 @@ function merge(places) {
   }
   return kept;
 }
-function describePlace(place, formatDistance3) {
+function describePlace(place, formatDistance) {
   return [
     kindLabel(place.kind),
-    place.distance !== undefined && formatDistance3 ? formatDistance3(place.distance) : undefined,
+    place.distance !== undefined && formatDistance ? formatDistance(place.distance) : undefined,
     place.address
   ].filter(Boolean).join(" · ");
 }
@@ -26625,8 +26577,8 @@ class SearchHistory {
   key;
   max;
   _memory = [];
-  constructor(key3 = "ts-maps-search-recents", max = 8) {
-    this.key = key3;
+  constructor(key = "ts-maps-search-recents", max = 8) {
+    this.key = key;
     this.max = max;
   }
   list() {
@@ -27081,8 +27033,8 @@ class SearchControl extends Control {
       return;
     const units = this._units();
     const kind = kindLabel(place.kind);
-    const distance2 = place.distance !== undefined ? formatDistance(place.distance, units) : undefined;
-    const coords2 = `${place.center.lat.toFixed(5)}, ${place.center.lng.toFixed(5)}`;
+    const distance = place.distance !== undefined ? formatDistance(place.distance, units) : undefined;
+    const coords = `${place.center.lat.toFixed(5)}, ${place.center.lng.toFixed(5)}`;
     this._rows = [];
     this._body.dataset.html = "";
     this._body.innerHTML = `
@@ -27091,14 +27043,14 @@ class SearchControl extends Control {
           ${badge(place.icon, 44)}
           <div class="${CLASS6}-place-title">
             <div class="${CLASS6}-place-name">${escape2(place.name)}</div>
-            <div class="${CLASS6}-place-kind">${escape2([kind, distance2].filter(Boolean).join(" · "))}</div>
+            <div class="${CLASS6}-place-kind">${escape2([kind, distance].filter(Boolean).join(" · "))}</div>
           </div>
           <button type="button" class="${CLASS6}-close" data-action="close-place" aria-label="Close">✕</button>
         </div>
         ${this.options.turnByTurn || this.options.onDirections ? `<button type="button" class="${CLASS6}-directions" data-action="directions">${CAR}<span>Directions</span></button>` : ""}
         <div class="${CLASS6}-place-info">
           ${place.address ? `<div class="${CLASS6}-info-label">Address</div><div class="${CLASS6}-info-value">${escape2(place.address)}</div>` : ""}
-          <div class="${CLASS6}-info-label">Coordinates</div><div class="${CLASS6}-info-value">${coords2}</div>
+          <div class="${CLASS6}-info-label">Coordinates</div><div class="${CLASS6}-info-value">${coords}</div>
         </div>
       </div>`;
   }
@@ -27194,17 +27146,17 @@ class SearchControl extends Control {
   }
 }
 function deviceLocation(fallback) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const geo = typeof navigator !== "undefined" ? navigator.geolocation : undefined;
     if (!geo)
-      return resolve2(fallback);
-    const timer = setTimeout(() => resolve2(fallback), 5000);
+      return resolve(fallback);
+    const timer = setTimeout(() => resolve(fallback), 5000);
     geo.getCurrentPosition((p) => {
       clearTimeout(timer);
-      resolve2({ lat: p.coords.latitude, lng: p.coords.longitude });
+      resolve({ lat: p.coords.latitude, lng: p.coords.longitude });
     }, () => {
       clearTimeout(timer);
-      resolve2(fallback);
+      resolve(fallback);
     }, { timeout: 5000, maximumAge: 60000 });
   });
 }
@@ -27340,7 +27292,7 @@ class TerritoryLog extends Evented {
     return this._seen.has(id);
   }
   confirm(id, seq) {
-    const index = this._log.findIndex((event2) => event2.id === id);
+    const index = this._log.findIndex((event) => event.id === id);
     if (index === -1)
       return false;
     const event = this._log[index];
@@ -27477,10 +27429,10 @@ function makeLoop(ring, startIndex, endIndex, closure, options) {
   const perimeter = ringPerimeter(ring, false);
   if (perimeter < options.minLoopLength)
     return null;
-  const area2 = Math.abs(ringArea2(ring));
-  if (area2 < options.minArea)
+  const area = Math.abs(ringArea2(ring));
+  if (area < options.minArea)
     return null;
-  return { ring, area: area2, perimeter, startIndex, endIndex, closure };
+  return { ring, area, perimeter, startIndex, endIndex, closure };
 }
 function detectLoop(track, options = {}) {
   const opts = { ...DEFAULTS, ...options };
@@ -27490,10 +27442,10 @@ function detectLoop(track, options = {}) {
     const a1 = track[i - 1];
     const a2 = track[i];
     for (let j = 1;j < i - 1; j++) {
-      const cross2 = segmentCross(a1, a2, track[j - 1], track[j]);
-      if (!cross2)
+      const cross = segmentCross(a1, a2, track[j - 1], track[j]);
+      if (!cross)
         continue;
-      const point = lerp(a1, a2, cross2.t);
+      const point = lerp(a1, a2, cross.t);
       const ring = [point, ...track.slice(j, i), point];
       const loop = makeLoop(ring, j - 1, i, "crossing", opts);
       if (loop)
@@ -27541,10 +27493,10 @@ class LoopDetector {
     const a1 = track[i - 1];
     const a2 = track[i];
     for (let j = 1;j < i - 1; j++) {
-      const cross2 = segmentCross(a1, a2, track[j - 1], track[j]);
-      if (!cross2)
+      const cross = segmentCross(a1, a2, track[j - 1], track[j]);
+      if (!cross)
         continue;
-      const crossing = lerp(a1, a2, cross2.t);
+      const crossing = lerp(a1, a2, cross.t);
       const ring = [crossing, ...track.slice(j, i), crossing];
       const loop = makeLoop(ring, j - 1, i, "crossing", this._options);
       if (loop) {
@@ -27583,9 +27535,9 @@ function simplifyTrack(track, tolerance = 3) {
     let furthest = -1;
     let maxDistance = tolerance;
     for (let i = first + 1;i < last; i++) {
-      const distance2 = perpendicularDistance(track[i], track[first], track[last]);
-      if (distance2 > maxDistance) {
-        maxDistance = distance2;
+      const distance = perpendicularDistance(track[i], track[first], track[last]);
+      if (distance > maxDistance) {
+        maxDistance = distance;
         furthest = i;
       }
     }
@@ -27836,8 +27788,8 @@ class BlanketOverlay extends Layer {
     const p = this.options.padding;
     const size = map.getSize();
     if (!map._bearing && !map._pitch) {
-      const min2 = map.containerPointToLayerPoint(size.multiplyBy(-p)).round();
-      return new Bounds(min2, min2.add(size.multiplyBy(1 + p * 2)).round());
+      const min = map.containerPointToLayerPoint(size.multiplyBy(-p)).round();
+      return new Bounds(min, min.add(size.multiplyBy(1 + p * 2)).round());
     }
     const corners = [
       new Point(-p * size.x, -p * size.y),
@@ -28270,30 +28222,30 @@ class GeoJSON extends FeatureGroup {
   }
   static geometryToLayer(geojson, options) {
     const geometry = geojson.type === "Feature" ? geojson.geometry : geojson;
-    const coords2 = geometry?.coordinates;
+    const coords = geometry?.coordinates;
     const layers = [];
     const pointToLayer = options?.pointToLayer;
     const _coordsToLatLng = options?.coordsToLatLng ?? GeoJSON.coordsToLatLng;
     let latlng, latlngs;
-    if (!coords2 && !geometry)
+    if (!coords && !geometry)
       return null;
     switch (geometry.type) {
       case "Point":
-        latlng = _coordsToLatLng(coords2);
+        latlng = _coordsToLatLng(coords);
         return GeoJSON._pointToLayer(pointToLayer, geojson, latlng, options);
       case "MultiPoint":
-        for (const coord of coords2) {
+        for (const coord of coords) {
           latlng = _coordsToLatLng(coord);
           layers.push(GeoJSON._pointToLayer(pointToLayer, geojson, latlng, options));
         }
         return new FeatureGroup(layers);
       case "LineString":
       case "MultiLineString":
-        latlngs = GeoJSON.coordsToLatLngs(coords2, geometry.type === "LineString" ? 0 : 1, _coordsToLatLng);
+        latlngs = GeoJSON.coordsToLatLngs(coords, geometry.type === "LineString" ? 0 : 1, _coordsToLatLng);
         return new Polyline(latlngs, options);
       case "Polygon":
       case "MultiPolygon":
-        latlngs = GeoJSON.coordsToLatLngs(coords2, geometry.type === "Polygon" ? 1 : 2, _coordsToLatLng);
+        latlngs = GeoJSON.coordsToLatLngs(coords, geometry.type === "Polygon" ? 1 : 2, _coordsToLatLng);
         return new Polygon(latlngs, options);
       case "GeometryCollection":
         for (const g of geometry.geometries) {
@@ -28320,21 +28272,21 @@ class GeoJSON extends FeatureGroup {
   static _pointToLayer(pointToLayerFn, geojson, latlng, options) {
     return pointToLayerFn ? pointToLayerFn(geojson, latlng) : new Marker(latlng, options?.markersInheritOptions && options);
   }
-  static coordsToLatLng(coords2) {
-    return new LatLng(coords2[1], coords2[0], coords2[2]);
+  static coordsToLatLng(coords) {
+    return new LatLng(coords[1], coords[0], coords[2]);
   }
-  static coordsToLatLngs(coords2, levelsDeep, _coordsToLatLng) {
-    return coords2.map((coord) => levelsDeep ? GeoJSON.coordsToLatLngs(coord, levelsDeep - 1, _coordsToLatLng) : (_coordsToLatLng || GeoJSON.coordsToLatLng)(coord));
+  static coordsToLatLngs(coords, levelsDeep, _coordsToLatLng) {
+    return coords.map((coord) => levelsDeep ? GeoJSON.coordsToLatLngs(coord, levelsDeep - 1, _coordsToLatLng) : (_coordsToLatLng || GeoJSON.coordsToLatLng)(coord));
   }
   static latLngToCoords(latlng, precision) {
     const ll = new LatLng(latlng);
     return ll.alt !== undefined ? [formatNum(ll.lng, precision), formatNum(ll.lat, precision), formatNum(ll.alt, precision)] : [formatNum(ll.lng, precision), formatNum(ll.lat, precision)];
   }
   static latLngsToCoords(latlngs, levelsDeep, close, precision) {
-    const coords2 = latlngs.map((latlng) => levelsDeep ? GeoJSON.latLngsToCoords(latlng, isFlat(latlng) ? 0 : levelsDeep - 1, close, precision) : GeoJSON.latLngToCoords(latlng, precision));
-    if (!levelsDeep && close && coords2.length > 0)
-      coords2.push(coords2[0].slice());
-    return coords2;
+    const coords = latlngs.map((latlng) => levelsDeep ? GeoJSON.latLngsToCoords(latlng, isFlat(latlng) ? 0 : levelsDeep - 1, close, precision) : GeoJSON.latLngToCoords(latlng, precision));
+    if (!levelsDeep && close && coords.length > 0)
+      coords.push(coords[0].slice());
+    return coords;
   }
   static getFeature(layer, newGeometry) {
     return layer.feature ? { ...layer.feature, geometry: newGeometry } : GeoJSON.asFeature(newGeometry);
@@ -28359,10 +28311,10 @@ CircleMarker.include(PointToGeoJSON);
 Polyline.include({
   toGeoJSON(precision) {
     const multi = !isFlat(this._latlngs);
-    const coords2 = GeoJSON.latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision);
+    const coords = GeoJSON.latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision);
     return GeoJSON.getFeature(this, {
       type: `${multi ? "Multi" : ""}LineString`,
-      coordinates: coords2
+      coordinates: coords
     });
   }
 });
@@ -28370,22 +28322,22 @@ Polygon.include({
   toGeoJSON(precision) {
     const holes = !isFlat(this._latlngs);
     const multi = holes && !isFlat(this._latlngs[0]);
-    let coords2 = GeoJSON.latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision);
+    let coords = GeoJSON.latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision);
     if (!holes)
-      coords2 = [coords2];
+      coords = [coords];
     return GeoJSON.getFeature(this, {
       type: `${multi ? "Multi" : ""}Polygon`,
-      coordinates: coords2
+      coordinates: coords
     });
   }
 });
 LayerGroup.include({
   toMultiPoint(precision) {
-    const coords2 = [];
+    const coords = [];
     this.eachLayer((layer) => {
-      coords2.push(layer.toGeoJSON(precision).geometry.coordinates);
+      coords.push(layer.toGeoJSON(precision).geometry.coordinates);
     });
-    return GeoJSON.getFeature(this, { type: "MultiPoint", coordinates: coords2 });
+    return GeoJSON.getFeature(this, { type: "MultiPoint", coordinates: coords });
   },
   toGeoJSON(precision) {
     const type = this.feature?.geometry?.type;
@@ -28595,7 +28547,7 @@ class TerritoryLayer extends Layer {
     ctx.clearRect(0, 0, canvas.width, canvas.height);
     ctx.setTransform(this._ratio, 0, 0, this._ratio, 0, 0);
     const options = this.options;
-    const project2 = (position) => map.latLngToContainerPoint([position[1], position[0]]);
+    const project = (position) => map.latLngToContainerPoint([position[1], position[0]]);
     const entries = this._territories();
     entries.sort(([a], [b]) => {
       if (a === options.self)
@@ -28607,9 +28559,9 @@ class TerritoryLayer extends Layer {
     for (const [owner, territory] of entries) {
       if (territory.length === 0)
         continue;
-      this._drawTerritory(ctx, owner, territory, project2);
+      this._drawTerritory(ctx, owner, territory, project);
     }
-    this._drawCaptures(ctx, project2);
+    this._drawCaptures(ctx, project);
     if (this._animations.length > 0)
       this.redraw();
   }
@@ -28626,13 +28578,13 @@ class TerritoryLayer extends Layer {
       label: style.label ?? true
     };
   }
-  _drawTerritory(ctx, owner, territory, project2) {
+  _drawTerritory(ctx, owner, territory, project) {
     const style = this._styleFor(owner);
     const path = (polygon) => {
       ctx.beginPath();
       for (const ring of polygon) {
         ring.forEach((position, index) => {
-          const point = project2(position);
+          const point = project(position);
           if (index === 0)
             ctx.moveTo(point.x, point.y);
           else
@@ -28664,7 +28616,7 @@ class TerritoryLayer extends Layer {
       ctx.stroke();
     }
     if (style.label)
-      this._drawLabels(ctx, territory, style.color, project2);
+      this._drawLabels(ctx, territory, style.color, project);
   }
   _drawHatch(ctx, color) {
     ctx.save();
@@ -28684,7 +28636,7 @@ class TerritoryLayer extends Layer {
     ctx.stroke();
     ctx.restore();
   }
-  _drawLabels(ctx, territory, color, project2) {
+  _drawLabels(ctx, territory, color, project) {
     const options = this.options;
     const map = this._map;
     const minZoom = options.labelMinZoom ?? 13;
@@ -28693,7 +28645,7 @@ class TerritoryLayer extends Layer {
     for (const polygon of territory) {
       if (polygon.length === 0)
         continue;
-      const projected = polygon[0].map(project2);
+      const projected = polygon[0].map(project);
       const bounds = boundsOf(projected);
       const width = bounds.maxX - bounds.minX;
       const height = bounds.maxY - bounds.minY;
@@ -28714,7 +28666,7 @@ class TerritoryLayer extends Layer {
       ctx.restore();
     }
   }
-  _drawCaptures(ctx, project2) {
+  _drawCaptures(ctx, project) {
     const time = now2();
     const remaining = [];
     for (const animation of this._animations) {
@@ -28724,7 +28676,7 @@ class TerritoryLayer extends Layer {
       remaining.push(animation);
       const eased = 1 - (1 - progress) ** 3;
       const color = this.colorFor(animation.owner);
-      const projected = animation.ring.map(project2);
+      const projected = animation.ring.map(project);
       ctx.save();
       ctx.beginPath();
       projected.forEach((point, index) => {
@@ -29021,11 +28973,11 @@ class RouteEditor extends Layer {
   }
   onAdd(map) {
     const { color, casingColor, weight } = this.options;
-    const round2 = { lineCap: "round", lineJoin: "round" };
-    this._casing = new Polyline([], { ...round2, color: casingColor, weight: weight + 3, opacity: 0.35, interactive: false }).addTo(map);
-    this._line = new Polyline([], { ...round2, color, weight, opacity: 1, interactive: false }).addTo(map);
-    this._preview = new Polyline([], { ...round2, color, weight: 3, opacity: 0.9, dashArray: "2 8", interactive: false }).addTo(map);
-    this._hit = new Polyline([], { ...round2, color, weight: 22, opacity: 0, className: "tsmap-route-hit" }).addTo(map);
+    const round = { lineCap: "round", lineJoin: "round" };
+    this._casing = new Polyline([], { ...round, color: casingColor, weight: weight + 3, opacity: 0.35, interactive: false }).addTo(map);
+    this._line = new Polyline([], { ...round, color, weight, opacity: 1, interactive: false }).addTo(map);
+    this._preview = new Polyline([], { ...round, color, weight: 3, opacity: 0.9, dashArray: "2 8", interactive: false }).addTo(map);
+    this._hit = new Polyline([], { ...round, color, weight: 22, opacity: 0, className: "tsmap-route-hit" }).addTo(map);
     this._hit.on("pointerdown", this._onLineDown, this);
     this._unsubscribe = this._builder.onChange(() => this._redraw());
     this._redraw();
@@ -29073,10 +29025,10 @@ class RouteEditor extends Layer {
       this._builder.segments.forEach((segment, i) => {
         const from = waypoints[i];
         const to = waypoints[i + 1];
-        const key3 = [from, to].map((p) => `${p.lat},${p.lng}`).sort().join("|");
-        if (seen.has(key3) || this._pixelLength(segment) < opts.midpointMinPixels)
+        const key = [from, to].map((p) => `${p.lat},${p.lng}`).sort().join("|");
+        if (seen.has(key) || this._pixelLength(segment) < opts.midpointMinPixels)
           return;
-        seen.add(key3);
+        seen.add(key);
         wanted.push({ kind: "midpoint", point: halfway(segment), leg: [from, to] });
       });
     }
@@ -29182,10 +29134,10 @@ class RouteEditor extends Layer {
       this._redraw();
     }
   }
-  _at(builder, point, run2) {
+  _at(builder, point, run) {
     const index = builder.waypoints.findIndex((w) => samePoint2(w, point));
     if (index >= 0)
-      return run2(index);
+      return run(index);
   }
   _insertInto(builder, leg, point) {
     const waypoints = builder.waypoints;
@@ -30083,9 +30035,9 @@ class WMSTileLayer extends TileLayer {
   initialize(url, options) {
     super.initialize(url, options);
     const wmsParams = { ...this.defaultWmsParams };
-    for (const [key3, value] of Object.entries(options ?? {})) {
-      if (!(key3 in WMSTileLayer.prototype.options))
-        wmsParams[key3] = value;
+    for (const [key, value] of Object.entries(options ?? {})) {
+      if (!(key in WMSTileLayer.prototype.options))
+        wmsParams[key] = value;
     }
     const realRetina = this.options.detectRetina && Browser_default.retina ? 2 : 1;
     const tileSize = this.getTileSize();
@@ -30100,14 +30052,14 @@ class WMSTileLayer extends TileLayer {
     this.wmsParams[projectionKey] = this._crs.code;
     super.onAdd();
   }
-  getTileUrl(coords2) {
-    const tileBounds = this._tileCoordsToNwSe(coords2);
+  getTileUrl(coords) {
+    const tileBounds = this._tileCoordsToNwSe(coords);
     const crs = this._crs;
     const bounds = new Bounds(crs.project(tileBounds[0]), crs.project(tileBounds[1]));
     const min = bounds.min;
     const max = bounds.max;
     const bbox = (this._wmsVersion >= 1.3 && this._crs === EPSG4326 ? [min.y, min.x, max.y, max.x] : [min.x, min.y, max.x, max.y]).join(",");
-    const url = new URL(super.getTileUrl(coords2));
+    const url = new URL(super.getTileUrl(coords));
     for (const [k, v] of Object.entries({ ...this.wmsParams, bbox }))
       url.searchParams.append(this.options.uppercase ? k.toUpperCase() : k, String(v));
     return url.toString();
@@ -30803,15 +30755,15 @@ class CooperativeGesturesHandler extends Handler {
     return this.active() && e.pointerType === "touch";
   }
   _onTouchStart = (e) => {
-    const touch2 = e.touches.length === 1 ? e.touches[0] : undefined;
-    this._touchStart = touch2 ? { x: touch2.clientX, y: touch2.clientY } : null;
+    const touch = e.touches.length === 1 ? e.touches[0] : undefined;
+    this._touchStart = touch ? { x: touch.clientX, y: touch.clientY } : null;
   };
   _onTouchMove = (e) => {
     const start = this._touchStart;
-    const touch2 = e.touches.length === 1 ? e.touches[0] : undefined;
-    if (!start || !touch2 || !this.active())
+    const touch = e.touches.length === 1 ? e.touches[0] : undefined;
+    if (!start || !touch || !this.active())
       return;
-    if (Math.abs(touch2.clientX - start.x) + Math.abs(touch2.clientY - start.y) < 10)
+    if (Math.abs(touch.clientX - start.x) + Math.abs(touch.clientY - start.y) < 10)
       return;
     this._touchStart = null;
     this._show("touch");
@@ -31145,12 +31097,12 @@ class KeyboardHandler extends Handler {
   _onKeyDown(e) {
     if (e.altKey || e.ctrlKey || e.metaKey)
       return;
-    const key3 = e.code;
+    const key = e.code;
     const map = this._map;
     let offset;
-    if (key3 in this._panKeys) {
+    if (key in this._panKeys) {
       if (!map._panAnim || !map._panAnim._inProgress) {
-        offset = this._panKeys[key3];
+        offset = this._panKeys[key];
         if (e.shiftKey)
           offset = new Point(offset).multiplyBy(3);
         if (map.options.maxBounds)
@@ -31162,9 +31114,9 @@ class KeyboardHandler extends Handler {
           map.panBy(offset);
         }
       }
-    } else if (key3 in this._zoomKeys) {
-      map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key3]);
-    } else if (key3 === "Escape" && map._popup && map._popup.options.closeOnEscapeKey) {
+    } else if (key in this._zoomKeys) {
+      map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);
+    } else if (key === "Escape" && map._popup && map._popup.options.closeOnEscapeKey) {
       map.closePopup?.();
     } else {
       return;
@@ -32019,8 +31971,8 @@ class LayerEvaluator {
     this.zoom = zoom;
   }
   compiled(group, name, type) {
-    const key3 = `${group}:${name}`;
-    if (!this.cache.has(key3)) {
+    const key = `${group}:${name}`;
+    if (!this.cache.has(key)) {
       const value = this.layer[group]?.[name];
       let expression = null;
       if (value !== undefined) {
@@ -32030,9 +31982,9 @@ class LayerEvaluator {
           expression = null;
         }
       }
-      this.cache.set(key3, expression);
+      this.cache.set(key, expression);
     }
-    return this.cache.get(key3) ?? null;
+    return this.cache.get(key) ?? null;
   }
   get(group, name, type, feature) {
     const expression = this.compiled(group, name, type);
@@ -32088,8 +32040,8 @@ async function gunzipIfNeeded(bytes) {
   const stream = new Blob([bytes]).stream().pipeThrough(new DecompressionStream("gzip"));
   return new Uint8Array(await new Response(stream).arrayBuffer());
 }
-function tileUrl(template2, z, x, y) {
-  return template2.replaceAll("{z}", String(z)).replaceAll("{x}", String(x)).replaceAll("{y}", String(y)).replaceAll("{s}", "abc"[(x + y) % 3]);
+function tileUrl(template, z, x, y) {
+  return template.replaceAll("{z}", String(z)).replaceAll("{x}", String(x)).replaceAll("{y}", String(y)).replaceAll("{s}", "abc"[(x + y) % 3]);
 }
 async function resolveSource(source, doFetch, archiveFetch) {
   let tiles = Array.isArray(source.tiles) ? source.tiles : [];
@@ -32159,7 +32111,7 @@ function resolveFont(textFont, fallback) {
 }
 function textOf(value, properties) {
   if (typeof value === "string")
-    return value.replace(/\{([^}]+)\}/g, (_, key3) => String(properties[key3] ?? ""));
+    return value.replace(/\{([^}]+)\}/g, (_, key) => String(properties[key] ?? ""));
   if (value && typeof value === "object" && Array.isArray(value.sections))
     return value.sections.map((section) => section.text ?? "").join("");
   return value == null ? "" : String(value);
@@ -32254,8 +32206,8 @@ async function renderStaticMap(options) {
   const zoom = staticMapZoom(view);
   const fallbackFont = options.fontFamily ?? "Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif";
   const layers = (style.layers ?? []).filter((layer) => {
-    const visibility2 = layer.layout?.visibility;
-    if (visibility2 === "none")
+    const visibility = layer.layout?.visibility;
+    if (visibility === "none")
       return false;
     if (typeof layer.minzoom === "number" && zoom < layer.minzoom)
       return false;
@@ -32289,8 +32241,8 @@ async function renderStaticMap(options) {
     }
     const loaded = await Promise.all(wanted.map(async ({ x, y, wrapX }) => {
       try {
-        const template2 = resolved.tiles[(wrapX + y) % resolved.tiles.length];
-        const response = await tileFetch(tileUrl(template2, z, wrapX, y));
+        const template = resolved.tiles[(wrapX + y) % resolved.tiles.length];
+        const response = await tileFetch(tileUrl(template, z, wrapX, y));
         if (!response.ok)
           return null;
         const bytes = await gunzipIfNeeded(new Uint8Array(await response.arrayBuffer()));
@@ -32332,7 +32284,7 @@ async function renderStaticMap(options) {
         continue;
       const count = 2 ** loaded.z;
       const extent = tileLayer.extent || 4096;
-      const project2 = (gx, gy) => [
+      const project = (gx, gy) => [
         ((loaded.x + gx / extent) / count - view.left) * view.scale,
         ((loaded.y + gy / extent) / count - view.top) * view.scale
       ];
@@ -32365,7 +32317,7 @@ async function renderStaticMap(options) {
           const font = resolveFont(layer.layout?.["text-font"], fallbackFont);
           for (const ring of raw.loadGeometry()) {
             for (const point of ring) {
-              let [x, y] = project2(point.x, point.y);
+              let [x, y] = project(point.x, point.y);
               if (Array.isArray(offset) && offset.length === 2) {
                 x += Number(offset[0]) * size;
                 y += Number(offset[1]) * size;
@@ -32423,7 +32375,7 @@ async function renderStaticMap(options) {
           if (ring.length < 2)
             continue;
           d += ring.map((point, index) => {
-            const [x, y] = project2(point.x, point.y);
+            const [x, y] = project(point.x, point.y);
             return `${index === 0 ? "M" : "L"}${round2(x)} ${round2(y)}`;
           }).join("") + close;
         }
@@ -32466,7 +32418,7 @@ async function renderStaticMap(options) {
       const [left, top, right, bottom] = box;
       if (left < 4 || top < 4 || right > width - 4 || bottom > height - 4)
         continue;
-      if (options.reserve?.some((area2) => overlaps2(box, area2, 2)))
+      if (options.reserve?.some((area) => overlaps2(box, area, 2)))
         continue;
       if (options.avoid?.length) {
         const grown = [left - avoidPadding, top - avoidPadding, right + avoidPadding, bottom + avoidPadding];
@@ -32867,28 +32819,28 @@ class TurnByTurn extends Evented {
       const chosen = i === this.selected;
       const latlngs = route.geometry.map((p) => [p.lat, p.lng]);
       const casing = new Polyline(latlngs, { color: chosen ? BLUE_CASING : GREY_CASING, weight: 12, opacity: 1, lineCap: "round", lineJoin: "round", interactive: !chosen });
-      const fill2 = new Polyline(latlngs, { color: chosen ? BLUE : GREY, weight: 8, opacity: 1, lineCap: "round", lineJoin: "round", interactive: !chosen });
-      for (const line of [casing, fill2]) {
+      const fill = new Polyline(latlngs, { color: chosen ? BLUE : GREY, weight: 8, opacity: 1, lineCap: "round", lineJoin: "round", interactive: !chosen });
+      for (const line of [casing, fill]) {
         line.addTo(this.map);
         if (!chosen)
           line.on("click", () => this.selectRoute(i));
       }
-      this._lines.push(casing, fill2);
+      this._lines.push(casing, fill);
     }
     if (this.state === "navigating" || this.navigator) {
       const casing = new Polyline([], { color: TRAVELED_CASING, weight: 12, opacity: 1, lineCap: "round", lineJoin: "round", interactive: false }).addTo(this.map);
-      const fill2 = new Polyline([], { color: TRAVELED, weight: 8, opacity: 1, lineCap: "round", lineJoin: "round", interactive: false }).addTo(this.map);
-      this._traveled = [casing, fill2];
+      const fill = new Polyline([], { color: TRAVELED, weight: 8, opacity: 1, lineCap: "round", lineJoin: "round", interactive: false }).addTo(this.map);
+      this._traveled = [casing, fill];
     }
   }
-  _updateTraveled(distance2) {
+  _updateTraveled(distance) {
     const nav = this.navigator;
     if (!nav || !this._traveled.length)
       return;
     const latlngs = [];
-    for (let i = 0;i < nav.points.length && nav.along[i] < distance2; i++)
+    for (let i = 0;i < nav.points.length && nav.along[i] < distance; i++)
       latlngs.push([nav.points[i].lat, nav.points[i].lng]);
-    const here = nav.pointAt(distance2).location;
+    const here = nav.pointAt(distance).location;
     latlngs.push([here.lat, here.lng]);
     for (const line of this._traveled)
       line.setLatLngs(latlngs);
@@ -33155,6 +33107,46 @@ var tsMap = {
 if (typeof window !== "undefined")
   window.tsMap ??= tsMap;
 
+// src/types.ts
+var defaultMapConfiguration = {
+  provider: "ts_maps",
+  map_type: "standard",
+  shows_user_location: false,
+  user_tracking_mode: "none",
+  shows_compass: true,
+  shows_scale: true,
+  shows_traffic: false,
+  shows_buildings: true,
+  is_rotate_enabled: true,
+  is_scroll_enabled: true,
+  is_zoom_enabled: true,
+  is_pitch_enabled: true,
+  min_zoom: 0,
+  max_zoom: 22
+};
+var defaultMapCamera = {
+  center: { latitude: 0, longitude: 0 },
+  zoom: 15,
+  pitch: 0,
+  heading: 0
+};
+var markerColorHex = {
+  red: "#ff3b30",
+  green: "#34c759",
+  blue: "#007aff",
+  yellow: "#ffcc00",
+  orange: "#ff9500",
+  purple: "#af52de",
+  cyan: "#32ade6",
+  magenta: "#ff2d55"
+};
+var strokePatternDashes = {
+  solid: [],
+  dashed: [10, 5],
+  dotted: [2, 2],
+  dash_dot: [10, 5, 2, 5]
+};
+
 // src/adapters.ts
 function craftCoordToLatLng(coord) {
   return new LatLng(coord.latitude, coord.longitude);
@@ -33218,48 +33210,48 @@ function craftMarkerToMarker(m) {
 }
 function craftPolylineToPolyline(pl) {
   const latlngs = pl.coordinates.map(craftCoordToLatLng);
-  const polyline2 = new Polyline(latlngs, {
+  const polyline = new Polyline(latlngs, {
     color: markerColorHex[pl.stroke_color],
     weight: pl.stroke_width,
     dashArray: strokePatternDashes[pl.stroke_pattern].join(",") || undefined
   });
-  polyline2.__craftPolylineId = pl.id;
-  polyline2.__craftZIndex = pl.z_index;
-  return polyline2;
+  polyline.__craftPolylineId = pl.id;
+  polyline.__craftZIndex = pl.z_index;
+  return polyline;
 }
 function craftPolygonToPolygon(pg) {
   const rings = [pg.exterior_ring.map(craftCoordToLatLng)];
   for (const ring of pg.interior_rings)
     rings.push(ring.map(craftCoordToLatLng));
-  const polygon2 = new Polygon(rings, {
+  const polygon = new Polygon(rings, {
     color: markerColorHex[pg.stroke_color],
     weight: pg.stroke_width,
     fillColor: markerColorHex[pg.fill_color],
     fillOpacity: pg.fill_opacity
   });
-  polygon2.__craftPolygonId = pg.id;
-  polygon2.__craftZIndex = pg.z_index;
-  return polygon2;
+  polygon.__craftPolygonId = pg.id;
+  polygon.__craftZIndex = pg.z_index;
+  return polygon;
 }
 function craftCircleToCircle(c) {
-  const circle2 = new Circle(craftCoordToLatLng(c.center), {
+  const circle = new Circle(craftCoordToLatLng(c.center), {
     radius: c.radius_meters,
     color: markerColorHex[c.stroke_color],
     weight: c.stroke_width,
     fillColor: markerColorHex[c.fill_color],
     fillOpacity: c.fill_opacity
   });
-  circle2.__craftCircleId = c.id;
-  return circle2;
+  circle.__craftCircleId = c.id;
+  return circle;
 }
-function regionFromBounds(coords2) {
-  if (coords2.length === 0)
+function regionFromBounds(coords) {
+  if (coords.length === 0)
     return null;
   let minLat = 90;
   let maxLat = -90;
   let minLng = 180;
   let maxLng = -180;
-  for (const c of coords2) {
+  for (const c of coords) {
     if (c.latitude < minLat)
       minLat = c.latitude;
     if (c.latitude > maxLat)
@@ -33281,16 +33273,16 @@ function regionFromBounds(coords2) {
   };
 }
 export {
-  regionFromBounds,
-  latLngToCraftCoord,
-  craftRegionToBounds,
-  craftPolylineToPolyline,
-  craftPolygonToPolygon,
-  craftMarkerToMarker,
-  craftCoordToLatLng,
-  craftCircleToCircle,
-  craftCameraToOptions,
-  craftBoundingBoxToBounds,
+  boundsToCraftRegion,
   cameraToCamera,
-  boundsToCraftRegion
+  craftBoundingBoxToBounds,
+  craftCameraToOptions,
+  craftCircleToCircle,
+  craftCoordToLatLng,
+  craftMarkerToMarker,
+  craftPolygonToPolygon,
+  craftPolylineToPolyline,
+  craftRegionToBounds,
+  latLngToCraftCoord,
+  regionFromBounds
 };