@pirireis/webglobeplugins 0.1.3 → 0.1.5

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.3",
+    "version": "0.1.5",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT"

package/programs/rings/distancering/circlepaddingfreeangleprogram.js

@@ -32,7 +32,7 @@ out vec4 v_color;
 void main() {   
     if( flag == 1.0 || radius == 0.0 ) return; // 1.0 is hide 
     v_color = color;
-    if ( pad_angle == 0.0 ) v_color.rgb += 0.2;
+    if ( pad_angle == 0.0 ) v_color.rgb -= 0.2;
     gl_PointSize = 2.0;
 
     float odd = mod(float(gl_VertexID), 2.0);

package/rangerings/rangeringangletext.js

@@ -33,10 +33,10 @@ const object = {
 
 
 export default class RangeRingAngleText {
-    constructor(globe, { style = null, flatCompassMode = COMPASS_MODES.REAL } = {}) {
+    constructor(globe, id, { style = null, flatCompassMode = COMPASS_MODES.REAL } = {}) {
         this.globe = globe;
         this.ObjectArray = globe.ObjectArray;
-
+        this.id = id;
         this._flatCompassMode = flatCompassMode;
         this._lastImplicitCompassMode = this.__implicitCompassMode();
         if (style) {
@@ -64,7 +64,7 @@ export default class RangeRingAngleText {
 
         this.style.labels[0].text = "`${aci}`"
         this.style.fidKey = fidKey;
-        this.object = Object.assign({}, object, { style: this.style });
+        this.object = Object.assign({}, object, { style: this.style, id: this.id });
 
         this._centerCollection = new Map();
         // new inner MAP params
@@ -85,11 +85,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
@@ -292,8 +291,8 @@ export default class RangeRingAngleText {
             });
         }
         let aci = stepAngle;
-        const cutAway = 0 == (360 % stepAngle) ? 1 : 0;
-        for (let i = 1; i < coords_.length - cutAway; i++) {
+        for (let i = 1; i < coords_.length; i++) {
+            if (aci >= 360) break;
             const { long, lat } = coords_[i];
             coords.push(long, lat);
             coordsZ.push(0);

package/rangerings/rangerings.js

@@ -31,6 +31,7 @@ export default class {
         this.bufferManager = null;
     }
 
+
     setOneDegreePaddingOn(oneDegreePadding) {
         this._onedegreepaddingOn = oneDegreePadding;
     }
@@ -42,7 +43,7 @@ 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 });
         }
     }
 
@@ -50,9 +51,8 @@ export default class {
     free() {
         this.circleFlatProgram.free();
         this.paddyFlatProgram.free();
-        if (this.bufferManager !== null) {
-            this.bufferManager.free();
-        }
+        this.bufferManager?.free();
+        this._textPlugin?.free();
     }
 
 
@@ -100,7 +100,7 @@ export default class {
 
     /**
      * @typedef {Array<{ringID, radius, paddingRange}>} rings
-     * @param {Array<centerID:string, x:number, y:number, paddingAngles:Array<number>, rgba:[4number], rings:rings} items
+     * @param {Array<centerID:string, x:number, y:number, stepAngle:number, rgba:[4 numbers], rings:rings} items
      */
     insertBulk(items) {
         const insertData = ringItemsToCircleBufferInsertDataAdaptor(items);
@@ -132,7 +132,6 @@ export default class {
 
     // TODO: test
     removeCenters(centerIds) {
-
         this.bufferManager.removeCenters(centerIds);
         this.paddingBufferManager.removeCenters(centerIds);
         this._textPlugin?.removeCenters(centerIds);