@pirireis/webglobeplugins 0.8.6 → 0.8.7

package/bearing-line/plugin.js

@@ -1,24 +1,42 @@
-import { pieceOfPieProgramCache } from '../programs/rings/partial-ring/piece-of-pie';
-import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
+import { PieceOfPieProgramCache } from '../programs/rings/partial-ring/piece-of-pie';
+import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate-flexible';
 import { CircleCache as Circle3DCache } from '../programs/line-on-globe/circle-accurate-3d';
 import { CircleCache, EDGE_COUNT as flatCircleEdgeCount, centerCoords2dflatDataCreator } from '../programs/line-on-globe/circle-accurate-flat';
 import { BufferOrchestrator, BufferManager } from '../util/account';
 import { mapGetOrThrow } from "../util/check/get";
 import { populateFloat32Array } from "../util/jshelpers/data-filler";
 import { ContextTextWriter3 } from '../write-text/context-text3'
+import { constraintFloat, isBoolean } from '../util/check/typecheck';
 
+import { createBufferAndReadInfo } from '../util/gl-util/buffer/integrate-buffer';
 
 export const RINGPARTIAL_DRAW_MODE = Object.freeze({
     LINE_STRIP: "LINE_STRIP",
     TRIANGLE_FAN: "TRIANGLE_FAN",
 });
 
-const constraintFloat = (x, lowerBound, upperBound) => {
-    if (typeof x !== "number") throw new Error("type must be numberic")
-    if (lowerBound > x || x > upperBound) throw new Error(`input must be between ${lowerBound} - ${upperBound}`)
+
+
+const textWriterGetOrThrow = mapGetOrThrow("BearingLine textContextInjection id does not exist in map")
+
+
+const radian = (degree) => degree * Math.PI / 180;
+
+const integralSec = (angle) => {
+    return Math.log(Math.tan(angle / 2 + Math.PI / 4));
 }
 
 
+const calculateStartAngle = (long, lat, endLong, endLat) => {
+    const dLat = (integralSec(endLat) - integralSec(lat)); // Because lines are strectes toward poles.
+    const dLong = endLong - long;
+
+    let angle = -Math.atan2(dLat, dLong);
+    return angle;
+}
+
+
+
 export default class BearingLinePlugin {
     /**
      * @param {*} id 
@@ -52,6 +70,7 @@ export default class BearingLinePlugin {
 
 
     setDoDrawVRM(bool) {
+        isBoolean(bool);
         if (bool === this.drawVRM) return;
         this.drawVRM = bool;
         this.globe.DrawRender();
@@ -59,6 +78,7 @@ export default class BearingLinePlugin {
 
 
     setDoDrawText(bool) {
+        isBoolean(bool);
         if (bool === this.drawText) return;
         this.drawText = bool;
         this.globe.DrawRender();
@@ -66,6 +86,7 @@ export default class BearingLinePlugin {
 
 
     setDoDrawText(bool) {
+        isBoolean(bool);
         if (bool === this.drawText) return;
         this.drawText = bool;
         this.globe.DrawRender();
@@ -73,6 +94,7 @@ export default class BearingLinePlugin {
 
 
     setDoDrawAngleRing(bool) {
+        isBoolean(bool);
         if (bool === this.drawAngleRing) return;
         this.drawAngleRing = bool;
         this.globe.DrawRender();
@@ -295,7 +317,7 @@ export default class BearingLinePlugin {
         this.gl = gl;
         this.globe = globe;
         this.lineProgram = LineOnGlobeCache.get(globe);
-        this.ringProgram = pieceOfPieProgramCache.get(globe);
+        this.pieceOfPieProgram = PieceOfPieProgramCache.get(globe);
         this.circleProgram = CircleCache.get(globe);
         this.circle3DProgram = Circle3DCache.get(globe);
         const circleFlatEdgeCount = this.circleFlatEdgeCount
@@ -398,30 +420,30 @@ export default class BearingLinePlugin {
                 ]
             );
         }
-        const obj = function (bufferManagerComp, divisor = 1) {
-            return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0, divisor }
-        };
+
+        const vaoOBJ = (key) => createBufferAndReadInfo(this.bufferManagersCompMap.get(key).bufferManager.buffer);
         this.lineVao = this.lineProgram.createVAO(
-            ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
-        this.ringVao = this.ringProgram.createVAO(
-            ...['centerCoords2d', 'centerCoords3d',
+            ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashOpacity', 'dashOpacity', 'rgba'].map(
+                key => vaoOBJ(key)));
+        this.ringVao = this.pieceOfPieProgram.createVAO(
+            ...['centerCoords2d',
+                'centerCoords3d',
                 'startAngle2d',
                 'tailAngle2d',
                 'startAngle3d',
                 'tailAngle3d',
                 'rgba',
                 'radius',
-                'rgbaMode'].map(key => obj(this.bufferManagersCompMap.get(key))));
-        {
-            this.bearingLineVAO = this.lineProgram.createVAO(
-                ...['centerCoords2d', 'centerCoords3d', 'bearingTargetCoords2d', 'bearingTargetCoords3d', 'bearingDashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
-        }
+                'rgbaMode'].map(key => vaoOBJ(key)));
+        this.bearingLineVAO = this.lineProgram.createVAO(
+            ...['centerCoords2d', 'centerCoords3d', 'bearingTargetCoords2d', 'bearingTargetCoords3d', 'bearingDashRatio', 'dashOpacity', 'rgba'
+            ].map(key => vaoOBJ(key)));
         this.circleVao = this.circleProgram.createVAO(
-            ...["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"].map(key => obj(this.bufferManagersCompMap.get(key)))
-        );
+            ...["centerCoords2dflat", "rgbaMercator", "circleDashAngleMercator", "dashOpacityMercator"
+            ].map(key => vaoOBJ(key)));
         this.circle3DVao = this.circle3DProgram.createVAO(
-            ...["centerCoords3d", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key)))
-        );
+            ...["centerCoords3d", "bigRadius", "rgba", "circleDashAngle", "dashOpacity", "startAngle2d"
+            ].map(key => vaoOBJ(key)));
     }
 
 
@@ -429,13 +451,16 @@ export default class BearingLinePlugin {
         const { gl } = this;
         gl.disable(gl.DEPTH_TEST);
         const is3D = this.globe.api_GetCurrentGeometry() === 0;
-        this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
+        const drawRange = { first: 0, count: this.bufferOrchestrator.length }
+
+        this.lineProgram.draw(this.lineVao, { drawRange }, this._opacity);
         if (this.drawAngleRing) {
-            this.ringProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
-            this.ringProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity, RINGPARTIAL_DRAW_MODE.LINE_STRIP);
+            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.TRIANGLE_FAN);
+            this.pieceOfPieProgram.draw(this.bufferOrchestrator.length, this.ringVao, 360, this._opacity * 0.8, RINGPARTIAL_DRAW_MODE.LINE_STRIP);
         }
         if (this.drawBearingLine) {
-            this.lineProgram.draw(this.bearingLineVAO, this.bufferOrchestrator.length, this._opacity * 0.8);
+            // this.lineProgram.draw(this.bearingLineVAO, this.bufferOrchestrator.length, this._opacity );
+            this.lineProgram.draw(this.bearingLineVAO, { drawRange }, this._opacity);
         }
         if (this.drawVRM) {
             if (is3D) {
@@ -463,7 +488,7 @@ export default class BearingLinePlugin {
         gl.deleteVertexArray(this.circleVao);
         gl.deleteVertexArray(this.circle3DVao);
         LineOnGlobeCache.release(globe);
-        pieceOfPieProgramCache.release(globe);
+        PieceOfPieProgramCache.release(globe);
         CircleCache.release(globe);
         Circle3DCache.release(globe)
         this.isFreed = true;
@@ -478,20 +503,3 @@ export default class BearingLinePlugin {
 }
 
 
-
-const radian = (degree) => degree * Math.PI / 180;
-
-const integralSec = (angle) => {
-    return Math.log(Math.tan(angle / 2 + Math.PI / 4));
-}
-
-const textWriterGetOrThrow = mapGetOrThrow("BearingLine 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;
-
-    let angle = -Math.atan2(dLat, dLong);
-    return angle;
-}
-

package/circle-line-chain/plugin.js

@@ -1,14 +1,14 @@
-import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate';
+import { LineOnGlobeCache } from '../programs/line-on-globe/naive-accurate-flexible';
 import { CircleCache, EDGE_COUNT as flatCircleEdgeCount, centerCoords2dflatDataCreator } from '../programs/line-on-globe/circle-accurate-flat';
 import { CircleCache as Circle3DCache } from '../programs/line-on-globe/circle-accurate-3d';
-import { LineToTheOriginCache } from "../programs/line-on-globe/to-the-origin"
 import { BufferOrchestrator, BufferManager } from "../util/account";
 import { ChainListMap } from "./chain-list-map";
 import { mapGetOrThrow } from "../util/check/get";
 import { keyMethod } from "./util";
 import { populateFloat32Array } from "../util/jshelpers/data-filler";
 import { ContextTextWriter3 } from '../write-text/context-text3';
-
+import { isBoolean, constraintFloat, opacityCheck } from '../util/check/typecheck';
+import { createBufferAndReadInfo } from '../util/gl-util/buffer/integrate-buffer';
 
 /**
  * Insert info to chain list map (nodes and properties)
@@ -27,14 +27,34 @@ import { ContextTextWriter3 } from '../write-text/context-text3';
 
 
 /**
+ * 
+ * 
+ * @typedef chain
+ * @property {string} chainKey
+ * @property {StyleProperties} chainProperties
+ * 
+ * @typedef {Object} Node
+ * @property {string} key
+ * @property {number} long
+ * @property {number} lat  
+ * @property {StyleProperties} circleProperties
+ * 
+ * @typedef {Object} Node
+ * @property {string} key
+ * @property {number} long
+ * @property {number} lat  
+ * 
  * @typedef StyleProperties
- * @property {[0-1,0-1,0-1,0-1]} rgba
- * @property { 0-1 } dashOpacity 
- * @property { 0-1 } dashRatio
- * @property {0-360} circleDashAngle 
- * @property {Array<node>} nodes
+ * @property {Array<number>} rgba 0-1
+ * @property { number} dashOpacity 0-1
+ * @property { number} dashRatio 0-1
+ * @property { number } circleDashAngle 0-360
+ * @property {Array<Node>} nodes
  */
 
+
+const textWriterGetOrThrow = mapGetOrThrow("textWriterIDs is invalid");
+
 export class CircleLineChainPlugin {
     /**
      * 
@@ -73,11 +93,8 @@ export class CircleLineChainPlugin {
      * @param {Array<chain>} data 
      * @typedef chain
      * @property {string} chainKey
-     * @property {Array<node>} nodes
-     * @typedef {Object} node
-     * @property {string} key
-     * @property {number} long
-     * @property {number} lat  
+     * @property {Array<Node>} nodes
+
      */
     updateCoordinatesBulk(data, { textWriterIDs = [] } = {}) {
         // update implicit data structure
@@ -144,17 +161,6 @@ export class CircleLineChainPlugin {
     /**
      * 
      * @param {Array<chain>} data 
-     * @typedef chain
-     * @property {string} chainKey
-     * @property {StyleProperties} chainProperties
-
-     *  } chainProperties
-     * 
-     * @typedef {Object} node
-     * @property {string} key
-     * @property {number} long
-     * @property {number} lat  
-     * @property {StyleProperties} circleProperties
      */
     insertBulk(data, { textWriterIDs = [] } = {}) {
         // first insert everything to implicit structure,
@@ -173,7 +179,7 @@ export class CircleLineChainPlugin {
     }
 
     /**
-     * @param {{key, long, lat}} node
+     * @param {Node} node
      * @param {*} chainKey 
      * @param {*} theNodeKeyFront | node key of the next node, null places to the last
      */
@@ -187,8 +193,7 @@ export class CircleLineChainPlugin {
 
 
     setOpacity(opacity) {
-        if (typeof opacity !== 'number') throw new Error("opacity must be a number");
-        if (opacity < 0 || 1 < opacity) throw new Error("opacity must be between 0-1");
+        opacityCheck(opacity);
         this._textWritersMap.forEach((writer) => writer.setOpacity(opacity));
         this._opacity = opacity;
         this.globe.DrawRender();
@@ -257,7 +262,6 @@ export class CircleLineChainPlugin {
         this.circleProgram2d = CircleCache.get(globe);
         this.circle3DProgram = Circle3DCache.get(globe);
 
-        // this.lineToTheOriginProgram = LineToTheOriginCache.get(globe);
         const _circleFlatEdgeCount = this._circleFlatEdgeCount;
         {
             // createBuffers
@@ -339,15 +343,19 @@ export class CircleLineChainPlugin {
                     }],
                 ]
             );
-            const obj = function (bufferManagerComp) {
-                return { 'buffer': bufferManagerComp.bufferManager.buffer, 'stride': 0, 'offset': 0 }
-            };
+            const obj = (key) => createBufferAndReadInfo(this.bufferManagersCompMap.get(key).bufferManager.buffer);
+
             this.lineVao = this.lineProgram.createVAO(
-                ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
+                ...['centerCoords2d', 'centerCoords3d', 'targetCoords2d', 'targetCoords3d', 'dashRatio', 'dashOpacity', 'rgba'
+                ].map(key => obj(key)));
+
             this.circleVao2d = this.circleProgram2d.createVAO(
-                ...["centerCoords2dMercator", "rgbaCircleMercator", "circleDashAngleMercator", "dashOpacityMercator"].map(key => obj(this.bufferManagersCompMap.get(key))));
+                ...["centerCoords2dMercator", "rgbaCircleMercator", "circleDashAngleMercator", "dashOpacityMercator"
+                ].map(key => obj(key)));
+
             this.circle3DVao = this.circle3DProgram.createVAO(
-                ...["centerCoords3d", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key)))
+                ...["centerCoords3d", "bigRadius", "rgbaCircle", "circleDashAngle", "dashOpacity"
+                ].map(key => obj(key))
             );
 
         }
@@ -367,15 +375,10 @@ export class CircleLineChainPlugin {
 
     _reconstructChains(chainKeys) {
         const { globe } = this;
-        //     this.lineVao = this.lineProgram.createVAO(
-        //         ...['centerCoords', 'targetCoords', 'dashRatio', 'dashOpacity', 'rgba'].map(key => obj(this.bufferManagersCompMap.get(key))));
-        //     this.circleVao2d = this.circleProgram2d.createVAO(
-        //         ...["centerCoords", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
-        // }   
 
         const radiusM = radiusMethod(globe);
         const callback = (v, i, array, chainProperties) => {
-            if (i == array.length - 1) return null;
+            if (i === array.length - 1) return null;
 
             const centerCoords2dflat = centerCoords2dflatDataCreator(globe, v.long, v.lat, array[i + 1].long, array[i + 1].lat, { edgeCount: this._circleFlatEdgeCount });
 
@@ -417,7 +420,7 @@ export class CircleLineChainPlugin {
         LineOnGlobeCache.release(this.globe);
         CircleCache.release(this.globe);
         Circle3DCache.release(this.globe);
-        LineToTheOriginCache.release(this.globe);
+        // LineToTheOriginCache.release(this.globe);
         this._textWritersMap.forEach((writer) => writer.free());
         const { gl } = this;
         gl.deleteVertexArray(this.lineVao);
@@ -432,9 +435,15 @@ export class CircleLineChainPlugin {
     draw3D() {
         const { gl, globe } = this;
         gl.disable(gl.DEPTH_TEST);
-        this.lineProgram.draw(this.lineVao, this.bufferOrchestrator.length, this._opacity);
+
+        const drawOptions = {
+            drawRange: {
+                first: 0,
+                count: this.bufferOrchestrator.length
+            }
+        }
+        this.lineProgram.draw(this.lineVao, drawOptions, this._opacity);
         this._textWritersMap.forEach((writer) => writer.draw());
-        // this.lineToTheOriginProgram.draw(this.toOriginVao, this.bufferOrchestrator.length, this._opacity);
         const is3D = globe.api_GetCurrentGeometry() === 0;
         if (this._drawCircleOn) {
             if (is3D) {
@@ -453,4 +462,3 @@ 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/compass-rose/compass-rose-padding-flat.js

@@ -185,6 +185,9 @@ export class PixelPaddingCompassPlugin {
 
     free() {
         this.compassMap.free();
+        const { globe, gl, paddingVao } = this;
+        gl.deleteVertexArray(paddingVao);
+        PixelPaddingForFlatCompassCache.release(globe);
         this.bufferManagersCompMap.forEach(v => {
             v.bufferManager.free();
         })

package/compassrose/compassrose.js

@@ -1,11 +1,4 @@
-// pusula mip map yapilacak
-// globa register edilecek
-// icon yerlestirilecek.
-// iconun acisi degisecek
-
-// varsayilan stilin bulunmasi gerekiyor
-// iconun acisi degisecek
-
+// TODO: REMOVE THIS
 import {
     CSGlobe,
     CSObjectTypes,

package/heatwave/isobar/plugin.js

@@ -4,6 +4,7 @@ import ContourMipmap, { scaleParameters } from "./quadtreecontours";
 
 import ObjectArrayLabels from "./objectarraylabels";
 
+import { isBoolean, opacityCheck } from "../../util/check/typecheck";
 
 
 export class IsobarRasterToVector {
@@ -77,6 +78,7 @@ export class IsobarRasterToVector {
     }
 
     setFlip(xFlip, yFlip) {
+        isBoolean(xFlip); isBoolean(yFlip);
         if (this.xFlip === xFlip && this.yFlip === yFlip) return;
         this.xFlip = xFlip;
         this.yFlip = yFlip;
@@ -97,6 +99,7 @@ export class IsobarRasterToVector {
 
 
     setIsLabelsOn(isLabelsOn) {
+        isBoolean(isLabelsOn);
         if (this._isLabelsOn === isLabelsOn) return;
         this._isLabelsOn = isLabelsOn;
         if (!isLabelsOn) {
@@ -135,7 +138,7 @@ export class IsobarRasterToVector {
     }
 
     setOpacity(opacity) {
-        if (opacity < 0 || opacity > 1) throw new Error("Opacity must be between 0 and 1");
+        opacityCheck(opacity);
         this.program.setOpacity(opacity);
     }
 

package/heatwave/isobar/quadtreecontours.js

@@ -253,8 +253,6 @@ class ContourMipmap {
             }
 
             if (fragmentStart.size !== fragmentEnd.size) {
-                // TODO: is there a better assert function to use?
-                // eslint-disable-next-line
                 console.error(`Contour remaining fragment size mismatch ${fragmentStart.size} ${fragmentEnd.size}`);
             }
         });

package/heatwave/plugins/heatwaveglobeshell.js

@@ -2,6 +2,7 @@ import { getColorRampModed, DataManager, PointCoordinatesDataCalculator } from "
 
 import { GlobeShellWiggle, Float2LegendWithRatio } from "../../programs";
 
+import { opacityCheck } from "../../util/check/typecheck";
 
 /**
  * @param id : string
@@ -177,6 +178,7 @@ export default class HeatWaveGlobeShellPlugin {
 
 
     setOpacity(opacity) {
+        opacityCheck(opacity);
         this.globeShell.setOpacity(opacity);
     }
 

package/package.json

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

package/partialrings/goals.md

@@ -13,3 +13,5 @@ create a plugin with line  and points
 * Target 1 is a point
 * Target 2 is a point or an angle
 
+// TODO: What IS the purpose of this folder?
+// Clean

package/partialrings/plugin.js

@@ -3,7 +3,7 @@
 import BufferOffsetManager from '../util/account/bufferoffsetmanager';
 import { programCache, ITEM_SIZE } from './program';
 
-
+import { opacityCheck } from '../util/check/typecheck';
 
 const emptyBlock = new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
 
@@ -73,6 +73,7 @@ export default class {
     }
 
     setOpacity(opacity) {
+        opacityCheck(opacity);
         this.alphaMultiplier = opacity;
     }
 

package/point-glow-line-to-earth/draw-subset-obj.js

@@ -0,0 +1,27 @@
+import "./types";
+
+/**
+ * @param {DrawSubsetOptions} drawSubsetOptions
+ */
+
+// TODO: Draw all is an optional property for the target plugin, with this approach.
+
+
+class DrawSubsetOptionRegistry {
+    constructor() {
+        this._drawSubsetOptions = new Map();
+    }
+
+    register(key, drawSubsetOptions) {
+        this._drawSubsetOptions.set(key, drawSubsetOptions);
+    }
+
+    unregister(key) {
+        this._drawSubsetOptions.delete(key);
+    }
+
+
+
+
+
+}