@pirireis/webglobeplugins 0.4.2-a → 0.5.1

package/circle-line-chain/chain-list-map.js

@@ -1,19 +1,20 @@
-import { keyMethod } from "./util";
 /**
  * set and get node data 
  * node indexes; 
  */
 export class ChainListMap {
 
-    constructor() {
+    constructor(keyMethod) {
         this._chainMap = new Map();
         this._chainSideProperties = new Map();
         this._indexMap = new Map(); // hold list index of lastly updated nodes. on add delete goes empty
+        this.keyMethod = keyMethod;
     }
 
     getChain(chainKey) {
         if (!this._chainMap.has(chainKey)) this._chainMap.set(chainKey, []);
         return this._chainMap.get(chainKey);
+
     }
 
     /**
@@ -35,6 +36,7 @@ export class ChainListMap {
                 break;
             }
         }
+        node.__identity__ = this.keyMethod(chainKey, node.key);
         this._resetIndexChain(chainKey);
     }
 
@@ -51,7 +53,7 @@ export class ChainListMap {
         const removeSet = new Set(nodeKeys);
         const newChain = []
         for (const node of chain) {
-            const dKey = keyMethod(chainKey, node.key);
+            const dKey = node.__identity__;
             this._indexMap.delete(dKey);
             if (removeSet.has(node.key)) {
                 compKeys.push(dKey);
@@ -65,7 +67,6 @@ export class ChainListMap {
 
     deleteChainAndReturnChainKeys(chainKey) {
         const keys = this.getNodeKeysOfChain(chainKey);
-        console.log('chainKey', chainKey, "keys", keys);
         this._chainMap.delete(chainKey);
         for (const key of keys) this._indexMap.delete(key);
         return keys;
@@ -74,6 +75,7 @@ export class ChainListMap {
     updateNode(node, chainKey) {
         const index = this.getIndexOfNode(chainKey, node.key)
         const chain = this._chainMap.get(chainKey);
+        node.__identity__ = this.keyMethod(chainKey, node.key);
         chain[index] = node;
     }
 
@@ -81,6 +83,7 @@ export class ChainListMap {
     setChain(chainKey, nodeList) {
         if (this._chainMap.has(chainKey)) this._flushIndexMap();
         this._chainMap.set(chainKey, nodeList);
+        nodeList.forEach((v) => v.__identity__ = this.keyMethod(chainKey, v.key))
     }
 
 
@@ -151,7 +154,7 @@ export class ChainListMap {
 
 
     getIndexOfNode(chainKey, nodeKey) {
-        const key = keyMethod(chainKey, nodeKey);
+        const key = this.keyMethod(chainKey, nodeKey);
         if (this._indexMap.has(key)) return this._indexMap.get(key);
 
         const chain = this._chainMap.get(chainKey);
@@ -172,16 +175,14 @@ export class ChainListMap {
         const chain = this._chainMap.get(chainKey);
         for (let i = 0; i < chain.length; i++) {
             const node = chain[i]
-            this._indexMap.set(keyMethod(chainKey, node.key), i);
+            this._indexMap.set(this.keyMethod(chainKey, node.key), i);
         }
     }
 
     getNodeKeysOfChain(chainKey) {
         const chain = this._chainMap.get(chainKey);
-        console.log("node keys", chain);
         if (!chain) return [];
-        const result = chain.map((v) => keyMethod(chainKey, v.key));
-        console.log("buffer Keys", result);
+        const result = chain.map((v) => v.__identity__);
         return result
     }
 

package/circle-line-chain/plugin.js

@@ -2,8 +2,7 @@ import { LineOnGlobeCache } from '../programs/line-on-globe/naive';
 import { CircleCache } from '../programs/line-on-globe/circle';
 import { BufferOrchestrator, BufferManager } from "../util/account";
 import { ChainListMap } from "./chain-list-map";
-import { keyMethod } from "./util";
-
+import { keyMethod } from './util';
 // TODO: Add update buffer and update text mehods on add, delete, update methods
 
 
@@ -26,13 +25,14 @@ const radian = Math.PI / 180;
 
 export class CircleLineChainPlugin {
 
-    constructor(id, { textContextWriterInjectionMap = new Map() } = {}) {
+    constructor(id, { drawCircleOn = true, textContextWriterInjectionMap = new Map() } = {}) {
         this.id = id;
         this._textContextWriterInjectionMap = textContextWriterInjectionMap;
-        this._textContextWriterInjectionMap.forEach((writer) => writer.setKeyAdaptor((v, i, c, probs) => keyMethod(probs.chainKey, v.key)));
+        this._textContextWriterInjectionMap.forEach((writer) => writer.setKeyAdaptor((v, i, c, probs) => v.__identity__));
         this._opacity = 1;
-        this._chainListMap = new ChainListMap();
+        this._chainListMap = new ChainListMap(keyMethod);
         this.bufferOrchestrator = new BufferOrchestrator({ capacity: 10 });
+        this._drawCircleOn = drawCircleOn
     }
 
     // init
@@ -100,6 +100,12 @@ export class CircleLineChainPlugin {
 
     // API
 
+
+    setDrawCircleOn(bool) {
+        if (typeof bool !== 'boolean') throw new Error("setDrawCircleOn parameter must be a boolean");
+        this._drawCircleOn = bool;
+        this.globe.DrawRender();
+    }
     // -- update bulk family
     /**
      * 
@@ -107,7 +113,6 @@ export class CircleLineChainPlugin {
      * @typedef chain
      * @property {string} chainKey
      * @property {Array<node>} nodes
-     * 
      * @typedef {Object} node
      * @property {string} key
      * @property {number} long
@@ -183,7 +188,6 @@ export class CircleLineChainPlugin {
      */
     addNode(node, chainKey, { theNodeKeyFront = null, textWriterIDs = [] } = {}) {
         // TODO: if before object is null update the last two elements of the chain only. 
-        console.log("addNode", node, chainKey, theNodeKeyFront);
         this._chainListMap.addNode(node, chainKey, theNodeKeyFront);
         if (textWriterIDs) this._updateTexts([chainKey], textWriterIDs);
         this._reconstructChains([chainKey]);
@@ -201,7 +205,11 @@ export class CircleLineChainPlugin {
 
 
     setOpacity(opacity) {
+        if (typeof opacity !== 'number') throw new Error("opacity must be a number");
+        if (opacity < 0 || 1 < opacity) throw new Error("opacity must be between 0-1");
+        this._textContextWriterInjectionMap.forEach((writer) => writer.setOpacity(opacity));
         this._opacity = opacity;
+        this.globe.DrawRender();
     }
 
 
@@ -219,8 +227,6 @@ export class CircleLineChainPlugin {
         for (const chainKey of chainKeys) {
             bufferKeys.push(...this._chainListMap.deleteChainAndReturnChainKeys(chainKey));
         }
-        console.log("delete chain keys", chainKeys);
-        console.log("deletechains bufferKeys", bufferKeys);
         this._updateTexts(chainKeys, this._textContextWriterInjectionMap.keys());
         this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
@@ -277,7 +283,7 @@ export class CircleLineChainPlugin {
                 lat: v.lat,
                 targetLong: array[i + 1].long,
                 targetLat: array[i + 1].lat,
-                key: keyMethod(probs.chainKey, v.key)
+                key: v.__identity__
             }
         }
         const bulkData = [];
@@ -313,7 +319,7 @@ export class CircleLineChainPlugin {
         const { gl } = this;
         gl.disable(gl.DEPTH_TEST);
         this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
-        this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this._opacity);
+        if (this._drawCircleOn) this.circleProgram.draw(this.circleVao, this.bufferOrchestrator.length, this._opacity);
         this._textContextWriterInjectionMap.forEach((writer) => writer.draw());
         gl.enable(gl.DEPTH_TEST);
     }

package/package.json

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

package/rangerings/rangeringangletext.js

@@ -292,6 +292,30 @@ export default class RangeRingAngleText {
 
 
 
+    showAllVisiableCircleText() {
+        this._hideAll = false;
+        const addBucket = {
+            coords: [],
+            coordsZ: [],
+            attribs: []
+        }
+        for (const [centerID, centerMap] of this._centerCollection) {
+            const hide = centerMap.get("hide");
+            const hideText = centerMap.get("textHide");
+            if (hide === ENUM_HIDE) continue
+            const isHidden = hideText === ENUM_TEXT_HIDE.HIDE;
+            if (isHidden) {
+                const x = centerMap.get("x");
+                const y = centerMap.get("y");
+                const maxRadius = centerMap.get("maxRadius");
+                const stepAngle = centerMap.get("stepAngle");
+                this._appendCircle(x, y, maxRadius, stepAngle, centerID, addBucket);
+                centerMap.set("textHide", ENUM_TEXT_HIDE.SHOW);
+            }
+        }
+        if (addBucket.coords.length) this._updateData(addBucket, CSObjectArrayUpdateTypes.ADD);
+    }
+
     flush() {
         const data = {
             coords: [],

package/write-text/context-text2.js

@@ -15,10 +15,13 @@ const defaultStyle = {
 }
 
 /**
- * keyAdaptor should be set but higher context since it nows key methods and key method might be implicit to user
+ * 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 = null, doDraw = true, textAdaptor = null, coordinatesAdaptor = null, keyAdaptor = null, opacityAdaptor = 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 || defaultStyle;
@@ -28,10 +31,15 @@ export class ContextTextWriter2 {
         this.textAdaptor = textAdaptor;
         this.coordinatesAdaptor = coordinatesAdaptor;
         this.keyAdaptor = keyAdaptor;
-        if (opacityAdaptor) {
-            this.opacityAdaptor = opacityAdaptor
+
+        this.opacityAdaptor = opacityAdaptor ? opacityAdaptor : () => 1;
+        this.angleOnSphere = angleOnSphere;
+        if (angleAdaptor) {
+            this.angleAdaptor = angleAdaptor
+            this.angleAdaptorIsOn = true;
         } else {
-            this.opacityAdaptor = () => 1;
+            this.angleAdaptor = () => null
+            this.angleAdaptorIsOn = false
         }
     }
 
@@ -57,8 +65,9 @@ export class ContextTextWriter2 {
         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 is3D = globe.api_GetCurrentGeometry() === 0;
+        const angleIsOn = is3D ? (this.angleAdaptorIsOn && this.angleOnSphere) : (this.angleAdaptorIsOn)
+        for (const [key, { lat, long, text, opacity = null, angle = null }] of itemMap) {
             const { x, y } = globe.api_GetScreenPointFromGeo(
                 {
                     long: long,
@@ -68,7 +77,8 @@ export class ContextTextWriter2 {
                 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 });
+
+            if (x !== null && y !== null) globe.api_DrawContextTextMultiLine(text, textFont, o, { x, y }, angleIsOn, angle);
         }
     }
 
@@ -99,6 +109,7 @@ export class ContextTextWriter2 {
         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;
     }
@@ -122,8 +133,10 @@ export class ContextTextWriter2 {
         const text = this.textAdaptor(item, id, container, properties)
         if (text == null) return;
         const opacity = this.opacityAdaptor(item, id, container, properties);
+        const angle = this.angleAdaptor(item, id, container, properties);
+        console.log(angle, "angle")
         const key = this.keyAdaptor(item, id, container, properties)
-        this.itemMap.set(key, { long: coords.long, lat: coords.lat, text, opacity });
+        this.itemMap.set(key, { long: coords.long, lat: coords.lat, text, opacity, angle });
     }
 
     clear() {