@pirireis/webglobeplugins 1.1.8 → 1.1.9

package/Math/tessellation/triangle-tessellation.js

@@ -267,10 +267,12 @@ function filterEdgePointTriangles(indeces, edgePointIndices) {
 //     };  
 // }
 export function partialTessellation(triangleMeta, limits, innerCuts, calculateRealEdgeArc = false) {
-    // TODO: pointMap can be local variable and cleaned after function call to avoid reinitialization overhead
-    const pointMap = new Map(); // Key: "lon|lat", Value: index
+    // De-dupe strategy: key points by *float32 Mercator XY*.
+    // This aligns CPU vertex identity with what the GPU will see after float32 uploads,
+    // preventing near-duplicate points from creating skinny / unstable triangles.
+    const pointMap = new Map();
     const allVec3s = [];
-    const allLongLats = [];
+    const allMercatorXY = [];
     let pointCounter = 0;
     const stepCount = innerCuts - 1; // 
     const edgePointIndexSets = [new Set(), new Set(), new Set()];
@@ -284,8 +286,18 @@ export function partialTessellation(triangleMeta, limits, innerCuts, calculateRe
      * Adds a point to the vertex arrays if it doesn't already exist.
      * Returns the index of the point (new or existing).
      */
+    const _f32 = /*@__PURE__*/ new Float32Array(1);
+    const _u32 = /*@__PURE__*/ new Uint32Array(_f32.buffer);
+    const float32Bits = (n) => {
+        _f32[0] = Math.fround(n);
+        return _u32[0];
+    };
     const addPoint = (longLat, vec3, edgeIndex) => {
-        const key = `${Math.round(longLat[0] * 1e8)}|${Math.round(longLat[1] * 1e8)}`;
+        const xy = radianToMercatorXY(longLat);
+        const x = Math.fround(xy[0]);
+        const y = Math.fround(xy[1]);
+        // Use float32 bit patterns for an exact, stable key.
+        const key = `${float32Bits(x)},${float32Bits(y)}`;
         let index = pointMap.get(key);
         if (index !== undefined) {
             if (edgeIndex !== undefined) {
@@ -296,7 +308,7 @@ export function partialTessellation(triangleMeta, limits, innerCuts, calculateRe
         // Point is new, add it
         const v3 = vec3 || createUnitVectorFromLongLat(longLat);
         allVec3s.push(v3[0], v3[1], v3[2]);
-        allLongLats.push(longLat[0], longLat[1]);
+        allMercatorXY.push(x, y);
         index = pointCounter++;
         pointMap.set(key, index);
         if (edgeIndex !== undefined) {
@@ -415,19 +427,16 @@ export function partialTessellation(triangleMeta, limits, innerCuts, calculateRe
             realEdgeArcIndices: null,
         };
     }
-    const delaunator = new Delaunator(allLongLats);
+    // Triangulate in the same 2D space we render in (Mercator XY).
+    const delaunator = new Delaunator(allMercatorXY);
     let indices = delaunator.triangles;
     indices = filterEdgePointTriangles(indices, edgePointIndexSets);
-    // Convert to Mercator
-    for (let i = 0; i < allLongLats.length / 2; i++) {
-        const xy = radianToMercatorXY([allLongLats[i * 2], allLongLats[i * 2 + 1]]);
-        allLongLats[i * 2] = xy[0];
-        allLongLats[i * 2 + 1] = xy[1];
-    }
-    const realEdgeArcIndices = calculateRealEdgeArc ? orderIndcecesAlongArc(triangleMeta, edgePointIndexSets, allLongLats) : null;
+    const realEdgeArcIndices = calculateRealEdgeArc
+        ? orderIndcecesAlongArc(triangleMeta, edgePointIndexSets, allMercatorXY)
+        : null;
     return {
         vec3s: new Float32Array(allVec3s),
-        longLats: new Float32Array(allLongLats),
+        longLats: new Float32Array(allMercatorXY),
         indices: indices,
         realEdgeArcIndices,
     };

package/package.json

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

package/programs/polygon-on-globe/texture-dem-triangles.js

@@ -22,7 +22,7 @@ const styleBlockManager = new UniformBlockManager('Style', [
     { name: "opacity", type: "float", value: new Float32Array([1.0]) },
     { name: "private_isPickedOn", type: "float", value: new Float32Array([0]) },
     { name: "private_pickedIndex", type: "float", value: new Float32Array([0]) },
-    { name: "dontUseColor", type: "float", value: new Float32Array([0]) },
+    { name: "useDefaultColor", type: "float", value: new Float32Array([0]) },
 ], uniformBindingPoints.style);
 const vertexShaderSource = `#version 300 es
 #pragma vscode_glsllint_stage : vert
@@ -62,7 +62,7 @@ void main() {
     );
 
     // a_color.a == 255u is reserved as "no per-vertex color" sentinel.
-    v_color = (a_color.a == 255u || dontUseColor == 1.0) ? defaultColor : decodedColor;
+    v_color = (a_color.a == 255u || useDefaultColor == 1.0) ? defaultColor : decodedColor;
 
     if (is3D == true) {
         for (int i = 0; i < 6; i++) {

package/semiplugins/shape-on-terrain/terrain-polygon/adapters.js

@@ -1,4 +1,4 @@
-function geoJSONToTerrainPolygon(geojson, keyAdapter, colorAdapter) {
+function geoJSONToTerrainPolygon(geojson, keyAdapter, colorAdapter = (feature) => undefined, propertiesAdapter = (feature) => undefined) {
     if (geojson.type !== 'FeatureCollection') {
         throw new Error('Invalid GeoJSON: Expected FeatureCollection');
     }
@@ -8,6 +8,7 @@ function geoJSONToTerrainPolygon(geojson, keyAdapter, colorAdapter) {
         const geometry = feature.geometry;
         const key = keyAdapter(feature);
         const color = colorAdapter(feature);
+        const properties = propertiesAdapter(feature);
         const geometries = [];
         if (geometry.type === 'Polygon') {
             const coordinates = geometry.coordinates;
@@ -47,7 +48,7 @@ function geoJSONToTerrainPolygon(geojson, keyAdapter, colorAdapter) {
             continue; // Skip non-polygon geometries
         }
         if (geometries.length > 0) {
-            polygons.push({ key, color, geometry: geometries });
+            polygons.push({ key, color, properties, geometry: geometries });
         }
     }
     return polygons;

package/semiplugins/shape-on-terrain/terrain-polygon/data/polygon-to-triangles.js

@@ -9,9 +9,6 @@
  *
  */
 import earcut from "earcut";
-function _isReal(a, b, len) {
-    return (Math.abs(a - b) === 1 || Math.abs(a - b) === len);
-}
 function edgeKey(a, b) {
     // undirected edge key
     return a < b ? `${a},${b}` : `${b},${a}`;

package/semiplugins/shape-on-terrain/terrain-polygon/terrain-polygon.js

@@ -83,7 +83,7 @@ export class TerrainPolygonSemiPlugin {
         if (this._options.drawEdges) {
             this._uboForRealEdgeArcs = this._program.createUBO();
             this._uboForRealEdgeArcs.updateSingle("defaultColor", new Float32Array([1, 1, 0, 1]));
-            this._uboForRealEdgeArcs.updateSingle("dontUseColor", new Float32Array([1]));
+            this._uboForRealEdgeArcs.updateSingle("useDefaultColor", new Float32Array([1]));
             this._drawRealEdgeArcs.elementBuffer = gl.createBuffer();
         }
         if (this._options.variativeColorsOn) {
@@ -132,7 +132,7 @@ export class TerrainPolygonSemiPlugin {
         this._workerContact.deleteBulk(keys);
         this._indexPolygonMap.deleteBulk(keys);
     }
-    setUniform(name, value) {
+    setUniform(name, value, target = "polygon") {
         // check options have the key name
         if (name.startsWith("private_")) {
             throw new Error(`Cannot set private uniform ${name}`);
@@ -143,7 +143,15 @@ export class TerrainPolygonSemiPlugin {
             }
             this._options[name] = value;
         }
-        this._uboHandler.updateSingle(name, value);
+        if (target === "polygon") {
+            this._uboHandler.updateSingle(name, value);
+        }
+        else if (target === "edgeArc") {
+            this._uboForRealEdgeArcs?.updateSingle(name, value);
+        }
+        else {
+            console.warn(`Unknown target ${target} for setUniform, must be "polygon" or "edgeArc"`);
+        }
         this.globe.DrawRender();
     }
     setOpacity(opacity) {
@@ -357,5 +365,8 @@ function getGlStates(gl) {
     };
 }
 function roundTo7(n) {
-    return Math.round(n * 1e7) / 1e7;
+    // Keep at most 7 digits after the decimal (degrees), then quantize to float32
+    // to match GPU attribute precision and make identity comparisons stable.
+    const rounded = Math.round(n * 1e7) / 1e7;
+    return Math.fround(rounded);
 }

package/pin/pin-object-array1.js

@@ -1,299 +0,0 @@
-/**
- * IconData;
- *  iconMap, iconCoords for objectArray
- *
- * Pin data:
- *  long, lat, payload
- *
- * methods insertPin pin and its data
- * methods deletePin
- *
- * Behaviur injection:
- * hover
- * move
- * pick drop
- * mouseclicks
- * keyboard clicks
- * mouse curser changes ( this can be implemented inside above methods)
- */
-import { CSGlobe, CSIconTypes, CSObjectTypes, CSObjectArrayUpdateTypes, } from "@pirireis/webglobe";
-/**
- * @typedef {Object} IconPayload
- * @property {string} app6DCode
- * @property {string} accsCode
- */
-/**
- * @typedef {IconPayload & Object.<string, any>} PointPayload
- */
-/**
- * @typedef {Object} CanChangeOptions
- * @property {boolean} [attribs=false]
- * @property {boolean} [icon=false]
- * @property {boolean} [label=false]
- * @property {boolean} [heading=false]
- */
-/**
- * @typedef {Object} PointObjectArray
- * @property {number[]} coords [longitude1, latitude1, longitude2, latitude2, ....]
- * @property {number[]} coordsZ [z1, z2, ....]
- * @property {PointPayload[]} attribs
- */
-function addIconMap(globe, mapName = "IconMapName", ICON_MAP_URL, ICON_MAP_JSON_URL) {
-    globe.api_AddIconMap('IconMapName', ICON_MAP_URL, ICON_MAP_JSON_URL);
-}
-class ObjectArray {
-    constructor(symbolSet, style) {
-        this.symbolSet = symbolSet;
-        this.style = style;
-    }
-    setSymbolSet(symbolSet) {
-        this.symbolSet = symbolSet;
-    }
-}
-class PinPointObjectArray {
-    constructor(id, globe, symbolSet, // iconMapName
-    style, callBacks = {
-        mouseDown: (pinItem, event) => { },
-        mouseMove: (pinItem, event) => { },
-        mouseUp: (pinItem, event) => { },
-        mouseClick: (pinItem, event) => { },
-        mouseDblClick: (pinItem, event) => { },
-    } = {}) {
-        this.id = id;
-        this.globe = globe;
-        this.symbolSet = symbolSet;
-        this.style = style;
-        this.iconMapName = iconMapName;
-        this.callBacks = callBacks;
-        // this item will be used
-        this.currentItem = null;
-    }
-    insertPins(pins) {
-    }
-    deletePins(pinsIDs) {
-        const deleteBucket = {
-            coords: [],
-            coordsZ: [],
-            attribs: []
-        };
-    }
-    _queryByScreenFindFirst() {
-        const { clientX, clientY } = this.globe.api_GetMousePos();
-        const allObjects = this.globe.queryByScreen(clientX, clientY);
-        for (let i = 0; i < allObjects.length; i++) {
-            const { obj, owner } = allObjects[i];
-            if (owner === this.objectArray) {
-                return obj;
-            }
-        }
-    }
-    // mouseDown(x, y, event) {
-    //     return false
-    // }
-    // // mouse'a basılıp hareket ettirildiğinde, mouseDown'dan true dönmüşse çağrılır
-    // mouseMove(x, y, event) {
-    // }
-    // // mouse bırakıldığında çağrılır
-    // mouseUp(x, y, event) {
-    // }
-    // // harita üzerinde tıklandığında çağrılır
-    // mouseClick() {
-    //     return false
-    // }
-    // // harita üzerinde çift tıklandığında çağrılır
-    // mouseDblClick() {
-    //     return false
-    // }
-    free() {
-        this.globe.api_ClearMouseEvents(); // TODO
-    }
-    _setMouseEvent() {
-        const { globe } = this;
-        globe.api_SetMouseEvents();
-    }
-    _getIdForGlobe() {
-        const { globe, objectArray } = this;
-        const callback = () => {
-            const allObjects = globe.api_queryByScreen();
-        };
-        return `${this.id}_pinObjectArrayMouseEvent`;
-    }
-}
-class ObjectArrayLabels {
-    /**
-     * @param {number | string} id
-     * @param {CSGlobe} globe
-     */
-    constructor(id, globe, labelStyle = null) {
-        this.id = id;
-        this.setGlobe(globe);
-        this.data = [
-            {
-                coords: [],
-                coordsZ: [],
-                attribs: [],
-            },
-        ];
-        this.primaryKey = "id";
-        this.objectType = CSObjectTypes.POINT;
-        this.filter = null;
-        this.bbox = null;
-        this.startLod = 2;
-        this.endLod = 19;
-        this.query = true;
-        this.reportObj = function (values, mouseEvent) { };
-        this._idCollector = new Set();
-        this._setStyle(labelStyle);
-    }
-    _setStyle(labelStyle) {
-        this.style = this.globe.ObjectArray.GetDefaultStyle();
-        if (labelStyle) {
-            this.style.labels[0] = labelStyle;
-        }
-        else {
-            this.style.labels[0].vAlignment = 2; // dikey olarak tam noktanın ortası
-            this.style.labels[0].hAlignment = 2; // yatay olarak tam noktanın ortası
-            this.style.labels[0].size = 11;
-            this.style.labels[0].drawAlways = true;
-            this.style.labels[0].fontFamily.name = "arial";
-            this.style.labels[0].fontFamily.bold = false;
-            this.style.labels[0].fontFamily.hollow = true;
-            this.style.labels[0].fontFamily.hollowWidth = 1;
-            this.style.labels[0].fontFamily.hollowOpacity = 1;
-        }
-        this.style.labels[0].text = "${value}";
-        this.style.fidKey = this.primaryKey;
-        this.style.iconType = CSIconTypes.NOICON; // milIcon ekleyebilmek için icon tipi MAP olmalı
-    }
-    /**
-     * @param {CSGlobe} [globe]
-     */
-    setGlobe(globe) {
-        if (!globe)
-            return;
-        this.globe = globe;
-    }
-    addToMap() {
-        this.globe.ObjectArray.Add(this);
-    }
-    removeFromMap() {
-        this.flush();
-        this.globe.ObjectArray.Delete(this.id);
-    }
-    /**
-     * Haritaya kullanılacak veriyi verir. Her çağrıldığında tüm hesaplamalar yeniden yapılır
-     * @param {PointObjectArray} data
-     */
-    setData(data) {
-        this.globe.ObjectArray.SetData(this, [data]);
-    }
-    /**
-     * @param {PointObjectArray} data
-     * @param {CSObjectArrayUpdateTypes} operation
-     * @param {CanChangeOptions} [canChange]
-     */
-    updateData(data, operation, canChange) {
-        this.globe.ObjectArray.UpdateData(this, operation, [data], canChange);
-    }
-    flush() {
-        const deleteBucket = {
-            coords: [],
-            coordsZ: [],
-            attribs: [],
-        };
-        this.setData(deleteBucket);
-        this._idCollector = new Set();
-    }
-    /**
-     * Haritaya kullanılacak veriyi verir. Her çağrıldığında tüm hesaplamalar yeniden yapılmaz, ancak ön hesaplama maliyeti vardır
-     * @param {PointObjectArray} data
-     */
-    setControlledData(data) {
-        const paritalData = {
-            add: {
-                coords: [],
-                coordsZ: [],
-                attribs: [],
-            },
-            update: {
-                coords: [],
-                coordsZ: [],
-                attribs: [],
-            },
-            delete: {
-                coords: [],
-                coordsZ: [],
-                attribs: [],
-            },
-            canChange: {
-                // Tüm değişimler gözardı edilecek
-                attribs: false,
-                icon: false,
-                label: false,
-                heading: false,
-            },
-        };
-        // İlk toplu ekleme adımı
-        if (this._idCollector.size === 0) {
-            this.setData(data);
-            // Eklenen id'ler set edildi
-            for (let i = 0; i < data.attribs.length; i++) {
-                const currentPayload = data.attribs[i];
-                const id = currentPayload[this.primaryKey];
-                this._idCollector.add(id);
-            }
-            return;
-        }
-        /** @type {Set<string>} */
-        const dataIds = new Set();
-        for (let i = 0; i < data.attribs.length; i++) {
-            const currentPayload = data.attribs[i];
-            const id = currentPayload[this.primaryKey];
-            let bucket = paritalData.add;
-            dataIds.add(id);
-            if (this._idCollector.has(id)) {
-                bucket = paritalData.update;
-            }
-            else {
-                this._idCollector.add(id);
-            }
-            bucket.coords.push(data.coords[2 * i], data.coords[2 * i + 1]);
-            bucket.coordsZ.push(data.coordsZ[i]);
-            bucket.attribs.push(currentPayload);
-        }
-        // Artık varolmayan elemenları sil
-        const deleteBucket = paritalData.delete;
-        this._idCollector.forEach((id) => {
-            if (!dataIds.has(id)) {
-                this._idCollector.delete(id);
-                deleteBucket.coords.push(0, 0);
-                deleteBucket.coordsZ.push(0);
-                deleteBucket.attribs.push({
-                    [this.primaryKey]: id,
-                });
-            }
-        });
-        if (paritalData.add.coords.length > 0) {
-            this.updateData(paritalData.add, CSObjectArrayUpdateTypes.ADD);
-        }
-        if (paritalData.update.coords.length > 0) {
-            this.updateData(paritalData.update, CSObjectArrayUpdateTypes.UPDATE, paritalData.canChange);
-        }
-        if (paritalData.delete.coords.length > 0) {
-            this.updateData(paritalData.delete, CSObjectArrayUpdateTypes.DELETE);
-        }
-    }
-    setPrimarykey(key) {
-        this.primaryKey = key;
-    }
-    setSymbolSet(symbolSet) {
-        this.symbolSet = symbolSet;
-    }
-    getLabelStyle() {
-        return this.style.labels[0];
-    }
-    setLabelStyle(style) {
-        this.style.labels[0] = style;
-    }
-}
-export default ObjectArrayLabels;

package/pin/pin-point-totem1.js

@@ -1,60 +0,0 @@
-"use strict";
-/**
- * This class registered as globe plugin one for each globe. to the head of plugin call stack.
- */
-class PinPointTotem {
-    constructor(globe) {
-        this.objectArrayMap = new Map();
-    }
-    /**
-     * objectArray
-     * callbacks ={
-     *  mouseDown,
-     *  mouseMove,
-     *  mouseUp,
-     *  mouseClick,
-     *  mouseDbClick,
-     *  keyDown,
-     *  keyUp
-     * }
-     */
-    registerPinMap(objectArray, callbacks) {
-        this.objectArrayMap.set(objectArray, callbacks);
-    }
-    unregisterPinMap(objectArray) {
-        if (this.objectArrayMap.has(objectArray)) {
-            this.objectArrayMap.delete(objectArray);
-        }
-        else {
-            console.warn('PinPointTotem objectArrayMap does not contain the objectArray');
-        }
-    }
-    // GlobeMethods
-    // haritada sol butona basıldığında çağrılır
-    mouseDown(x, y, event) {
-        return false;
-    }
-    // mouse'a basılıp hareket ettirildiğinde, mouseDown'dan true dönmüşse çağrılır
-    mouseMove(x, y, event) {
-    }
-    // mouse up'ın left'i mouseDown'dan true dönmüşse çağrılır, edit mode içindir
-    // right'i ise sağ tıka basılıp bırakıldığında çağrılır
-    mouseUp(x, y, event) {
-    }
-    // harita üzerinde tıklandığında çağrılır
-    mouseClick(x, y, event) {
-        return false;
-    }
-    // harita üzerinde çift tıklandığında çağrılır
-    mouseDblClick(x, y, event) {
-        return false;
-    }
-    // klavyeden bir tuşa basıldığı anda ve tuşa basılı kalınmaya devam edildiği durumlarda çalışır
-    keyDown(event) {
-        return false;
-    }
-    // klavyedeki bir tuştan parmak çekildiği anda çalışır
-    keyUp(event) {
-        return false;
-    }
-}