@pirireis/webglobeplugins 0.1.4 → 0.1.6

package/compassrose/compassrose.js

@@ -29,11 +29,11 @@ const object = {
                 "text": "'${title}'",
                 "textCallback": null,
                 "offset": {
-                    "x": 16,
-                    "y": -16
+                    "x": 0,
+                    "y": 0
                 },
-                "vAlignment": 0,
-                "hAlignment": 0,
+                "vAlignment": 2,
+                "hAlignment": 2,
                 "size": 20,
                 "hollowColor": "#000",
                 "textColor": "#FFF",
@@ -208,37 +208,6 @@ const setFIDKey = (object, key) => {
     object.style.fidKey = key;
 }
 
-const IMAGE_URL = "10494_1024px-compass-rose-simple.svg.png";
-
-export class RotationalIcon2D {
-    constructor(id, globe) {
-        this.id = id;
-        this.globe = globe;
-        this.objectType = CSObjectTypes.POINT;
-        const symbolSet = "symbolSetName";
-        // copy object
-        this.object = object;
-        this.setData(
-            [
-                {
-                    coords: [32, 40, 34, 42, 35, 41],
-                    coordsZ: [0, 0, 0],
-                    attribs: [
-                    ]
-                }
-            ]
-        )
-        setIconSize(this.object, 100);
-        setMapName(this.object, symbolSet);
-        setIconName(this.object, symbolSet);
-        addSingleImageIconMap(symbolSet)(IMAGE_URL);
-        globe.ObjectArray.Add(this.object);
-    }
-    setData(data) {
-        const { globe, object } = this;
-        setData(object, data);
-    }
-}
 
 
 export default class CompassRose {

package/compassrose/index.js

@@ -1,3 +1,2 @@
 import CompassRose from "./compassrose";
-import { RotationalIcon2D } from "./compassrose";
-export { CompassRose, RotationalIcon2D };
+export { CompassRose };

package/package.json

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

package/rangerings/rangeringangletext.js

@@ -17,9 +17,8 @@ const fidKey = "__fid__";
 
 
 const object = {
-    "displayName": "CompassRose",
+    "displayName": "RangeRingAngleText",
     "layerType": 3,
-
     "wkbGeom": null,
     "wfsLayerName": null,
     "objectType": "point",
@@ -33,38 +32,17 @@ const object = {
 
 
 export default class RangeRingAngleText {
-    constructor(globe, { style = null, flatCompassMode = COMPASS_MODES.REAL } = {}) {
+    constructor(globe, id, { style = null, flatCompassMode = COMPASS_MODES.REAL, hideAll = false } = {}) {
         this.globe = globe;
         this.ObjectArray = globe.ObjectArray;
-
+        this.id = id;
         this._flatCompassMode = flatCompassMode;
         this._lastImplicitCompassMode = this.__implicitCompassMode();
-        if (style) {
-            this.style = style;
-        } else {
-            this.style = this.ObjectArray.GetDefaultStyle();
-            const { labels } = this.style;
-            const label = labels[0];
-            label.offset = { x: 0, y: 0 };
-            label.fontFamily.hollowWidth = 1;
-            label.vAlignment = 2;
-            label.hAlignment = 2;
-            label.size = 17;
-            // this.style.filter = [
-            //     {
-            //         rule: ["any", ["<", "startLod", "LOD"]],
-            //         name: "startLODRule",
-            //         style: {
-            //             opacity: 0
-            //         }
-
-            //     }
-            // ];
-        }
 
-        this.style.labels[0].text = "`${aci}`"
-        this.style.fidKey = fidKey;
-        this.object = Object.assign({}, object, { style: this.style });
+        this._hideAll = hideAll;
+
+        const style_ = style !== null ? style : this.getDefaultStyle();
+        this.object = Object.assign({}, object, { style: style_, id: this.id });
 
         this._centerCollection = new Map();
         // new inner MAP params
@@ -75,6 +53,37 @@ export default class RangeRingAngleText {
 
     }
 
+    getDefaultStyle() {
+        const style = this.ObjectArray.GetDefaultStyle();
+        style.fidKey = fidKey;
+        const { labels } = style;
+        const label = labels[0];
+        label.offset = { x: 0, y: 0 };
+        label.fontFamily.hollowWidth = 1;
+        label.vAlignment = 2;
+        label.hAlignment = 2;
+        label.size = 17;
+        label.text = "`${aci}`"
+        // this.style.filter = [
+        //     {
+        //         rule: ["any", ["<", "startLod", "LOD"]],
+        //         name: "startLODRule",
+        //         style: {
+        //             opacity: 0
+        //         }
+
+        //     }
+        // ];
+        return style;
+    }
+
+
+    setStyle(style) {
+        if (style === null) return;
+        this.object.style = style;
+        this.ObjectArray.StyleChanged(this.object);
+    }
+
 
     setCompass(mode) {
         if (mode === this._flatCompassMode) return;
@@ -85,11 +94,10 @@ export default class RangeRingAngleText {
 
     free() {
         this.flush();
-        this.ObjectArray.RemoveObject(this.object);
+        this.ObjectArray.Delete(this.id);
     }
 
 
-
     /**
      * @param {Array<{centerID,stepAngle, x, y, rings>} ringDatas
      * centerID: string | ObjectArray fidKey de kullanilir
@@ -101,7 +109,7 @@ export default class RangeRingAngleText {
      * 
      * */
     insertBulk(ringDatas) {
-
+        const { _hideAll } = this;
         const addBucket = {
             coords: [],
             coordsZ: [],
@@ -119,7 +127,8 @@ export default class RangeRingAngleText {
                 this._fillDeleteBucket(centerID, deleteBucket);
             }
             const maxRadius = rings.reduce((acc, { radius }) => Math.max(acc, radius), 0);
-            const show = hide !== ENUM_HIDE.HIDE && textHide === ENUM_TEXT_HIDE.SHOW;
+            const textHide_ = _hideAll ? ENUM_TEXT_HIDE.HIDE : textHide;
+            const show = hide !== ENUM_HIDE.HIDE && textHide_ === ENUM_TEXT_HIDE.SHOW;
             if (show) this._appendCircle(x, y, maxRadius, stepAngle, centerID, addBucket);
             this._centerCollection.set(centerID,
                 new Map([
@@ -128,10 +137,10 @@ export default class RangeRingAngleText {
                     ["x", x],
                     ["y", y],
                     ["hide", hide],
-                    ["textHide", textHide]
+                    ["textHide", textHide_]
                 ]));
         }
-
+        if (this._hideAll) return;
         if (deleteBucket.coords.length > 0) this._updateData(deleteBucket, CSObjectArrayUpdateTypes.DELETE);
         if (addBucket.coords.length > 0) this._updateData(addBucket, CSObjectArrayUpdateTypes.ADD);
 
@@ -150,18 +159,22 @@ export default class RangeRingAngleText {
         for (const { centerID, x, y } of centerDatas) {
             if (this._centerCollection.has(centerID)) {
                 const centerMap = this._centerCollection.get(centerID);
+                centerMap.set("x", x);
+                centerMap.set("y", y);
+                const hide = centerMap.get("hide");
+                const textHide = centerMap.get("textHide");
+                const isHidden = hide === ENUM_HIDE.HIDE || textHide === ENUM_TEXT_HIDE.HIDE;
+                if (isHidden) continue;
                 const maxRadius = centerMap.get("maxRadius");
                 const stepAngle = centerMap.get("stepAngle");
                 // long, lat, radius, step, centerID, outBucket
                 this._appendCircle(x, y, maxRadius, stepAngle, centerID, updateBucket);
-                centerMap.set("x", x);
-                centerMap.set("y", y);
 
             }
         }
-        for (const attribs of updateBucket.attribs) {
-            delete attribs["aci"];
-        }
+        // for (const attribs of updateBucket.attribs) {
+        //     delete attribs["aci"];
+        // }
         if (updateBucket.coords.length > 0) {
             this._updateData(updateBucket, CSObjectArrayUpdateTypes.UPDATE);
         }
@@ -174,6 +187,10 @@ export default class RangeRingAngleText {
      * @param {Array<{centerID:string, hide: bool}} centerHides 
      */
     updateCentersHide(centerHides) {
+        if (this._hideAll) {
+            console.warn("Tum mesafe halkasi yazilari gizli durum. Islem yapilamaz");
+            return;
+        };
         const addBucket = {
             coords: [],
             coordsZ: [],
@@ -224,6 +241,46 @@ export default class RangeRingAngleText {
     }
 
 
+    hideAll() {
+        this._hideAll = true;
+        const deleteBucket = {
+            coords: [],
+            coordsZ: [],
+            attribs: []
+        }
+        for (const [centerID, centerMap] of this._centerCollection) {
+            const hide = centerMap.get("hide");
+            const hideText = centerMap.get("textHide");
+            const isHidden = hide === ENUM_HIDE.HIDE || hideText === ENUM_TEXT_HIDE.HIDE;
+            if (!isHidden) this._fillDeleteBucket(centerID, deleteBucket);
+            centerMap.set("hide", ENUM_HIDE.HIDE);
+        }
+        this._updateData(deleteBucket, CSObjectArrayUpdateTypes.DELETE);
+    }
+
+    showAll() {
+        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");
+            const isHidden = hide === ENUM_HIDE.HIDE || 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("hide", ENUM_HIDE.SHOW);
+                centerMap.set("textHide", ENUM_TEXT_HIDE.SHOW);
+            }
+        }
+        if (addBucket.coords.length) this._updateData(addBucket, CSObjectArrayUpdateTypes.ADD);
+    }
 
 
 

package/rangerings/rangerings.js

@@ -22,15 +22,17 @@ const { CircleFlatProgram, PaddyFlatProgram, CirclePaddySharedBuffer } = rings;
 
 export default class {
 
-    constructor(id, { oneDegreePadding = true, compass = COMPASS_MODES.COMPASS, showNumbers = true } = {}) {
+    constructor(id, { oneDegreePadding = true, compass = COMPASS_MODES.REAL, showNumbers = true, numbersStyle = null } = {}) {
         this.id = id;
         this.compass = compass;
         this._showNumbers = showNumbers;
+        this._numbersStyle = numbersStyle;
         this.circleEdgeCount = 360;
         this._onedegreepaddingOn = oneDegreePadding;
         this.bufferManager = null;
     }
 
+
     setOneDegreePaddingOn(oneDegreePadding) {
         this._onedegreepaddingOn = oneDegreePadding;
     }
@@ -42,7 +44,8 @@ export default class {
         this.paddyFlatProgram = new PaddyFlatProgram(globe, gl);
         this.paddingFreeAngleProgram = PaddingFreeAngleCache.getProgram(globe);
         if (this._showNumbers) {
-            this._textPlugin = new RangeRingAngleText(globe, { flatCompassMode: this.compass });
+            this.textPlugin = new RangeRingAngleText(globe, this.id + "text", { flatCompassMode: this.compass, style: this._numbersStyle });
+            delete this._numbersStyle;
         }
     }
 
@@ -50,16 +53,15 @@ export default class {
     free() {
         this.circleFlatProgram.free();
         this.paddyFlatProgram.free();
-        if (this.bufferManager !== null) {
-            this.bufferManager.free();
-        }
+        this.bufferManager?.free();
+        this.textPlugin?.free();
     }
 
 
 
 
     setGeometry() {
-        this._textPlugin?.setGeometry();
+        this.textPlugin?.setGeometry();
     }
 
 
@@ -87,7 +89,7 @@ export default class {
      */
     setCampass(compass) {
         this.compass = compass;
-        this._textPlugin?.setCompass(compass);
+        this.textPlugin?.setCompass(compass);
     }
 
     initilizeBufferManager(initialRingCapacity, bufferDrawType) {
@@ -110,7 +112,7 @@ export default class {
             item.paddingAngles = angleToPaddingAngles(item.stepAngle, 0);
         }
         this.paddingBufferManager.insertBulk(items);
-        this._textPlugin?.insertBulk(items);
+        this.textPlugin?.insertBulk(items);
         this.globe.DrawRender();
     }
 
@@ -118,7 +120,7 @@ export default class {
     updateCentersXY(items) {
         this.bufferManager.updateCentersXY(items);
         this.paddingBufferManager.updateCentersXY(items);
-        this._textPlugin?.updateCentersXY(items);
+        this.textPlugin?.updateCentersXY(items);
         this.globe.DrawRender();
     }
 
@@ -134,7 +136,7 @@ export default class {
     removeCenters(centerIds) {
         this.bufferManager.removeCenters(centerIds);
         this.paddingBufferManager.removeCenters(centerIds);
-        this._textPlugin?.removeCenters(centerIds);
+        this.textPlugin?.removeCenters(centerIds);
         // this.bufferManager.defrag();
         // this.paddingBufferManager.defrag();
         this.globe.DrawRender();
@@ -145,7 +147,7 @@ export default class {
     updateCentersHide(centerHides) {
         this.bufferManager.updateCentersHide(centerHides);
         this.paddingBufferManager.updateCentersHide(centerHides);
-        this._textPlugin?.updateCentersHide(centerHides);
+        this.textPlugin?.updateCentersHide(centerHides);
         this.globe.DrawRender();
     }
 }