@pirireis/webglobeplugins 0.16.0 → 0.16.2

package/wind/vectorfieldimage.js

@@ -1,27 +1,23 @@
-function getVectorField(u, v, width, height, vMin, vMax, uMin, uMax, flip) {
-
-    const data = new Uint8ClampedArray(width * height * 4);
-
-    for (let row = 0; row < height; row++) {
-        for (let col = 0; col < width; col++) {
-            let k = flip ? ((height - row - 1) * width + col) : row * width + col;
-            let idx = (width * row + col) << 2; // Multiply by 4 for RGBA
-
-            if (u[k] === null || v[k] === null || isNaN(u[k]) || !isFinite(u[k]) || isNaN(v[k]) || !isFinite(v[k])) {
-                data[idx] = 0; // R
-                data[idx + 1] = 0; // G
-                data[idx + 2] = 0; // B
-                data[idx + 3] = 0; // A
-            } else {
-                data[idx] = Math.floor(255 * (u[k] - uMin) / (uMax - uMin)); // R
-                data[idx + 1] = Math.floor(255 * (v[k] - vMin) / (vMax - vMin)); // G
-                data[idx + 2] = 0; // B
-                data[idx + 3] = 255; // A
-            }
-        }
-    }
-
-    return data;
-}
-
-export default getVectorField;
+function getVectorField(u, v, width, height, vMin, vMax, uMin, uMax, flip) {
+    const data = new Uint8ClampedArray(width * height * 4);
+    for (let row = 0; row < height; row++) {
+        for (let col = 0; col < width; col++) {
+            let k = flip ? ((height - row - 1) * width + col) : row * width + col;
+            let idx = (width * row + col) << 2; // Multiply by 4 for RGBA
+            if (u[k] === null || v[k] === null || isNaN(u[k]) || !isFinite(u[k]) || isNaN(v[k]) || !isFinite(v[k])) {
+                data[idx] = 0; // R
+                data[idx + 1] = 0; // G
+                data[idx + 2] = 0; // B
+                data[idx + 3] = 0; // A
+            }
+            else {
+                data[idx] = Math.floor(255 * (u[k] - uMin) / (uMax - uMin)); // R
+                data[idx + 1] = Math.floor(255 * (v[k] - vMin) / (vMax - vMin)); // G
+                data[idx + 2] = 0; // B
+                data[idx + 3] = 255; // A
+            }
+        }
+    }
+    return data;
+}
+export default getVectorField;

package/write-text/attached-text-writer.js

@@ -1,105 +1,87 @@
-
-import { CSZMode } from "@pirireis/webglobe";
-import { isTextFont, opacityCheck } from "../util/check/typecheck";
-
-/**
- * Light wight version of context text writer.
- * The parameters by text are calculated on user side and inserted as items. (ContextTextWriter3 constructs text data from items)
- * 
- * Good side of ContextTextWriters pattern is that there is only one way to create text.
- * The glue is inside the plugin.
- * This makes the code more readable and maintainable.
- * 
- * With AttachedTextWriter the glue is created by user.
- * I observed that the users generally uses a wrapper around the plugin logic anyway. This wrapper can be used as the glue for plugin and attacked writer.
- */
-
-export class AttachedTextWriter {
-    constructor(globe, {
-        style = {
-            textFont: {
-                name: 'Arial',
-                textColor: '#FFFFFF', // beyaz
-                hollowColor: '#000000', // siyah
-                size: 12, // piksel
-                hollow: true,
-                bold: true,
-                italic: false,
-            },
-            opacity: 1.0,
-            zMode: CSZMode.Z_GROUND_PERVERTEX,
-        },
-        doDraw = true,
-        angleOnSphere = false,
-        zoomLevelAdaptor = (zoomLevel) => (item) => {
-            return {
-                opacityMultiplier: 1,
-                sizeMultiplier: 1
-            }
-        },
-    } = {}) {
-        this.globe = globe;
-        this._itemMap = new Map();
-        this.doDraw = doDraw;
-        this.angleOnSphere = angleOnSphere;
-        this.zoomLevelAdaptor = zoomLevelAdaptor;
-        this.setStyle(style);
-
-    }
-
-
-    setOpacity(opacity) {
-        opacityCheck(opacity);
-        this._style.opacity = opacity;
-        this.globe.DrawRender();
-    }
-
-    setStyle(style) {
-        isTextFont(style.textFont);
-        this._style = style;
-        this.globe.DrawRender();
-    }
-
-    /**
-     * 
-     * @param {{text, long, lat, z = 0, xOffset = 0, yOffset = 0, isAngleOn = false, Angle = 0 }} item 
-     * @returns 
-     */
-
-    insertItem(item) {
-        const key = this.keyAdaptor ? this.keyAdaptor(item) : item;
-        this._itemMap.set(key, item);
-        this.globe.DrawRender();
-    }
-
-    // TODO: use item style 
-    draw() {
-        if (!this.doDraw) {
-            return;
-        }
-        const { globe, _itemMap, _style } = this;
-        const { zMode, textFont, opacity } = _style;
-        const is3D = globe.api_GetCurrentGeometry() === 0;
-        const angleIsOn = is3D ? true : this.angleOnSphere;
-        const zoomLevel = globe.api_GetCurrentLODWithDecimal();
-        const zoomAdaptor = this.zoomLevelAdaptor(zoomLevel);
-        const theSize = textFont.size;
-        _itemMap.forEach((item, key) => {
-            const { text, long, lat, z = 0, xOffset = 0, yOffset = 0, isAngleOn = false, angle = 0 } = item;
-            const { x, y } = globe.api_GetScreenPointFromGeo(
-                {
-                    long,
-                    lat,
-                    z
-                },
-                zMode
-            );
-            const { opacityMultiplier, sizeMultiplier } = zoomAdaptor(item);
-            textFont.size = sizeMultiplier * theSize;
-            if (x !== null && y !== null) {
-                globe.api_DrawContextText(text, textFont, opacityMultiplier * opacity, { x: x + xOffset, y: y - yOffset }, (isAngleOn && angleIsOn), angle);
-            }
-        });
-        textFont.size = theSize;
-    }
-}
+import { CSZMode } from "@pirireis/webglobe";
+import { isTextFont, opacityCheck } from "../util/check/typecheck";
+/**
+ * Light wight version of context text writer.
+ * The parameters by text are calculated on user side and inserted as items. (ContextTextWriter3 constructs text data from items)
+ *
+ * Good side of ContextTextWriters pattern is that there is only one way to create text.
+ * The glue is inside the plugin.
+ * This makes the code more readable and maintainable.
+ *
+ * With AttachedTextWriter the glue is created by user.
+ * I observed that the users generally uses a wrapper around the plugin logic anyway. This wrapper can be used as the glue for plugin and attacked writer.
+ */
+export class AttachedTextWriter {
+    constructor(globe, { style = {
+        textFont: {
+            name: 'Arial',
+            textColor: '#FFFFFF', // beyaz
+            hollowColor: '#000000', // siyah
+            size: 12, // piksel
+            hollow: true,
+            bold: true,
+            italic: false,
+        },
+        opacity: 1.0,
+        zMode: CSZMode.Z_GROUND_PERVERTEX,
+    }, doDraw = true, angleOnSphere = false, zoomLevelAdaptor = (zoomLevel) => (item) => {
+        return {
+            opacityMultiplier: 1,
+            sizeMultiplier: 1
+        };
+    }, } = {}) {
+        this.globe = globe;
+        this._itemMap = new Map();
+        this.doDraw = doDraw;
+        this.angleOnSphere = angleOnSphere;
+        this.zoomLevelAdaptor = zoomLevelAdaptor;
+        this.setStyle(style);
+    }
+    setOpacity(opacity) {
+        opacityCheck(opacity);
+        this._style.opacity = opacity;
+        this.globe.DrawRender();
+    }
+    setStyle(style) {
+        isTextFont(style.textFont);
+        this._style = style;
+        this.globe.DrawRender();
+    }
+    /**
+     *
+     * @param {{text, long, lat, z = 0, xOffset = 0, yOffset = 0, isAngleOn = false, Angle = 0 }} item
+     * @returns
+     */
+    insertItem(item) {
+        const key = this.keyAdaptor ? this.keyAdaptor(item) : item;
+        this._itemMap.set(key, item);
+        this.globe.DrawRender();
+    }
+    // TODO: use item style 
+    draw() {
+        if (!this.doDraw) {
+            return;
+        }
+        const { globe, _itemMap, _style } = this;
+        const { zMode, textFont, opacity } = _style;
+        const is3D = globe.api_GetCurrentGeometry() === 0;
+        const angleIsOn = is3D ? true : this.angleOnSphere;
+        const zoomLevel = globe.api_GetCurrentLODWithDecimal();
+        const zoomAdaptor = this.zoomLevelAdaptor(zoomLevel);
+        const theSize = textFont.size;
+        _itemMap.forEach((item, key) => {
+            const { text, long, lat, z = 0, xOffset = 0, yOffset = 0, isAngleOn = false, angle = 0 } = item;
+            const { x, y } = globe.api_GetScreenPointFromGeo({
+                long,
+                lat,
+                z
+            }, zMode);
+            const { opacityMultiplier, sizeMultiplier } = zoomAdaptor(item);
+            textFont.size = sizeMultiplier * theSize;
+            if (x !== null && y !== null) {
+                globe.api_DrawContextText(text, textFont, opacityMultiplier * opacity, { x: x + xOffset, y: y - yOffset }, (isAngleOn && angleIsOn), angle);
+            }
+        });
+        textFont.size = theSize;
+    }
+}

package/{dist/write-text → write-text}/context-text-bulk.js

@@ -1,6 +1,7 @@
 // @ts-ignore
 import { CSZMode } from "@pirireis/webglobe";
 import { isTextFont, opacityCheck } from "../util/check/typecheck";
+// import { CameraUniformBlockTotem, CameraUniformBlockTotemCache } from "../programs/totems/camerauniformblock";
 // @ts-ignore
 import RBush from 'rbush';
 /**
@@ -44,19 +45,25 @@ export class ContextTexBulk {
     dataMap;
     style;
     doDraw;
-    keyAdaptor;
+    keyAdapter;
     textAdapter;
-    zoomLevelAdapter;
-    escapeAdaptor;
+    inputZoomAdapter;
+    textZoomLevelAdapter;
     xOffset;
     yOffset;
+    // private cameraTotem: CameraUniformBlockTotem;
     angleOptions;
-    constructor(globe, keyAdaptor, textAdapter, zoomLevelAdapter = (zoomLevel) => (item) => {
+    constructor(globe, keyAdapter, textAdapter, inputZoomAdapter = (input, zoomLevel) => {
         return {
             opacityMultiplier: 1,
             sizeMultiplier: 1
         };
-    }, escapeAdapter = (input, zoomLevel) => false, style = defaultStyle, angleOptions = {
+    }, textZoomLevelAdapter = (zoomLevel) => (item) => {
+        return {
+            opacityMultiplier: 1,
+            sizeMultiplier: 1
+        };
+    }, style = defaultStyle, angleOptions = {
         angleOnSphere: false,
         angleIsOn: false
     }, doDraw = true, offset = { x: 0, y: 0 }) {
@@ -68,12 +75,13 @@ export class ContextTexBulk {
         this.angleOptions = angleOptions;
         this.doDraw = doDraw;
         this.angleOptions = angleOptions;
-        this.keyAdaptor = keyAdaptor;
+        this.keyAdapter = keyAdapter;
         this.textAdapter = textAdapter;
-        this.zoomLevelAdapter = zoomLevelAdapter;
-        this.escapeAdaptor = escapeAdapter;
+        this.textZoomLevelAdapter = textZoomLevelAdapter;
+        this.inputZoomAdapter = inputZoomAdapter;
         this.xOffset = offset.x;
         this.yOffset = offset.y;
+        // this.cameraTotem = CameraUniformBlockTotemCache.get(globe);
     }
     setDoDraw(bool) {
         this.doDraw = bool;
@@ -101,22 +109,28 @@ export class ContextTexBulk {
         // @ts-ignore
         const data = dataMap.values();
         const zoomLevel = globe.api_GetCurrentLODWithDecimal();
-        const zoomAdapter = this.zoomLevelAdapter(zoomLevel);
+        // const zoomLevel = this.cameraTotem.getApproximatedLOD();
+        const zoomAdapter = this.textZoomLevelAdapter(zoomLevel);
         for (const { input, tree } of data) {
-            if (this.escapeAdaptor({ input, tree }.input, zoomLevel))
-                return;
+            const inputZoomResult = this.inputZoomAdapter(input, zoomLevel);
+            if (inputZoomResult.sizeMultiplier <= 0 || inputZoomResult.opacityMultiplier <= 0)
+                continue;
             // @ts-ignore
             const itemsInBBox = tree.search({ minX: bbox.ll.x, minY: bbox.ll.y, maxX: bbox.ur.x, maxY: bbox.ur.y });
-            for (const item of itemsInBBox) {
-                const { lat, long, text, opacity = null, angle = null, zPayload, position } = item;
+            const itemsLen = itemsInBBox.length;
+            for (let i = 0; i < itemsLen; i++) {
+                const item = itemsInBBox[i];
+                const { lat, long, text, opacity = null, angle = null, position } = item;
+                const { opacityMultiplier, sizeMultiplier } = zoomAdapter(item);
+                if (sizeMultiplier <= 0 || opacityMultiplier <= 0)
+                    continue;
                 const { x, y } = globe.api_GetScreenPointFromGeo({
                     long: long,
                     lat: lat,
                     z: 0,
                 }, style.zMode === CSZMode.Z_MSL);
-                const { opacityMultiplier, sizeMultiplier } = zoomAdapter(zPayload);
-                const o = (opacity === null ? opacity_ : opacity * opacity_) * opacityMultiplier;
-                textFont.size = sizeMultiplier * textSize;
+                const o = (opacity === null ? opacity_ : opacity * opacity_) * opacityMultiplier * inputZoomResult.opacityMultiplier;
+                textFont.size = sizeMultiplier * textSize * inputZoomResult.sizeMultiplier;
                 textFont.position = position;
                 if (x !== null && y !== null)
                     globe.api_DrawContextTextMultiLine(text, textFont, o, { x: x + xOffset, y: y - yOffset }, angleIsOn, angle);
@@ -125,7 +139,7 @@ export class ContextTexBulk {
         }
     }
     insertText(data) {
-        const key = this.keyAdaptor(data);
+        const key = this.keyAdapter(data);
         const textDatas = this.textAdapter(data);
         const tree = new MyRBush();
         // @ts-ignore
@@ -135,7 +149,7 @@ export class ContextTexBulk {
     }
     insertTextBulk(inputs) {
         for (const input of inputs) {
-            const key = this.keyAdaptor(input);
+            const key = this.keyAdapter(input);
             const textDatas = this.textAdapter(input);
             const tree = new MyRBush();
             // @ts-ignore
@@ -145,7 +159,7 @@ export class ContextTexBulk {
         this.globe.DrawRender();
     }
     deleteText(data) {
-        const keys = this.keyAdaptor(data);
+        const keys = this.keyAdapter(data);
         if (this.dataMap.has(keys)) {
             this.dataMap.delete(keys);
         }
@@ -153,7 +167,7 @@ export class ContextTexBulk {
     }
     deleteTextBulk(inputs) {
         for (const input of inputs) {
-            const key = this.keyAdaptor(input);
+            const key = this.keyAdapter(input);
             this.dataMap.delete(key);
         }
         this.globe.DrawRender();
@@ -181,5 +195,6 @@ export class ContextTexBulk {
     }
     free() {
         this.dataMap.clear();
+        // CameraUniformBlockTotemCache.release(this.globe)
     }
 }

package/write-text/context-text.js

@@ -1,125 +1,94 @@
-import { CSZMode } from "@pirireis/webglobe";
-
-const defaultStyle = {
-    textFont: {
-        name: 'Arial',
-        textColor: '#FFFFFF', // beyaz
-        hollowColor: '#000000', // siyah
-        size: 12, // piksel
-        hollow: true,
-        bold: true,
-        italic: false,
-    },
-    opacity: 1.0,
-    zMode: CSZMode.Z_GROUND_PERVERTEX,
-}
-
-export class ContextTextWriter {
-    constructor(globe, { style = null, doDraw = true } = {}) {
-        this.globe = globe;
-        this.itemMap = new Map();
-        this.style = style || defaultStyle;
-        this.doDraw = doDraw;
-
-
-
-    }
-
-
-    setDoDraw(bool) {
-        this.doDraw = bool;
-    }
-
-    setStyle(style) {
-        this.style = style;
-    }
-
-    setOpacity(opacity) {
-        this.style.opacity = opacity;
-    }
-
-    // Clean this ask Front dev
-    doDraw(boolean) {
-        this.doDraw = boolean;
-    }
-
-
-    draw() {
-        if (!this.doDraw) return;
-        const { globe, style, itemMap } = this;
-        const { textFont, opacity: opacity_ } = style;
-
-        for (const [key, { lat, long, text, opacity = null }] of itemMap) {
-            const { x, y } = globe.api_GetScreenPointFromGeo(
-                {
-                    long: long,
-                    lat: lat,
-                    z: 0,
-                },
-                style.zMode === CSZMode.Z_MSL,
-            );
-            const o = opacity === null ? opacity_ : opacity * opacity_;
-            if (x !== null && y !== null) globe.api_DrawContextTextMultiLine(text, textFont, o, { x, y });
-        }
-    }
-
-
-
-
-    insertText(key, lat, long, text,) {
-        this.itemMap.set(key, { lat, long, text });
-    }
-
-
-    updateOpacityOfItem(key, opacity) {
-        this.itemMap.get(key).opacity = opacity;
-    }
-
-    updateOpacityBulk(items, keyAdaptor, valueAdaptor) {
-        for (const item of items) {
-            const key = keyAdaptor(item);
-            const opacity = valueAdaptor(item);
-            const data = this.itemMap.get(key)
-            data.opacity = opacity;
-        }
-    }
-
-    updateText(key, text) {
-        const item = this.itemMap.get(key);
-        item.text = text;
-    }
-
-    updateCoords(key, lat, long) {
-        const item = this.itemMap.get(key);
-        item.lat = lat; item.long = long;
-    }
-
-
-    insertTextBulk(items) {
-        for (const item of items) {
-            this.itemMap.set(item.key, item);
-        }
-    }
-
-    updateTextCoordsBulk(items) {
-        for (const { key, lat, long } of items) {
-            const item = this.itemMap.get(key);
-            item.lat = lat; item.long = long;
-        }
-    }
-
-
-    deleteTextBulk(keys) {
-        for (const key of keys) {
-            this.itemMap.delete(key);
-        }
-    }
-
-
-
-    clear() {
-        this.itemMap.clear();
-    }
-}
-
-
+import { CSZMode } from "@pirireis/webglobe";
+const defaultStyle = {
+    textFont: {
+        name: 'Arial',
+        textColor: '#FFFFFF', // beyaz
+        hollowColor: '#000000', // siyah
+        size: 12, // piksel
+        hollow: true,
+        bold: true,
+        italic: false,
+    },
+    opacity: 1.0,
+    zMode: CSZMode.Z_GROUND_PERVERTEX,
+};
+export class ContextTextWriter {
+    constructor(globe, { style = null, doDraw = true } = {}) {
+        this.globe = globe;
+        this.itemMap = new Map();
+        this.style = style || defaultStyle;
+        this.doDraw = doDraw;
+    }
+    setDoDraw(bool) {
+        this.doDraw = bool;
+    }
+    setStyle(style) {
+        this.style = style;
+    }
+    setOpacity(opacity) {
+        this.style.opacity = opacity;
+    }
+    // Clean this ask Front dev
+    doDraw(boolean) {
+        this.doDraw = boolean;
+    }
+    draw() {
+        if (!this.doDraw)
+            return;
+        const { globe, style, itemMap } = this;
+        const { textFont, opacity: opacity_ } = style;
+        for (const [key, { lat, long, text, opacity = null }] of itemMap) {
+            const { x, y } = globe.api_GetScreenPointFromGeo({
+                long: long,
+                lat: lat,
+                z: 0,
+            }, style.zMode === CSZMode.Z_MSL);
+            const o = opacity === null ? opacity_ : opacity * opacity_;
+            if (x !== null && y !== null)
+                globe.api_DrawContextTextMultiLine(text, textFont, o, { x, y });
+        }
+    }
+    insertText(key, lat, long, text) {
+        this.itemMap.set(key, { lat, long, text });
+    }
+    updateOpacityOfItem(key, opacity) {
+        this.itemMap.get(key).opacity = opacity;
+    }
+    updateOpacityBulk(items, keyAdaptor, valueAdaptor) {
+        for (const item of items) {
+            const key = keyAdaptor(item);
+            const opacity = valueAdaptor(item);
+            const data = this.itemMap.get(key);
+            data.opacity = opacity;
+        }
+    }
+    updateText(key, text) {
+        const item = this.itemMap.get(key);
+        item.text = text;
+    }
+    updateCoords(key, lat, long) {
+        const item = this.itemMap.get(key);
+        item.lat = lat;
+        item.long = long;
+    }
+    insertTextBulk(items) {
+        for (const item of items) {
+            this.itemMap.set(item.key, item);
+        }
+    }
+    updateTextCoordsBulk(items) {
+        for (const { key, lat, long } of items) {
+            const item = this.itemMap.get(key);
+            item.lat = lat;
+            item.long = long;
+        }
+    }
+    deleteTextBulk(keys) {
+        for (const key of keys) {
+            this.itemMap.delete(key);
+        }
+    }
+    clear() {
+        this.itemMap.clear();
+    }
+}