@pirireis/webglobeplugins 0.3.4 → 0.3.6

package/bearing-line/plugin.js

@@ -146,9 +146,9 @@ export default class Plugin {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
                         'adaptor': (item) => new Float32Array([item.dashOpacity])
                     }],
-                    ["circleDashRatio", {
+                    ["circleDashAngle", {
                         'bufferManager': new BufferManager(gl, 1, { bufferType, initialCapacity }),
-                        'adaptor': (item) => new Float32Array([item.circleDashRatio])
+                        'adaptor': (item) => new Float32Array([item.circleDashAngle / 360])
                     }]
                 ]
             );
@@ -174,7 +174,7 @@ export default class Plugin {
         }
         // centerObj, startAngleObj, radiusObj, colorObj, dashRatioObj, dashOpacityObj
         this.circleVao = this.circleProgram.createVAO(
-            ...["centerCoords", "startAngle", "bigRadius", "rgba", "circleDashRatio", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
+            ...["centerCoords", "startAngle", "bigRadius", "rgba", "circleDashAngle", "dashOpacity"].map(key => obj(this.bufferManagersCompMap.get(key))));
     }
 
 
@@ -215,11 +215,9 @@ export default class Plugin {
      * @property {number} dashRatio 0-1
      * @property {number} dashOpacity 0-1
      * @property {number} circleDashAngle 0-360
-     * 
      * @param {Array<item>} items 
      * @param {Array<string>} injectionsSubSetIDs | textContextInjectionMap keys to be used for writing text.
      */
-
     insertBulk(items, injectionsSubSetIDs = []) {
         const { globe, bufferOrchestrator, bufferManagersCompMap } = this;// angleTextContext, distanceTextContext,
         const injectionsSubSet = injectionsSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
@@ -237,7 +235,6 @@ export default class Plugin {
 
     deleteBulk(keys) {
         this.bufferOrchestrator.deleteBulk(keys, this.bufferManagersCompMap, ["radius", "centerCoords", "targetCoords", "rgba"]);
-
         this._deleteTexts(keys);
         this.globe.DrawRender();
     }
@@ -245,16 +242,15 @@ export default class Plugin {
 
     defrag() {
         this.bufferOrchestrator.defrag(this.bufferManagersCompMap);
-        // this.globe.DrawRender();
     }
 
     /**
      * 
      * @param {Array<{key, long, lat, endLong, endLat, bearingAngle}>} items
-     * @param {Array<string>} injectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
+     * @param {Array<string>} textWriterInjectionSubSetIDs | textContextInjectionMap keys to be used for writing text.
      */
-    updateCoordinatesBulk(items, injectionSubSetIDs = []) { //TODO
-        const injectionsSubSet = injectionSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
+    updateCoordinatesBulk(items, textWriterInjectionSubSetIDs = []) { //TODO
+        const injectionsSubSet = textWriterInjectionSubSetIDs.map((id) => this._textContextInjectionMap.get(id));
         const { globe, bufferOrchestrator, bufferManagersCompMap, angleTextContext, distanceTextContext } = this;
         const data = []
         for (let item of items) {
@@ -267,6 +263,22 @@ export default class Plugin {
     }
 
 
+    /**
+     * 
+     * @param {*} items some colums EXCEPT positional ones
+     * @param {*} propertyIDs 
+     * @param {*} 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 = []) {
+        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));
+        for (let item of items) { this._insertTexts(item, writers) }
+        bufferOrchestrator.updateBulk(items, bufferManagersCompMap, propertyIDs);
+    }
+
+
     __insertAdaptor(item) {
         const lat = radian(item.lat)
         const long = radian(item.long)
@@ -276,7 +288,7 @@ export default class Plugin {
         const rgbaMode = item.rgbaMode !== undefined ? item.rgbaMode : 0;
         const dashRatio = item.dashRatio !== undefined ? item.dashRatio : 1.0;
         const dashOpacity = item.dashOpacity !== undefined ? item.dashOpacity : 0.9;
-        const circleDashRatio = item.circleDashAngle !== undefined ? (item.circleDashAngle / 360) : 1.0;
+        const circleDashAngle = item.circleDashAngle !== undefined ? item.circleDashAngle : 360;
         const bigRadius = item.bigRadius !== undefined ? item.bigRadius : this.globe.Math.GetDist3D(item.long, item.lat, item.endLong, item.endLat);
         const radius = item.radius !== undefined ? item.radius : bigRadius * 0.2;
         const startAngle = calculateStartAngle(long, lat, endLong, endLat);
@@ -299,7 +311,7 @@ export default class Plugin {
             rgba,
             dashRatio,
             dashOpacity,
-            circleDashRatio,
+            circleDashAngle,
             rgbaMode
         };
     }
@@ -309,7 +321,6 @@ export default class Plugin {
         const long = radian(item.long)
         const endLat = radian(item.endLat)
         const endLong = radian(item.endLong)
-
         const bigRadius = item.bigRadius !== undefined ? item.bigRadius : this.globe.Math.GetDist3D(item.long, item.lat, item.endLong, item.endLat);
         const radius = item.radius !== undefined ? item.radius : bigRadius * 0.2;
         const startAngle = calculateStartAngle(long, lat, endLong, endLat);
@@ -348,8 +359,9 @@ export default class Plugin {
 
 
 
-    _insertTexts(item, injectionSubSet) {
-        injectionSubSet.forEach((v) => {
+    _insertTexts(item, textWriterInjectionSubSet) {
+        //TODO This method can be more performant if it works horizontally, tabular
+        textWriterInjectionSubSet.forEach((v) => {
             const { coordsAdaptor, textAdaptor, writer } = v
             const { lat, long } = coordsAdaptor(item);
             const text = textAdaptor(item);

package/package.json

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

package/util/shaderfunctions/geometrytransformations.js

@@ -102,22 +102,22 @@ vec3 circleLimpFromLongLatRadCenterCartesian3D( vec2 center, float radius, float
     tangent1 = normalize(tangent1);
     // rotate tangent with given angle
     tangent1 =  cos(angle) * tangent1 - sin(angle) * cross(normal, tangent1);
-    return (geoW * cos(radius/R))+ tangent1 * radius / 1000.0;
+    float radius_in_angle = radius/R;
+    float projected_radius = sin(radius_in_angle) * R / 1000.0;
+    return (geoW * cos(radius_in_angle))+ tangent1 * projected_radius;
     }
 `;
 
 // TODO: Make it precise. Y axis is not correct.
 
-// ln | tan [ (x/2) + (π/4) ] | + C
-export const circleLimpFromLongLatRadCenterMercatorRealDistance = `
+export const circleLimpFromLongLatRadCenterMercatorRealDistance = PI + `
 vec2 circleLimpFromLongLatRadCenterMercatorRealDistance(vec2 center, float radius, float angle){
-    float radius_radian =  radius / R;
-    float lat = center.y - radius_radian * sin(angle);
-    float scale = 1.0/abs( cos( lat ) );
-    float y =  log( tan( PI / 4.0 + lat / 2.0 ) ) * R;
-    vec2 center_ = longLatRadToMercator(center);
-    float x = center_.x + scale * radius * cos(angle);
-    return vec2(x, y);
+    float ang = angle + PI / 2.0; // this is there because rest of the program is in angle 0 is +x axis orientatation
+    float r =  radius / R;
+    float sin_lat =  sin( center.y) * cos(r) + cos(center.y)*sin(r)* cos(ang);
+    float lat = asin(sin_lat);
+    float longi = center.x + atan( sin(ang) * sin(r) * cos(center.y), cos(r) - sin(center.y) * sin_lat);
+    return longLatRadToMercator(vec2(longi, lat));
 }
 `;
 
@@ -206,7 +206,7 @@ export const angleBetweenTwoPointsRadian = `
 float angleBetweenTwoPointsRadian(vec2 start_, vec2 end_) {
     float start_lat = log( tan( ( 1.0 - start_.y ) * PI / 2.0  ) );
     float end_lat = log( tan( ( 1.0 - end_.y ) * PI / 2.0  ) );
-    float angle = atan( (end_lat - start_lat )/ (end_.x - start_.x));
+    float angle = atan( (end_lat - start_lat ) / (end_.x - start_.x));
     return angle;   
 }
 `