gridviz 3.0.10 → 3.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gridviz",
-    "version": "3.0.10",
+    "version": "3.0.11",
     "description": "Visualization tool for gridded statistics",
     "keywords": [
         "statistics",

package/src/layer/GeoJSONLayer.js

@@ -29,11 +29,40 @@ export class GeoJSONLayer extends Layer {
          * @type {function(object):boolean} */
         this.preprocess = opts.preprocess
 
+        //for points
+        /**
+         * @private
+         * @type {function(object,number):string} */
+        this.shape = opts.shape || ((f, z) => 'circle')
+        /**
+         * In pixel
+         * @private
+         * @type {function(object,number):number} */
+        this.size = opts.size || ((f, z) => 10)
+        /**
+         * @private
+         * @type {function(object,number):string} */
+        this.strokeStyle = opts.strokeStyle || ((f, z) => 'red')
+        /**
+         * @private
+         * @type {function(object,number):string} */
+        this.fillStyle = opts.fillStyle || ((f, z) => 'black')
+        /**
+         * In pixel
+         * @private
+         * @type {function(object,number):number} */
+        this.lineWidth = opts.lineWidth || ((f, z) => 2)
+
+
+
+        //for lines
+
         /**
          * @private
          * @type {function(object,number):string} */
         this.color = opts.color || ((f, z) => 'gray')
         /**
+         * In pixel
          * @private
          * @type {function(object,number):number} */
         this.width = opts.width || ((f, z) => 2)
@@ -42,6 +71,7 @@ export class GeoJSONLayer extends Layer {
          * @type {function(object,number):Array.<number>|undefined} */
         this.lineDash = opts.lineDash || ((f, z) => undefined)
 
+
         /**
          * @private
          * @type {Array.<object> | undefined} */
@@ -53,6 +83,7 @@ export class GeoJSONLayer extends Layer {
         this.loadingStatus = 'notLoaded'
     }
 
+
     /**
      * Draw the layer.
      * @param {import("../core/GeoCanvas.js").GeoCanvas} geoCanvas The canvas where to draw the layer.
@@ -65,34 +96,73 @@ export class GeoJSONLayer extends Layer {
             return
         }
 
-        //TODO sort lines by width ?
-
         //
         const z = geoCanvas.view.z
 
         for (const f of this.fs) {
-            const cs = f.geometry.coordinates
-            if (cs.length < 2) continue
-
-            //set color
-            const col = this.color(f, z)
-            if (!col || col == 'none') continue
-            geoCanvas.ctx.strokeStyle = col
-
-            //set linewidth
-            const wP = this.width(f, z)
-            if (!wP || wP < 0) continue
-            geoCanvas.ctx.lineWidth = wP * z
-
-            //set line dash
-            const ldP = this.lineDash(f, z)
-            if (ldP) geoCanvas.ctx.setLineDash(ldP)
-
-            //draw line
-            geoCanvas.ctx.beginPath()
-            geoCanvas.ctx.moveTo(cs[0][0], cs[0][1])
-            for (let i = 1; i < cs.length; i++) geoCanvas.ctx.lineTo(cs[i][0], cs[i][1])
-            geoCanvas.ctx.stroke()
+            const gt = f.geometry.type
+
+            if (gt == "Point") {
+                const c = f.geometry.coordinates
+
+                //get style parameters for the point feature
+                const shape = this.shape(f,z)
+                if(!shape || shape=="none") continue
+                const size = this.size(f,z) * z
+                if(!size) continue
+                const strokeStyle = this.strokeStyle(f,z)
+                const fillStyle = this.fillStyle(f,z)
+                const lineWidth = this.lineWidth(f,z) * z
+
+                //set canvas drawing parameters
+                if(strokeStyle) geoCanvas.ctx.strokeStyle = strokeStyle
+                if(fillStyle) geoCanvas.ctx.fillStyle = fillStyle
+                if(lineWidth) geoCanvas.ctx.lineWidth = lineWidth
+
+                if (shape == "circle") {
+                    //draw circle - fill and stroke
+                    geoCanvas.ctx.beginPath()
+                    geoCanvas.ctx.arc(c[0], c[1], size / 2, 0, 2 * Math.PI, false)
+                    if(fillStyle) geoCanvas.ctx.fill()
+                    if(strokeStyle && lineWidth) geoCanvas.ctx.stroke()
+                } else if (shape == "square") {
+                    //draw square - fill and stroke
+                    geoCanvas.ctx.beginPath()
+                    geoCanvas.ctx.rect(c[0] - size / 2, c[1] - size / 2, size, size)
+                    if(fillStyle) geoCanvas.ctx.fill()
+                    if(strokeStyle && lineWidth) geoCanvas.ctx.stroke()
+                } else {
+                    console.error("Unexpected shape for point geojson: " + shape)
+                }
+
+            } else if (gt == "LineString") {
+
+                const cs = f.geometry.coordinates
+                if (cs.length < 2) continue
+
+                //set color
+                const col = this.color(f, z)
+                if (!col || col == 'none') continue
+                geoCanvas.ctx.strokeStyle = col
+
+                //set linewidth
+                const wP = this.width(f, z)
+                if (!wP || wP < 0) continue
+                geoCanvas.ctx.lineWidth = wP * z
+
+                //set line dash
+                const ldP = this.lineDash(f, z)
+                if (ldP) geoCanvas.ctx.setLineDash(ldP)
+
+                //draw line
+                geoCanvas.ctx.beginPath()
+                geoCanvas.ctx.moveTo(cs[0][0], cs[0][1])
+                for (let i = 1; i < cs.length; i++) geoCanvas.ctx.lineTo(cs[i][0], cs[i][1])
+                geoCanvas.ctx.stroke()
+            } else {
+                console.log("Unsupported geometry type in GeoJSONLayer: " + gt)
+            }
+
         }
 
         //...