@pirireis/webglobeplugins 0.6.2-b → 0.6.2

package/package.json

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

package/rangerings/rangeringangletext.js

@@ -261,7 +261,7 @@ export default class RangeRingAngleText {
             const hideText = centerMap.get("textHide");
             const isHidden = hide === ENUM_HIDE.HIDE || hideText === ENUM_TEXT_HIDE.HIDE;
             if (!isHidden) this._fillDeleteBucket(centerID, deleteBucket);
-            centerMap.set("textHide", ENUM_HIDE.HIDE);
+            centerMap.set("hide", ENUM_HIDE.HIDE);
         }
         this._updateData(deleteBucket, CSObjectArrayUpdateTypes.DELETE);
     }

package/write-text/context-text2.js

@@ -1,5 +1,19 @@
 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,
+}
+
 /**
  * TODOs:
  * 1) update all if initials change (propably need a context and a callback to iterate over data)
@@ -7,33 +21,10 @@ import { CSZMode } from "@pirireis/webglobe";
  * 3) extend the mechanic on 2 to other events
  */
 export class ContextTextWriter2 {
-    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,
-        textAdaptor = null,
-        coordinatesAdaptor = null,
-        keyAdaptor = null,
-        opacityAdaptor = null,
-        angleAdaptor = null,
-        angleOnSphere = false,
-        zoomLevelOpacityAdaptor = null,
-        zoomLevelSizeAdaptor = null,
-    } = {}) {
+    constructor(globe, { style = null, doDraw = true, textAdaptor = null, coordinatesAdaptor = null, keyAdaptor = null, opacityAdaptor = null, angleAdaptor = null, angleOnSphere = false } = {}) {
         this.globe = globe;
         this.itemMap = new Map();
-        this.style = style;
+        this.style = style || defaultStyle;
         this.doDraw = doDraw;
 
 
@@ -41,9 +32,6 @@ export class ContextTextWriter2 {
         this.coordinatesAdaptor = coordinatesAdaptor;
         this.keyAdaptor = keyAdaptor;
 
-        this.zoomLevelOpacityAdaptor = zoomLevelOpacityAdaptor;
-        this.zoomLevelSizeAdaptor = zoomLevelSizeAdaptor;
-
         this.opacityAdaptor = opacityAdaptor ? opacityAdaptor : () => 1;
         this.angleOnSphere = angleOnSphere;
         if (angleAdaptor) {

package/write-text/context-text3.js

@@ -1,169 +0,0 @@
-import { CSZMode } from "@pirireis/webglobe";
-
-/**
- * TODOs:
- * 1) update all if initials change (propably need a context and a callback to iterate over data)
- * 2) expose a mechanic to update text on zoom change
- * 3) extend the mechanic on 2 to other events
- */
-export class ContextTextWriter2 {
-    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,
-        textAdaptor = null,
-        coordinatesAdaptor = null,
-        keyAdaptor = null,
-        opacityAdaptor = null,
-        angleAdaptor = null,
-        angleOnSphere = false,
-        zoomLevelOpacityAdaptor = (zoomLevel, item) => 1,
-        zoomLevelSizeAdaptor = (zoomLevel, item) => 1,
-    } = {}) {
-        this.globe = globe;
-        this.itemMap = new Map();
-        this.style = style;
-        this.doDraw = doDraw;
-
-
-        this.textAdaptor = textAdaptor;
-        this.coordinatesAdaptor = coordinatesAdaptor;
-        this.keyAdaptor = keyAdaptor;
-
-        this.zoomLevelOpacityAdaptor = zoomLevelOpacityAdaptor;
-        this.zoomLevelSizeAdaptor = zoomLevelSizeAdaptor;
-
-        this.opacityAdaptor = opacityAdaptor ? opacityAdaptor : () => 1;
-        this.angleOnSphere = angleOnSphere;
-        if (angleAdaptor) {
-            this.angleAdaptor = angleAdaptor
-            this.angleAdaptorIsOn = true;
-        } else {
-            this.angleAdaptor = () => null
-            this.angleAdaptorIsOn = false
-        }
-    }
-
-    setKeyAdaptor(adaptor) {
-        this.keyAdaptor = adaptor;
-    }
-
-    setDoDraw(bool) {
-        this.doDraw = bool;
-    }
-
-    setStyle(style) {
-        this.style = style;
-    }
-
-    setOpacity(opacity) {
-        this.style.opacity = opacity;
-    }
-
-
-
-    draw() {
-        if (!this.doDraw) return;
-        const { globe, style, itemMap } = this;
-        const { textFont, opacity: opacity_ } = style;
-        const textSize = textFont.size;
-        const is3D = globe.api_GetCurrentGeometry() === 0;
-        const angleIsOn = is3D ? (this.angleAdaptorIsOn && this.angleOnSphere) : (this.angleAdaptorIsOn)
-        const zoomLevel = globe.api_GetCurrentLODWithDecimal()
-        for (const [key, item] of itemMap) {
-            const { lat, long, text, opacity = null, angle = null } = item;
-            const { x, y } = globe.api_GetScreenPointFromGeo(
-                {
-                    long: long,
-                    lat: lat,
-                    z: 0,
-                },
-                style.zMode === CSZMode.Z_MSL,
-            );
-            const o = (opacity === null ? opacity_ : opacity * opacity_) * this.zoomLevelOpacityAdaptor(zoomLevel, item);
-            textFont.size = this.zoomLevelSizeAdaptor(zoomLevel) * textSize;
-
-            if (x !== null && y !== null) globe.api_DrawContextTextMultiLine(text, textFont, o, { x, y }, angleIsOn, angle);
-        }
-        textFont.size = textSize;
-    }
-
-
-    updateOpacityOfItem(item, i, container, properties) {
-        const opacity = this.opacityAdaptor(item, i, container, properties);
-        if (opacity == null) return;
-        const key = this.keyAdaptor(item, i, container, properties);
-        const data = this.itemMap.get(key)
-        data.opacity = opacity;
-    }
-
-    updateOpacityContainer(container, properties) {
-        container.forEach((v, i, c) => {
-            this.updateOpacityOfItem(v, i, c, properties);
-        })
-    }
-
-
-    insertTextBulk(container, properties) {
-        container.forEach((v, i, c) => {
-            this.insertText(v, i, c, properties);
-        })
-    }
-
-    updateTextCoords(item, i, container, properties) {
-        const coords = this.coordinatesAdaptor(item, i, container, properties);
-        if (coords == null) return;
-        const key = this.keyAdaptor(item, i, container, properties);
-        const data = this.itemMap.get(key)
-        data.angle = this.angleAdaptor(item, i, container, properties);
-        data.long = coords.long;
-        data.lat = coords.lat;
-    }
-
-    updateTextCoordsBulk(container, properties) {
-        container.forEach((v, i, c) => {
-            this.updateTextCoords(v, i, c, properties)
-        })
-    }
-
-    deleteTextBulk(keys) {
-        for (const key of keys) {
-            this.itemMap.delete(key);
-        }
-    }
-
-
-    insertText(item, id, container, properties) {
-        const key = this.keyAdaptor(item, id, container, properties)
-        const coords = this.coordinatesAdaptor(item, id, container, properties)
-        if (coords == null) {
-            this.itemMap.delete(key);
-            return;
-        }
-        const text = this.textAdaptor(item, id, container, properties)
-        if (text == null) {
-            this.itemMap.delete(key);
-            return
-        };
-        const opacity = this.opacityAdaptor(item, id, container, properties);
-        const angle = this.angleAdaptor(item, id, container, properties);
-        this.itemMap.set(key, { long: coords.long, lat: coords.lat, text, opacity, angle });
-    }
-
-    clear() {
-        this.itemMap.clear();
-    }
-}
-
-