@pirireis/webglobeplugins 0.6.7 → 0.6.9

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",
@@ -65,12 +66,12 @@ export default class Plugin {
     }
 
     _checkTextContextInjectionMap(textContextInjectionMap) {
-        if (!(textContextInjectionMap instanceof Map)) throw new Error("textContextInjectionMap is not instance of Map");
+        if (!(textContextInjectionMap instanceof Map)) throw new TypeError("textContextInjectionMap is not instance of Map");
         textContextInjectionMap.forEach((v) => {
-            if (typeof v !== 'object') throw new Error("textContextInjectionMap format is wrong");
-            if (typeof v.coordsAdaptor !== 'function') throw new Error("textContextInjectionMap coordsAdaptor format is wrong");
-            if (typeof v.textAdaptor !== 'function') throw new Error("textContextInjectionMap textAdaptor format is wrong");
-            if (!(v.writer instanceof ContextTextWriter)) throw new Error("textContextInjectionMap writer is not instance of ContextTextWriter");
+            if (typeof v !== 'object') throw new TypeError("textContextInjectionMap format is wrong");
+            if (typeof v.coordsAdaptor !== 'function') throw new TypeError("textContextInjectionMap coordsAdaptor format is wrong");
+            if (typeof v.textAdaptor !== 'function') throw new TypeError("textContextInjectionMap textAdaptor format is wrong");
+            if (!(v.writer instanceof ContextTextWriter)) throw new TypeError("textContextInjectionMap writer is not instance of ContextTextWriter");
         })
     }
 
@@ -235,7 +236,7 @@ export default class Plugin {
      */
     insertBulk(items, textWriterInjectionSubSetIDs = []) {
         const { globe, bufferOrchestrator, bufferManagersCompMap } = this;// angleTextContext, distanceTextContext,
-        const textWriterInjectionSubSets = textWriterInjectionSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
+        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 = textWriterInjectionSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
+        const injectionsSubSet = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs);;
         const { globe, bufferOrchestrator, bufferManagersCompMap, } = this;
         const data = []
         for (let item of items) {
@@ -285,24 +286,23 @@ export default class Plugin {
     /**
      * 
      * @param {*} items some colums EXCEPT positional ones
-     * @param {*} propertyIDs 
-     * @param {*} textWriterInjectionSubSetIDs 
+     * @param {string} propertyIDs 
+     * @param {string} textWriterInjectionSubSetIDs 
      * Do NOT send empty data if property ID of this data is entered or NaN is loaded to the buffer, resulting in an unwanted behaviour.
      */
     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 = textWriterInjectionSubSetIDs.map((x) => _textContextInjectionMap.get(x));
+        const writers = textWriterGetOrThrow(this._textContextInjectionMap, textWriterInjectionSubSetIDs); // TODO:filter out rgba? this might be a bug
         for (let item of items) { this._insertTexts(item, writers) }
         bufferOrchestrator.updateBulk(items, bufferManagersCompMap, propertyIDs);
         // patch to update text opacity
         for (const property of propertyIDs) {
             if (property === "rgba") {
-                this._textContextInjectionMap.forEach((v) => {
+                _textContextInjectionMap.forEach((v) => {
                     const { writer } = v;
                     writer.updateOpacityBulk(items, (e) => e.key, (e) => e.rgba[3]);
                 })
-
             }
         }
         this.globe.DrawRender();
@@ -407,6 +407,7 @@ export default class Plugin {
         });
     }
 
+
 }
 
 
@@ -417,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
@@ -46,6 +47,7 @@ export class CircleLineChainPlugin {
         textDataPreAdaptor = null
     } = {}) {
         this.id = id;
+        this._checkTextContextWriterInjectionMap(textContextWriterInjectionMap);
         this._textContextWriterInjectionMap = textContextWriterInjectionMap;
         this._textContextWriterInjectionMap.forEach((writer) => writer.setKeyAdaptor((v, i, c, properties) => v.__identity__));
         this._opacity = 1;
@@ -297,7 +299,6 @@ export class CircleLineChainPlugin {
             chainKeysToReconstuct.push(chainKey);
         });
         this._textContextWriterInjectionMap.forEach((writer) => writer.deleteTextBulk(bufferKeys));
-        // if (textWriterIDs) this._updateTexts(chainKeysToReconstuct, textWriterIDs)
         this.bufferOrchestrator.deleteBulk(bufferKeys, this.bufferManagersCompMap);
         this._reconstructChains(chainKeysToReconstuct);
         this._updateTexts(chainKeysToReconstuct, textWriterIDs);
@@ -315,14 +316,14 @@ export class CircleLineChainPlugin {
     // implicit
 
     _updateTexts(chainKeys, textWriterIDs) {
-        const textWriters = textWriterIDs.map((v) => this._textContextWriterInjectionMap.get(v));
+        if (textWriterIDs.length === 0) return;
+        const textWriters = textWriterGetOrThrow(this._textContextWriterInjectionMap, textWriterIDs)
         chainKeys.forEach((chainKey) => {
             this._chainListMap.textUpdate(chainKey, textWriters, this._textDataPreAdaptor);
         })
     }
 
 
-
     _reconstructChains(chainKeys) {
         const { globe } = this;
         //     this.lineVao = this.lineProgram.createVAO(
@@ -389,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.7",
+    "version": "0.6.9",
     "main": "index.js",
     "author": "Toprak Nihat Deniz Ozturk",
     "license": "MIT"

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

@@ -0,0 +1,23 @@
+// Generic
+
+export const doesOwnProperties = (properties, errorMessage) => (object) => {
+    properties.array.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);
+
+
+// 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 (!(textFont.size instanceof Number)) throw new TypeError("textFont size is not a number");
+
+}
+

package/write-text/context-text3.js

@@ -42,6 +42,7 @@ export class ContextTextWriter3 {
         this.style = style;
         this.doDraw = doDraw;
 
+        this._checkParameterTypes(textAdaptor, coordinatesAdaptor, keyAdaptor, opacityAdaptor, angleAdaptor, xOffset, yOffset);
 
         this.textAdaptor = textAdaptor;
         this.coordinatesAdaptor = coordinatesAdaptor;
@@ -63,6 +64,16 @@ export class ContextTextWriter3 {
         this.yOffset = yOffset;
     }
 
+    _checkParameterTypes(textAdaptor, coordinatesAdaptor, keyAdaptor, opacityAdaptor, angleAdaptor, xOffset, yOffset) {
+        if (textAdaptor !== null) if (!(textAdaptor instanceof Function)) throw new Error("textAdaptor is not an instance of a Function");
+        if (coordinatesAdaptor !== null) if (!(coordinatesAdaptor instanceof Function)) throw new Error("coordinatesAdaptor is not an instance of a Function");
+        if (keyAdaptor !== null) if (!(keyAdaptor instanceof Function)) throw new Error("keyAdaptor is not an instance of a Function");
+        if (opacityAdaptor !== null) if (!(opacityAdaptor instanceof Function)) throw new Error("opacityAdaptor is not an instance of a Function");
+        if (angleAdaptor !== null) if (!(angleAdaptor instanceof Function)) throw new Error("angleAdaptor is not an instance of a Function");
+        if (typeof xOffset !== "number") throw new Error("xOffset type is not a number");
+        if (typeof yOffset !== "number") throw new Error("yOffset type is not a number");
+    }
+
     setKeyAdaptor(adaptor) {
         this.keyAdaptor = adaptor;
     }

package/write-text/util.js

@@ -0,0 +1,4 @@
+import { doesOwnProperties, isHexColor } from "../util/check/typecheck";
+
+
+