@pirireis/webglobeplugins 1.2.5 → 1.2.6

package/Math/tessellation/tile-merger.js

@@ -214,25 +214,27 @@ function fillFromChildren(targetMesh, targetDimensionLength, childrenMeshes, sou
 function moveMeshToMergedMesh(targetMesh, targetDimensionLength, sourceMesh, sourceDimensionLength, startX, startY) {
     // sourceMesh[0][0] is south west corner
     // targetMesh[0][0] is top left corner
-    let targetIndex = startY * targetDimensionLength + startX;
-    for (let y = 0; y < sourceDimensionLength; y++) {
+    // startX/startY can be negative (parent fallback near left/top edges). Clamp writes to target bounds.
+    const dstX0 = Math.max(0, startX);
+    const dstY0 = Math.max(0, startY);
+    const dstX1 = Math.min(targetDimensionLength, startX + sourceDimensionLength);
+    const dstY1 = Math.min(targetDimensionLength, startY + sourceDimensionLength);
+    if (dstX1 <= dstX0 || dstY1 <= dstY0) {
+        return;
+    }
+    for (let dstY = dstY0; dstY < dstY1; dstY++) {
+        const srcY = dstY - startY;
         // Read from bottom to top (source mesh convention)
-        const vertical = sourceMesh[sourceDimensionLength - y - 1];
-        for (let x = 0; x < sourceDimensionLength; x++) {
-            const value = vertical[x];
-            // const currentValue = targetMesh[targetIndex];
-            // TODO: investigate why overlapping values are not the same. cancel parent filling
-            // if (!isNaN(value) && value !== 0 && currentValue !== 0) {
-            //     if (currentValue !== value) {
-            //         console.warn(`Overlapping values are not the same: currentValue=${currentValue}, newValue=${value}`);
-            //     }
-            // }
+        const vertical = sourceMesh[sourceDimensionLength - srcY - 1];
+        let targetIndex = dstY * targetDimensionLength + dstX0;
+        for (let dstX = dstX0; dstX < dstX1; dstX++) {
+            const srcX = dstX - startX;
+            const value = vertical[srcX];
             if (isNaN(targetMesh[targetIndex])) {
                 targetMesh[targetIndex] = value;
             }
             targetIndex++;
         }
-        targetIndex += targetDimensionLength - sourceDimensionLength;
     }
 }
 function limitCheck(limit, limitRange = 12) {
@@ -314,7 +316,8 @@ function mergeTiles(tilesMetaData, mergeCount = 8, tileDimensionLength = 5, proc
                 const meshOffsetY = j * (tileDimensionLength - 1);
                 if (tile) {
                     // 1. Direct Tile Found
-                    nearestValuePadding.insert(tile.x, tile.y); // Using original coordinates for padding logic
+                    // Track filled grid slot (relative coordinates)
+                    nearestValuePadding.insert(i, j);
                     moveMeshToMergedMesh(mergedMesh, mergedMeshDimLength, tile.mesh, tileDimensionLength, meshOffsetX, meshOffsetY);
                     // Update BBox Limits
                     // We simply expand the LL/UR. 
@@ -347,6 +350,8 @@ function mergeTiles(tilesMetaData, mergeCount = 8, tileDimensionLength = 5, proc
                     const parentKey = keyMethod(parentTileCoord.x, parentTileCoord.y, parentTileCoord.level);
                     const parentTile = tilesMetaData.tileMap.get(parentKey);
                     if (parentTile) {
+                        // Track filled grid slot (relative coordinates)
+                        nearestValuePadding.insert(i, j);
                         const populatedMesh = populateTileIntoHigherZoomLevel(parentTile.mesh, tileDimensionLength, tileDimensionLength * 2 - 1);
                         // Adjust offset for parent logic
                         // If current tile is odd (right/bottom), the parent mesh drawing needs to shift back
@@ -354,14 +359,6 @@ function mergeTiles(tilesMetaData, mergeCount = 8, tileDimensionLength = 5, proc
                         const parentDrawOffsetX = meshOffsetX - (tileX % 2) * (tileDimensionLength - 1);
                         const parentDrawOffsetY = meshOffsetY - (tileY % 2) * (tileDimensionLength - 1);
                         moveMeshToMergedMesh(mergedMesh, mergedMeshDimLength, populatedMesh, tileDimensionLength * 2 - 1, parentDrawOffsetX, parentDrawOffsetY);
-                        // Padding logic for parents
-                        const xP = parentTile.x * 2;
-                        const yP = parentTile.y * 2;
-                        for (let dx = 0; dx < 2; dx++) {
-                            for (let dy = 0; dy < 2; dy++) {
-                                nearestValuePadding.insert(xP + dx, yP + dy);
-                            }
-                        }
                     }
                     else {
                         // 3. Children Tile Fallback
@@ -383,7 +380,8 @@ function mergeTiles(tilesMetaData, mergeCount = 8, tileDimensionLength = 5, proc
                             }
                         }
                         if (anyChildren > 0) {
-                            nearestValuePadding.insert(tileX, tileY);
+                            // Track filled grid slot (relative coordinates)
+                            nearestValuePadding.insert(i, j);
                             fillFromChildren(mergedMesh, mergedMeshDimLength, childrenTiles, tileDimensionLength, meshOffsetX, meshOffsetY);
                         }
                     }
@@ -406,7 +404,8 @@ function mergeTiles(tilesMetaData, mergeCount = 8, tileDimensionLength = 5, proc
         // However, the clamp function usually expects absolute coordinates. 
         // Given the new "Grid" approach, the mesh is always locally 0 to mergeCount in valid data.
         // We pass the grid-relative limits to clamp.
-        nearestValuePadding.clamp(mergedMesh, 0, 0, mergeCount, mergeCount);
+        // grid slots are 0..mergeCount-1
+        nearestValuePadding.clamp(mergedMesh, 0, 0, mergeCount - 1, mergeCount - 1);
         nearestValuePadding.clear();
         // Calculate Cover Ratio
         // How much of the mesh grid (mergeCount) is covered by actual data range?

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pirireis/webglobeplugins",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT",