@deck.gl/carto 9.3.2 → 9.3.4

package/dist/cartoPropertiesTile-worker.js

@@ -5562,7 +5562,7 @@
   };
 
   // src/layers/schema/carto-properties-tile-loader.ts
-  var VERSION = true ? "9.3.2" : "latest";
+  var VERSION = true ? "9.3.4" : "latest";
   var id = "cartoPropertiesTile";
   var DEFAULT_OPTIONS = {
     cartoPropertiesTile: {

package/dist/cartoRasterTile-worker.js

@@ -5548,7 +5548,7 @@
   };
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.3.2" : "latest";
+  var VERSION = true ? "9.3.4" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -5620,7 +5620,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.3.2" : "latest";
+  var VERSION = true ? "9.3.4" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -6167,7 +6167,7 @@
   };
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.3.2" : "latest";
+  var VERSION = true ? "9.3.4" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -8725,6 +8725,28 @@ void main(void) {
   var import_layers5 = __toESM(require_layers(), 1);
 
   // src/layers/label-utils.ts
+  var FEATURE_BBOX_PROP = "_carto_bbox";
+  function parseFeatureBbox(value) {
+    if (typeof value !== "string")
+      return null;
+    const parts = value.split(",");
+    if (parts.length !== 4)
+      return null;
+    return parts.map(Number);
+  }
+  function latToMercatorY(lat) {
+    return Math.log(Math.tan(Math.PI / 4 + lat * Math.PI / 360));
+  }
+  function worldToTile(point3, geoBbox, tileBbox) {
+    const xFrac = (point3[0] - geoBbox.west) / (geoBbox.east - geoBbox.west);
+    const x = tileBbox.west + xFrac * (tileBbox.east - tileBbox.west);
+    const mercY = latToMercatorY(point3[1]);
+    const mercNorth = latToMercatorY(geoBbox.north);
+    const mercSouth = latToMercatorY(geoBbox.south);
+    const yFrac = (mercNorth - mercY) / (mercNorth - mercSouth);
+    const y = tileBbox.south + yFrac * (tileBbox.north - tileBbox.south);
+    return [x, y];
+  }
   function createPointsFromLines(lines, uniqueIdProperty) {
     const hasNumericUniqueId = uniqueIdProperty ? uniqueIdProperty in lines.numericProps : false;
     const idToLineInfo = /* @__PURE__ */ new Map();
@@ -8771,8 +8793,12 @@ void main(void) {
       properties
     );
   }
-  function createPointsFromPolygons(polygons, tileBbox, props) {
-    const { west, south, east, north } = tileBbox;
+  function createPointsFromPolygons(polygons, tileBbox, props, geoBbox) {
+    const useBbox = Boolean(
+      geoBbox && polygons.properties.length > 0 && FEATURE_BBOX_PROP in polygons.properties[0]
+    );
+    const boundsBbox = useBbox ? geoBbox : tileBbox;
+    const { west, south, east, north } = boundsBbox;
     const tileArea = (east - west) * (north - south);
     const minPolygonArea = tileArea * 1e-4;
     const positions = [];
@@ -8783,55 +8809,77 @@ void main(void) {
       polygons.polygonIndices.value.length - 1,
       polygons.numericProps
     );
+    const isMVT = useBbox && geoBbox !== tileBbox;
     let pointIndex = 0;
     let triangleIndex = 0;
     const { extruded } = props;
     for (let i = 0; i < polygons.polygonIndices.value.length - 1; i++) {
       const startIndex = polygons.polygonIndices.value[i];
       const endIndex = polygons.polygonIndices.value[i + 1];
-      if (getPolygonArea(polygons, i) < minPolygonArea) {
-        continue;
-      }
-      const centroid = getPolygonCentroid(polygons, i);
-      let maxArea = -1;
-      let largestTriangleCenter = [0, 0];
-      let centroidIsInside = false;
-      while (triangleIndex < polygons.triangles.value.length) {
-        const i1 = polygons.triangles.value[triangleIndex];
-        if (i1 >= endIndex) {
-          break;
+      let labelPoint = null;
+      let preferredPoint = null;
+      if (useBbox) {
+        const featureId2 = polygons.featureIds.value[startIndex];
+        const bbox2 = parseFeatureBbox(polygons.properties[featureId2][FEATURE_BBOX_PROP]);
+        if (bbox2) {
+          const [bboxWest, bboxSouth, bboxEast, bboxNorth] = bbox2;
+          const bboxArea = (bboxEast - bboxWest) * (bboxNorth - bboxSouth);
+          if (bboxArea >= minPolygonArea) {
+            const center = [(bboxWest + bboxEast) / 2, (bboxSouth + bboxNorth) / 2];
+            if (isPointInBounds(center, geoBbox)) {
+              preferredPoint = isMVT ? worldToTile(center, geoBbox, tileBbox) : center;
+            }
+          }
         }
-        if (centroidIsInside) {
-          triangleIndex += 3;
+      } else {
+        if (getPolygonArea(polygons, i) < minPolygonArea) {
           continue;
         }
-        const i2 = polygons.triangles.value[triangleIndex + 1];
-        const i3 = polygons.triangles.value[triangleIndex + 2];
-        const v1 = polygons.positions.value.subarray(
-          i1 * polygons.positions.size,
-          i1 * polygons.positions.size + polygons.positions.size
-        );
-        const v2 = polygons.positions.value.subarray(
-          i2 * polygons.positions.size,
-          i2 * polygons.positions.size + polygons.positions.size
-        );
-        const v3 = polygons.positions.value.subarray(
-          i3 * polygons.positions.size,
-          i3 * polygons.positions.size + polygons.positions.size
-        );
-        if (isPointInTriangle(centroid, v1, v2, v3)) {
-          centroidIsInside = true;
-        } else {
-          const area = getTriangleArea(v1, v2, v3);
-          if (area > maxArea) {
-            maxArea = area;
-            largestTriangleCenter = [(v1[0] + v2[0] + v3[0]) / 3, (v1[1] + v2[1] + v3[1]) / 3];
+        preferredPoint = getPolygonCentroid(polygons, i);
+      }
+      if (preferredPoint) {
+        let maxArea = -1;
+        let largestTriangleCenter = [0, 0];
+        let isInside = false;
+        while (triangleIndex < polygons.triangles.value.length) {
+          const i1 = polygons.triangles.value[triangleIndex];
+          if (i1 >= endIndex)
+            break;
+          if (isInside) {
+            triangleIndex += 3;
+            continue;
+          }
+          const i2 = polygons.triangles.value[triangleIndex + 1];
+          const i3 = polygons.triangles.value[triangleIndex + 2];
+          const v1 = polygons.positions.value.subarray(
+            i1 * polygons.positions.size,
+            i1 * polygons.positions.size + polygons.positions.size
+          );
+          const v2 = polygons.positions.value.subarray(
+            i2 * polygons.positions.size,
+            i2 * polygons.positions.size + polygons.positions.size
+          );
+          const v3 = polygons.positions.value.subarray(
+            i3 * polygons.positions.size,
+            i3 * polygons.positions.size + polygons.positions.size
+          );
+          if (isPointInTriangle(preferredPoint, v1, v2, v3)) {
+            isInside = true;
+          } else {
+            const area = getTriangleArea(v1, v2, v3);
+            if (area > maxArea) {
+              maxArea = area;
+              largestTriangleCenter = [(v1[0] + v2[0] + v3[0]) / 3, (v1[1] + v2[1] + v3[1]) / 3];
+            }
           }
+          triangleIndex += 3;
+        }
+        const candidate = isInside ? preferredPoint : largestTriangleCenter;
+        if (isPointInBounds(candidate, tileBbox)) {
+          labelPoint = candidate;
         }
-        triangleIndex += 3;
       }
-      const labelPoint = centroidIsInside ? centroid : largestTriangleCenter;
-      if (isPointInBounds(labelPoint, tileBbox)) {
+      if (labelPoint) {
         positions.push(...labelPoint);
         const featureId2 = polygons.featureIds.value[startIndex];
         if (extruded) {
@@ -9093,7 +9141,8 @@ void main(void) {
           labelData.points = createPointsFromPolygons(
             props.data.polygons,
             this.state.mvt ? MVT_BBOX : tileBbox,
-            props
+            props,
+            tileBbox
           );
         }
         subLayers.push(

package/dist/index.cjs

@@ -689,7 +689,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION = true ? "9.3.2" : "latest";
+var VERSION = true ? "9.3.4" : "latest";
 var id = "cartoSpatialTile";
 var DEFAULT_OPTIONS = {
   cartoSpatialTile: {
@@ -2052,7 +2052,7 @@ var TileReader3 = class {
 };
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION2 = true ? "9.3.2" : "latest";
+var VERSION2 = true ? "9.3.4" : "latest";
 var id2 = "cartoRasterTile";
 var DEFAULT_OPTIONS2 = {
   cartoRasterTile: {
@@ -2165,7 +2165,7 @@ var TileReader4 = class {
 };
 
 // dist/layers/schema/carto-properties-tile-loader.js
-var VERSION3 = true ? "9.3.2" : "latest";
+var VERSION3 = true ? "9.3.4" : "latest";
 var id3 = "cartoPropertiesTile";
 var DEFAULT_OPTIONS3 = {
   cartoPropertiesTile: {
@@ -2194,7 +2194,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION4 = true ? "9.3.2" : "latest";
+var VERSION4 = true ? "9.3.4" : "latest";
 var id4 = "cartoVectorTile";
 var DEFAULT_OPTIONS4 = {
   cartoVectorTile: {
@@ -2256,6 +2256,28 @@ var import_geo_layers8 = require("@deck.gl/geo-layers");
 var import_layers5 = require("@deck.gl/layers");
 
 // dist/layers/label-utils.js
+var FEATURE_BBOX_PROP = "_carto_bbox";
+function parseFeatureBbox(value) {
+  if (typeof value !== "string")
+    return null;
+  const parts = value.split(",");
+  if (parts.length !== 4)
+    return null;
+  return parts.map(Number);
+}
+function latToMercatorY(lat) {
+  return Math.log(Math.tan(Math.PI / 4 + lat * Math.PI / 360));
+}
+function worldToTile(point, geoBbox, tileBbox) {
+  const xFrac = (point[0] - geoBbox.west) / (geoBbox.east - geoBbox.west);
+  const x = tileBbox.west + xFrac * (tileBbox.east - tileBbox.west);
+  const mercY = latToMercatorY(point[1]);
+  const mercNorth = latToMercatorY(geoBbox.north);
+  const mercSouth = latToMercatorY(geoBbox.south);
+  const yFrac = (mercNorth - mercY) / (mercNorth - mercSouth);
+  const y = tileBbox.south + yFrac * (tileBbox.north - tileBbox.south);
+  return [x, y];
+}
 function createPointsFromLines(lines, uniqueIdProperty) {
   const hasNumericUniqueId = uniqueIdProperty ? uniqueIdProperty in lines.numericProps : false;
   const idToLineInfo = /* @__PURE__ */ new Map();
@@ -2296,8 +2318,10 @@ function createPointsFromLines(lines, uniqueIdProperty) {
   }
   return createBinaryPointFeature(positions, featureIds, globalFeatureIds, numericProps, properties);
 }
-function createPointsFromPolygons(polygons, tileBbox, props) {
-  const { west, south, east, north } = tileBbox;
+function createPointsFromPolygons(polygons, tileBbox, props, geoBbox) {
+  const useBbox = Boolean(geoBbox && polygons.properties.length > 0 && FEATURE_BBOX_PROP in polygons.properties[0]);
+  const boundsBbox = useBbox ? geoBbox : tileBbox;
+  const { west, south, east, north } = boundsBbox;
   const tileArea = (east - west) * (north - south);
   const minPolygonArea = tileArea * 1e-4;
   const positions = [];
@@ -2305,46 +2329,68 @@ function createPointsFromPolygons(polygons, tileBbox, props) {
   const featureIds = [];
   const globalFeatureIds = [];
   const numericProps = initializeNumericProps(polygons.polygonIndices.value.length - 1, polygons.numericProps);
+  const isMVT = useBbox && geoBbox !== tileBbox;
   let pointIndex = 0;
   let triangleIndex = 0;
   const { extruded } = props;
   for (let i = 0; i < polygons.polygonIndices.value.length - 1; i++) {
     const startIndex = polygons.polygonIndices.value[i];
     const endIndex = polygons.polygonIndices.value[i + 1];
-    if (getPolygonArea(polygons, i) < minPolygonArea) {
-      continue;
-    }
-    const centroid = getPolygonCentroid(polygons, i);
-    let maxArea = -1;
-    let largestTriangleCenter = [0, 0];
-    let centroidIsInside = false;
-    while (triangleIndex < polygons.triangles.value.length) {
-      const i1 = polygons.triangles.value[triangleIndex];
-      if (i1 >= endIndex) {
-        break;
+    let labelPoint = null;
+    let preferredPoint = null;
+    if (useBbox) {
+      const featureId = polygons.featureIds.value[startIndex];
+      const bbox = parseFeatureBbox(polygons.properties[featureId][FEATURE_BBOX_PROP]);
+      if (bbox) {
+        const [bboxWest, bboxSouth, bboxEast, bboxNorth] = bbox;
+        const bboxArea = (bboxEast - bboxWest) * (bboxNorth - bboxSouth);
+        if (bboxArea >= minPolygonArea) {
+          const center = [(bboxWest + bboxEast) / 2, (bboxSouth + bboxNorth) / 2];
+          if (isPointInBounds(center, geoBbox)) {
+            preferredPoint = isMVT ? worldToTile(center, geoBbox, tileBbox) : center;
+          }
+        }
       }
-      if (centroidIsInside) {
-        triangleIndex += 3;
+    } else {
+      if (getPolygonArea(polygons, i) < minPolygonArea) {
         continue;
       }
-      const i2 = polygons.triangles.value[triangleIndex + 1];
-      const i3 = polygons.triangles.value[triangleIndex + 2];
-      const v1 = polygons.positions.value.subarray(i1 * polygons.positions.size, i1 * polygons.positions.size + polygons.positions.size);
-      const v2 = polygons.positions.value.subarray(i2 * polygons.positions.size, i2 * polygons.positions.size + polygons.positions.size);
-      const v3 = polygons.positions.value.subarray(i3 * polygons.positions.size, i3 * polygons.positions.size + polygons.positions.size);
-      if (isPointInTriangle(centroid, v1, v2, v3)) {
-        centroidIsInside = true;
-      } else {
-        const area = getTriangleArea(v1, v2, v3);
-        if (area > maxArea) {
-          maxArea = area;
-          largestTriangleCenter = [(v1[0] + v2[0] + v3[0]) / 3, (v1[1] + v2[1] + v3[1]) / 3];
+      preferredPoint = getPolygonCentroid(polygons, i);
+    }
+    if (preferredPoint) {
+      let maxArea = -1;
+      let largestTriangleCenter = [0, 0];
+      let isInside = false;
+      while (triangleIndex < polygons.triangles.value.length) {
+        const i1 = polygons.triangles.value[triangleIndex];
+        if (i1 >= endIndex)
+          break;
+        if (isInside) {
+          triangleIndex += 3;
+          continue;
         }
+        const i2 = polygons.triangles.value[triangleIndex + 1];
+        const i3 = polygons.triangles.value[triangleIndex + 2];
+        const v1 = polygons.positions.value.subarray(i1 * polygons.positions.size, i1 * polygons.positions.size + polygons.positions.size);
+        const v2 = polygons.positions.value.subarray(i2 * polygons.positions.size, i2 * polygons.positions.size + polygons.positions.size);
+        const v3 = polygons.positions.value.subarray(i3 * polygons.positions.size, i3 * polygons.positions.size + polygons.positions.size);
+        if (isPointInTriangle(preferredPoint, v1, v2, v3)) {
+          isInside = true;
+        } else {
+          const area = getTriangleArea(v1, v2, v3);
+          if (area > maxArea) {
+            maxArea = area;
+            largestTriangleCenter = [(v1[0] + v2[0] + v3[0]) / 3, (v1[1] + v2[1] + v3[1]) / 3];
+          }
+        }
+        triangleIndex += 3;
+      }
+      const candidate = isInside ? preferredPoint : largestTriangleCenter;
+      if (isPointInBounds(candidate, tileBbox)) {
+        labelPoint = candidate;
       }
-      triangleIndex += 3;
     }
-    const labelPoint = centroidIsInside ? centroid : largestTriangleCenter;
-    if (isPointInBounds(labelPoint, tileBbox)) {
+    if (labelPoint) {
       positions.push(...labelPoint);
       const featureId = polygons.featureIds.value[startIndex];
       if (extruded) {
@@ -2582,7 +2628,7 @@ var VectorTileLayer = class extends import_geo_layers8.MVTLayer {
         labelData.points = createPointsFromLines(props.data.lines, typeof props.autoLabels === "object" ? props.autoLabels.uniqueIdProperty : void 0);
       }
       if (props.data.polygons && props.data.polygons.positions.value.length > 0) {
-        labelData.points = createPointsFromPolygons(props.data.polygons, this.state.mvt ? MVT_BBOX : tileBbox, props);
+        labelData.points = createPointsFromPolygons(props.data.polygons, this.state.mvt ? MVT_BBOX : tileBbox, props, tileBbox);
       }
       subLayers.push(subLayers[0].clone({
         id: `${props.id}-labels`,