maplibre-gl-layers 0.4.0 → 0.5.0

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 /*!
  * name: maplibre-gl-layers
- * version: 0.4.0
+ * version: 0.5.0
  * description: MapLibre's layer extension library enabling the display, movement, and modification of large numbers of dynamic sprite images
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/maplibre-gl-layers.git
- * git.commit.hash: 366a9e1190bfe770b4002a06284ff627188b5c76
+ * git.commit.hash: ce37eea48b788c36b4bf98cdfce83b95a85833ee
  */
 
 export * from './types.ts';

package/dist/index.mjs

@@ -1,11 +1,11 @@
 /*!
  * name: maplibre-gl-layers
- * version: 0.4.0
+ * version: 0.5.0
  * description: MapLibre's layer extension library enabling the display, movement, and modification of large numbers of dynamic sprite images
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/maplibre-gl-layers.git
- * git.commit.hash: 366a9e1190bfe770b4002a06284ff627188b5c76
+ * git.commit.hash: ce37eea48b788c36b4bf98cdfce83b95a85833ee
  */
 const UNLIMITED_SPRITE_SCALING_OPTIONS = {
   metersPerPixel: 1,
@@ -21517,25 +21517,30 @@ const calculateDistanceAndBearingMeters = (from, to) => {
 const clampSpritePixelSize = (width, height, spriteMinPixel, spriteMaxPixel) => {
   const largest = Math.max(width, height);
   if (!Number.isFinite(largest) || largest <= 0) {
-    return { width, height };
+    return { width, height, scaleAdjustment: 1 };
   }
   let nextWidth = width;
   let nextHeight = height;
+  let scaleAdjustment = 1;
+  let adjustedLargest = largest;
   if (spriteMinPixel > 0 && largest < spriteMinPixel) {
     const factor = spriteMinPixel / largest;
     nextWidth *= factor;
     nextHeight *= factor;
+    scaleAdjustment *= factor;
+    adjustedLargest *= factor;
   }
-  if (spriteMaxPixel > 0 && largest > spriteMaxPixel) {
-    const factor = spriteMaxPixel / largest;
+  if (spriteMaxPixel > 0 && adjustedLargest > spriteMaxPixel) {
+    const factor = spriteMaxPixel / adjustedLargest;
     nextWidth *= factor;
     nextHeight *= factor;
+    scaleAdjustment *= factor;
   }
-  return { width: nextWidth, height: nextHeight };
+  return { width: nextWidth, height: nextHeight, scaleAdjustment };
 };
 const calculateBillboardPixelDimensions = (imageWidth, imageHeight, baseMetersPerPixel, imageScale, zoomScaleFactor, effectivePixelsPerMeter, spriteMinPixel, spriteMaxPixel) => {
   if (!imageWidth || !imageHeight || imageWidth <= 0 || imageHeight <= 0 || baseMetersPerPixel <= 0 || effectivePixelsPerMeter <= 0) {
-    return { width: 0, height: 0 };
+    return { width: 0, height: 0, scaleAdjustment: 1 };
   }
   const scaleFactor = baseMetersPerPixel * imageScale * zoomScaleFactor * effectivePixelsPerMeter;
   const rawWidth = ensureFinite(imageWidth * scaleFactor);
@@ -21547,10 +21552,10 @@ const calculateBillboardPixelDimensions = (imageWidth, imageHeight, baseMetersPe
     spriteMaxPixel
   );
 };
-const calculateBillboardOffsetPixels = (offset, imageScale, zoomScaleFactor, effectivePixelsPerMeter) => {
+const calculateBillboardOffsetPixels = (offset, imageScale, zoomScaleFactor, effectivePixelsPerMeter, sizeScaleAdjustment = 1) => {
   var _a, _b;
   const offsetMeters = ((_a = offset == null ? void 0 : offset.offsetMeters) != null ? _a : 0) * imageScale * zoomScaleFactor;
-  const offsetPixels = offsetMeters * effectivePixelsPerMeter;
+  const offsetPixels = offsetMeters * effectivePixelsPerMeter * sizeScaleAdjustment;
   const offsetRad = ((_b = offset == null ? void 0 : offset.offsetDeg) != null ? _b : 0) * DEG2RAD;
   return {
     x: offsetPixels * Math.sin(offsetRad),
@@ -21577,11 +21582,12 @@ const calculateBillboardAnchorShiftPixels = (halfWidth, halfHeight, anchor, tota
 const calculateSurfaceWorldDimensions = (imageWidth, imageHeight, baseMetersPerPixel, imageScale, zoomScaleFactor, options) => {
   var _a, _b;
   if (!imageWidth || !imageHeight || imageWidth <= 0 || imageHeight <= 0 || baseMetersPerPixel <= 0) {
-    return { width: 0, height: 0 };
+    return { width: 0, height: 0, scaleAdjustment: 1 };
   }
   const scaleFactor = baseMetersPerPixel * imageScale * zoomScaleFactor;
   let width = ensureFinite(imageWidth * scaleFactor);
   let height = ensureFinite(imageHeight * scaleFactor);
+  let scaleAdjustment = 1;
   const effectivePixelsPerMeter = (options == null ? void 0 : options.effectivePixelsPerMeter) !== void 0 ? options.effectivePixelsPerMeter : 0;
   const spriteMinPixel = (_a = options == null ? void 0 : options.spriteMinPixel) != null ? _a : 0;
   const spriteMaxPixel = (_b = options == null ? void 0 : options.spriteMaxPixel) != null ? _b : 0;
@@ -21601,11 +21607,12 @@ const calculateSurfaceWorldDimensions = (imageWidth, imageHeight, baseMetersPerP
         if (scale !== 1) {
           width *= scale;
           height *= scale;
+          scaleAdjustment *= scale;
         }
       }
     }
   }
-  return { width, height };
+  return { width, height, scaleAdjustment };
 };
 const calculateSurfaceAnchorShiftMeters = (halfWidthMeters, halfHeightMeters, anchor, totalRotateDeg) => {
   var _a, _b;
@@ -21624,7 +21631,7 @@ const calculateSurfaceAnchorShiftMeters = (halfWidthMeters, halfHeightMeters, an
   const north = -anchorEast * sinR - anchorNorth * cosR;
   return { east, north };
 };
-const calculateSurfaceOffsetMeters = (offset, imageScale, zoomScaleFactor) => {
+const calculateSurfaceOffsetMeters = (offset, imageScale, zoomScaleFactor, sizeScaleAdjustment = 1) => {
   var _a, _b;
   const offsetMeters = ((_a = offset == null ? void 0 : offset.offsetMeters) != null ? _a : 0) * imageScale * zoomScaleFactor;
   if (offsetMeters === 0) {
@@ -21632,8 +21639,8 @@ const calculateSurfaceOffsetMeters = (offset, imageScale, zoomScaleFactor) => {
   }
   const rad = ((_b = offset == null ? void 0 : offset.offsetDeg) != null ? _b : 0) * DEG2RAD;
   return {
-    east: offsetMeters * Math.sin(rad),
-    north: offsetMeters * Math.cos(rad)
+    east: offsetMeters * Math.sin(rad) * sizeScaleAdjustment,
+    north: offsetMeters * Math.cos(rad) * sizeScaleAdjustment
   };
 };
 const MIN_COS_LAT = 1e-6;
@@ -21781,7 +21788,8 @@ const calculateBillboardCenterPosition = (params) => {
     offset,
     imageScale,
     zoomScaleFactor,
-    effectivePixelsPerMeter
+    effectivePixelsPerMeter,
+    pixelDims.scaleAdjustment
   );
   const centerX = base.x + offsetShift.x;
   const centerY = base.y - offsetShift.y;
@@ -21902,7 +21910,8 @@ const calculateSurfaceCenterPosition = (params) => {
   const offsetMeters = calculateSurfaceOffsetMeters(
     offset,
     imageScale,
-    zoomScaleFactor
+    zoomScaleFactor,
+    worldDims.scaleAdjustment
   );
   const totalEast = anchorShiftMeters.east + offsetMeters.east;
   const totalNorth = anchorShiftMeters.north + offsetMeters.north;
@@ -23433,7 +23442,8 @@ const createSpriteLayer = (options) => {
         const offsetMeters = calculateSurfaceOffsetMeters(
           offsetDef,
           imageScale,
-          zoomScaleFactor
+          zoomScaleFactor,
+          surfaceCenter.worldDimensions.scaleAdjustment
         );
         const cornerDisplacements = calculateSurfaceCornerDisplacements({
           worldWidthMeters: surfaceCenter.worldDimensions.width,
@@ -23641,7 +23651,8 @@ const createSpriteLayer = (options) => {
           const offsetMeters = calculateSurfaceOffsetMeters(
             offsetResolved,
             imageScale,
-            zoomScaleFactor
+            zoomScaleFactor,
+            worldDims.scaleAdjustment
           );
           const cornerDisplacements = calculateSurfaceCornerDisplacements({
             worldWidthMeters: worldDims.width,