@pirireis/webglobeplugins 0.6.8 → 0.6.10

package/bearing-line/plugin.js

@@ -3,6 +3,7 @@ import { LineOnGlobeCache } from '../programs/line-on-globe/naive';
 import { CircleCache } from '../programs/line-on-globe/circle';
 import { BufferOrchestrator, BufferManager } from '../util/account';
 import { AngledLineProgramCache } from '../programs/line-on-globe/angled-line';
+import { mapGetOrThrow } from "../util/check/get";
 import { ContextTextWriter } from '../write-text/context-text'
 export const RINGPARTIAL_DRAW_MODE = Object.freeze({
     LINE_STRIP: "LINE_STRIP",
@@ -235,7 +236,7 @@ export default class Plugin {
      */
     insertBulk(items, textWriterInjectionSubSetIDs = []) {
         const { globe, bufferOrchestrator, bufferManagersCompMap } = this;// angleTextContext, distanceTextContext,
-        const textWriterInjectionSubSets = this._getTextWriterInjectionSubSet(textWriterInjectionSubSetIDs);
+        const textWriterInjectionSubSets = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);
         const data = []
         for (let item of items) {
             this._insertTexts(item, textWriterInjectionSubSets);
@@ -269,7 +270,7 @@ export default class Plugin {
      * @param {Array<string>} textWriterInjectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
      */
     updateCoordinatesBulk(items, textWriterInjectionSubSetIDs = []) { //TODO
-        const injectionsSubSet = this._getTextWriterInjectionSubSet(textWriterInjectionSubSetIDs);
+        const injectionsSubSet = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);;
         const { globe, bufferOrchestrator, bufferManagersCompMap, } = this;
         const data = []
         for (let item of items) {
@@ -292,7 +293,7 @@ export default class Plugin {
     updatePartial(items, propertyIDs = [], textWriterInjectionSubSetIDs = []) { // textWriterInjectionSubSetIDs = []
         if (propertyIDs.length === 0) console.warn("updatePartial is called with no target propertyIDs");
         const { _textContextInjectionMap, bufferOrchestrator, bufferManagersCompMap } = this;
-        const writers = this._getTextWriterInjectionSubSet(textWriterInjectionSubSetIDs); // TODO:filter out rgba? this might be a bug
+        const writers = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);
         for (let item of items) { this._insertTexts(item, writers) }
         bufferOrchestrator.updateBulk(items, bufferManagersCompMap, propertyIDs);
         // patch to update text opacity
@@ -406,17 +407,7 @@ export default class Plugin {
         });
     }
 
-    textContextInjection
-    _getTextWriterInjectionSubSet(textWriterIds) {
-        const { _textContextInjectionMap } = this;
-        const result = [];
-        for (const id of textWriterIds) {
-            const writerAndAdaptors = _textContextInjectionMap.get(id);
-            if (writerAndAdaptors === undefined) throw new Error("textContextInjection id does not exist in map:" + id);
-            result.push(writerAndAdaptors)
-        }
-        return result;
-    }
+
 }
 
 
@@ -427,6 +418,8 @@ const integralSec = (angle) => {
     return Math.log(Math.tan(angle / 2 + Math.PI / 4));
 }
 
+const textWriterGetOrThrow = mapGetOrThrow("textContextInjection id does not exist in map:")
+
 const calculateStartAngle = (long, lat, endLong, endLat) => {
     const dLat = (integralSec(endLat) - integralSec(lat)); // Because lines are strectes toward poles.
     const dLong = endLong - long;

package/circle-line-chain/plugin.js

@@ -2,6 +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 { mapGetOrThrow } from "../util/check/get";
 import { keyMethod } from "./util";
 import { ContextTextWriter3 } from '../write-text/context-text3';
 // TODO: Add update buffer and update text mehods on add, delete, update methods
@@ -316,23 +317,12 @@ export class CircleLineChainPlugin {
 
     _updateTexts(chainKeys, textWriterIDs) {
         if (textWriterIDs.length === 0) return;
-        const textWriters = this._getTextWriterInjectionSubSet(textWriterIDs)
+        const textWriters = textWriterGetOrThrow(this._textContextWriterInjectionMap, textWriterIDs)
         chainKeys.forEach((chainKey) => {
             this._chainListMap.textUpdate(chainKey, textWriters, this._textDataPreAdaptor);
         })
     }
 
-    _getTextWriterInjectionSubSet(textWriterIds) {
-        const { _textContextWriterInjectionMap } = this;
-        const result = [];
-        for (const id of textWriterIds) {
-            const w = _textContextWriterInjectionMap.get(id);
-            if (w === undefined) throw new Error("textContextInjection id does not exist in map:" + id);
-            result.push(w)
-        }
-        return result;
-    }
-
 
     _reconstructChains(chainKeys) {
         const { globe } = this;
@@ -400,4 +390,6 @@ export class CircleLineChainPlugin {
 
 const radiusMethod = (globe) => (v, i, array) => {
     return globe.Math.GetDist3D(v.long, v.lat, array[i + 1].long, array[i + 1].lat)
-} 
+}
+
+const textWriterGetOrThrow = mapGetOrThrow("textWriterIds is invalid")

package/package.json

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

package/programs/line-on-globe/circle.js

@@ -54,7 +54,12 @@ void main() {
         gl_Position = cartesian3DToGLPosition(position);
         v_limp = vec2(0.0, 0.0);
     } else {
-        vec2 position = circleLimpFromLongLatRadCenterMercatorRealDistance( center_position, radius, angle);
+        vec2 position;
+        if (radius < 250.0) {
+            position = circleLimpFromLongLatRadCenterMercatorCompass( center_position, radius, angle);
+        } else {
+           position = circleLimpFromLongLatRadCenterMercatorRealDistance( center_position, radius, angle);
+        }
         v_limp = position;
         gl_Position = mercatorXYToGLPosition( position);
 

package/util/check/get.js

@@ -0,0 +1,12 @@
+
+export const mapGetOrThrow = (errorNote) => {
+    return (mapInstance, ids) => {
+        const result = [];
+        for (let i = 0; i < ids.length; i++) {
+            const e = mapInstance.get(ids[i]);
+            if (e === undefined) throw new Error(errorNote + ":" + ids[i]);
+            result.push(e);
+        }
+        return result;
+    }
+}

package/util/check/typecheck.js

@@ -1,10 +1,28 @@
+// Generic
 
+const doesOwnProperties = (properties, errorMessage) => {
+    return (object) => {
+        properties.forEach(element => {
+            if (!Object.hasOwn(object, element)) throw new TypeError(errorMessage + ':' + element);
+        });
+    }
+}
 
 export const isHexColor = (hexColor) => /^#[0-9A-F]{6}$/i.test(hexColor);
 export const isHexColorWithOpacity = (hexColor) => /^#[0-9A-F]{6}[0-9a-f]{0,2}$/i.test(hexColor);
 
-export const doesOwnProperties = (properties, errorMessage) => (object) => {
-    properties.array.forEach(element => {
-        if (!Object.hasOwn(object, element)) throw new TypeError(errorMessage + ' ' + element);
-    });
+export const opacityCheck = (opacity) => {
+    if (typeof opacity !== "number") throw new TypeError("style.opacity must a number");
+    if (opacity < 0 || 1 < opacity) throw new RangeError("Opacity Range Must be 0-1");
 }
+// Text Related 
+
+const fontCheckTypes = doesOwnProperties(["name", "textColor", "hollowColor", "size", "bold", "italic"], "font does not have");
+const fontCheckColors = (textColor, hollowColor) => isHexColor(textColor) && isHexColor(hollowColor);
+export const isTextFont = (textFont) => {
+    fontCheckTypes(textFont);
+    fontCheckColors(textFont.textColor, textFont.hollowColor);
+    if (typeof textFont.size !== "number") throw new TypeError("textFont size is not a number");
+
+}
+

package/write-text/context-text3.js

@@ -1,4 +1,5 @@
 import { CSZMode } from "@pirireis/webglobe";
+import { isTextFont, opacityCheck } from "../util/check/typecheck";
 
 /**
  * TODOs:
@@ -39,9 +40,8 @@ export class ContextTextWriter3 {
     } = {}) {
         this.globe = globe;
         this.itemMap = new Map();
-        this.style = style;
+        this.setStyle(style);
         this.doDraw = doDraw;
-
         this._checkParameterTypes(textAdaptor, coordinatesAdaptor, keyAdaptor, opacityAdaptor, angleAdaptor, xOffset, yOffset);
 
         this.textAdaptor = textAdaptor;
@@ -83,6 +83,8 @@ export class ContextTextWriter3 {
     }
 
     setStyle(style) {
+        isTextFont(style.textFont);
+        opacityCheck(style.opacity);
         this.style = style;
     }
 

package/write-text/util.js

@@ -1,12 +0,0 @@
-import { doesOwnProperties, isHexColor } from "../util/check/typecheck";
-
-const fontCheckTypes = doesOwnProperties(["name", "textColor", "hollowColor", "size", "bold", "italic"], "font does not have");
-const fontCheckColors = (textColor, hollowColor) => isHexColor(textColor) && isHexColor(hollowColor);
-
-export const isTextFont = (textFont) => {
-    fontCheckTypes(textFont);
-    fontCheckColors(textFont.textColor, textFont.hollowColor);
-    if (!(textFont.size instanceof Number)) throw new TypeError("textFont size is not a number");
-
-}
-