@pirireis/webglobeplugins 0.6.0 → 0.6.1

package/compass-rose/compass-rose-padding-flat.js

@@ -23,6 +23,7 @@ export class PixelPaddingCompassPlugin {
 
         this.compassMap = new CompassMap(this);
         this._opacity = opacity;
+
     }
 
     init(globe, gl) {
@@ -35,7 +36,7 @@ export class PixelPaddingCompassPlugin {
     }
 
     insert(key, long, lat, properties = null) {
-        this.__insertText(key, null, null, properties);
+        this.__insertText(key, null, null, { properties, update: true });
         this.compassMap.insert(key, long, lat, properties);
         this.globe.DrawRender();
 
@@ -99,15 +100,19 @@ export class PixelPaddingCompassPlugin {
         this.writer = new ContextTextWriter2Offsets(this.globe, { angle: PaddingAngle });
     }
 
-    __insertText(key, x, y, properties) {
+    __insertText(key, x, y, { properties, update = false } = {}) {
         if (!this.writer) return;
-        let radius;
-        if (properties != null && properties.pixelRadiusBig) {
-            radius = properties.pixelRadiusBig
+        if (update) {
+            let radius;
+            if (properties != null && properties.pixelRadiusBig) {
+                radius = properties.pixelRadiusBig
+            } else {
+                radius = this.defaultProperties.pixelRadiusBig;
+            }
+            this.writer.insertTextItem(key, x, y, radius);
         } else {
-            radius = this.defaultProperties.pixelRadiusBig;
+            this.writer.insertTextItem(key, x, y)
         }
-        this.writer.insertTextItem(key, x, y, radius);
     }
 
     // Globe API interface methods

package/compass-rose/compass-text-writer.js

@@ -21,13 +21,41 @@ const defaultStyle = {
  * 3) extend the mechanic on 2 to other events
  */
 export class ContextTextWriter2Offsets {
-    constructor(globe, { style = null, doDraw = true, angle = 30, } = {}) {
+    constructor(globe, { style = null, northStyle = {
+        textFont: {
+            name: 'Arial',
+            textColor: '#BB0000', // beyaz
+            hollowColor: '#000000', // siyah
+            size: 14, // piksel
+            hollow: true,
+            bold: true,
+            italic: false,
+        },
+        opacity: 1.0,
+        zMode: CSZMode.Z_GROUND_PERVERTEX,
+    }, doDraw = true, angle = 30, } = {}) {
         this.globe = globe;
         this.itemMap = new Map();
         this.style = style || defaultStyle;
+        this.northStyle = northStyle || defaultStyle;
         this.doDraw = doDraw;
         this.angle = angle;
 
+        this.angles = []
+        this.texts = []
+        let currentAngle = 0;
+        while (currentAngle < 360) {
+            this.angles.push(currentAngle);
+            if (currentAngle == 0) {
+                this.texts.push("K");
+            } else {
+                this.texts.push(currentAngle.toString());
+            }
+            currentAngle += this.angle;
+        }
+        this._lastNorthAngle = globe.api_GetCurrentLookInfo()["NorthAng"] * (Math.PI / 180);
+        this.offsets = this.__offset(this._lastNorthAngle);
+
 
     }
 
@@ -48,22 +76,37 @@ export class ContextTextWriter2Offsets {
     }
 
 
+    _checkSetOffsets() {
+        const { globe } = this;
+        const newAngle = globe.api_GetCurrentLookInfo()["NorthAng"] * (Math.PI / 180);;
+        console.log("n angle", newAngle);
+        if (newAngle !== this._lastNorthAngle) {
+            this._lastNorthAngle = newAngle;
+            this.offsets = this.__offset();
+        }
+    }
+
 
     draw() {
         if (!this.doDraw) return;
-        const { globe, style, itemMap } = this;
+        const { globe, style, itemMap, texts, angles } = this;
         const { textFont, opacity: opacity_ } = style;
-        const is3D = globe.api_GetCurrentGeometry() === 0;
-        if (is3D) return;
-        const angleIsOn = is3D ? (this.angleAdaptorIsOn && this.angleOnSphere) : (this.angleAdaptorIsOn)
-        for (const [key, { center, offsets, texts, opacity = null, angles }] of itemMap) {
+        const { textFont: nFont } = this.northStyle;
+        this._checkSetOffsets();
+        const offsets = this.offsets;
+        for (const [key, { center, radius, opacity = null }] of itemMap) {
             const o = opacity === null ? opacity_ : opacity * opacity_;
             if (center.x !== null && center.y !== null) {
                 offsets.forEach(({ offsetX, offsetY }, i) => {
                     const text = texts[i];
                     const angle = angles[i];
-                    console.log("asdfadsf", text, angle, center, offsetX, offsetY);
-                    globe.api_DrawContextTextMultiLine(text, textFont, o, { x: center.x + offsetX, y: center.y + offsetY }, angleIsOn, angle);
+                    if (angle === 0) {
+                        globe.api_DrawContextTextMultiLine(text, nFont, o, { x: center.x + offsetX * radius, y: center.y + offsetY * radius });
+
+                    } else {
+                        globe.api_DrawContextTextMultiLine(text, textFont, o, { x: center.x + offsetX * radius, y: center.y + offsetY * radius });
+
+                    }
                 });
             }
 
@@ -71,15 +114,13 @@ export class ContextTextWriter2Offsets {
     }
 
 
-    insertTextItem(key, x, y, radius) {
+    insertTextItem(key, x, y, radius = undefined) {
         const item = this.getItem(key);
         item.center = { x, y };
+        if (radius === undefined) return;
         if (item.radius != undefined && item.radius === radius) return;
         item.radius = radius;
-        const { offsets, angles, texts } = this.__offsetAngleText(radius);
-        item.offsets = offsets;
-        item.angles = angles;
-        item.texts = texts;
+
     }
 
     getItem(key) {
@@ -87,28 +128,21 @@ export class ContextTextWriter2Offsets {
         return this.itemMap.get(key);
     }
 
-    __calculateOffset(radius, angle) {
+    __calculateOffset(angle) {
         const rAngle = (angle - 90) * (Math.PI / 180);
-        return { offsetX: Math.cos(rAngle) * radius, offsetY: Math.sin(rAngle) * radius };
+        return { offsetX: Math.cos(rAngle + this._lastNorthAngle), offsetY: Math.sin(rAngle + this._lastNorthAngle) };
     }
 
-    __offsetAngleText(radius) {
+    __offset() {
         const angle = this.angle;
         const offsets = []
-        const angles = []
-        const texts = []
         let currentAngle = 0;
         while (currentAngle < 360) {
-            offsets.push(this.__calculateOffset(radius + 10, currentAngle));
-            angles.push(currentAngle);
-            if (currentAngle == 0) {
-                texts.push("K");
-            } else {
-                texts.push(currentAngle.toString());
-            }
+            offsets.push(this.__calculateOffset(currentAngle));
+
             currentAngle += angle;
         }
-        return { offsets, angles, texts };
+        return offsets;
     }
 
 

package/package.json

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