gridviz 2.0.41 → 2.0.42

package/src/Legend.js

@@ -1,86 +1,86 @@
-//@ts-check
-'use strict'
-
-import { select } from 'd3-selection'
-
-/**
- * A legend container.
- *
- * @author Joseph Davies, Julien Gaffuri
- */
-export class Legend {
-    /**
-     * @param {Object} opts
-     */
-    constructor(opts) {
-        opts = opts || {}
-
-        /** @type {string} */
-        this.id = opts.id
-
-        //TODO stop using it. Use style method below instead.
-
-        /** @type {number} @deprecated */
-        this.top = opts.top
-        /** @type {number} @deprecated */
-        this.bottom = opts.bottom
-        /** @type {number} @deprecated */
-        this.left = opts.left
-        /** @type {number} @deprecated */
-        this.right = opts.right
-        /** @type {string} @deprecated */
-        this.background = opts.background || 'none'
-        /** @type {string} @deprecated */
-        this.padding = opts.padding || '5px'
-        /** @type {string} @deprecated */
-        this.border = opts.border || '0px'
-        /** @type {string} @deprecated */
-        this['border-radius'] = opts['border-radius'] || 'none'
-        /** @type {string} @deprecated */
-        this['box-shadow'] = opts['box-shadow'] || 'none'
-        /** @type {string} @deprecated */
-        this['font-family'] = opts['font-family'] || 'Helvetica, Arial, sans-serif'
-        /** @type {string} @deprecated */
-        this.width = opts.width
-        /** @type {string} @deprecated */
-        this.height = opts.height
-
-        //the div element
-        if (this.id) this.div = select('#' + this.id)
-
-        if (!this.div || this.div.empty()) {
-            this.div = select(document.createElement('div'))
-            if (this.id) this.div.attr('id', this.id)
-        }
-
-        //set style
-        this.div.style('background', this.background)
-        this.div.style('padding', this.padding)
-        this.div.style('border', this.border)
-        this.div.style('border-radius', this['border-radius'])
-        this.div.style('box-shadow', this['box-shadow'])
-        this.div.style('font-family', this['font-family'])
-
-        if (this.width) this.div.style('width', this.width)
-        if (this.height) this.div.style('height', this.height)
-    }
-
-    /**
-     * Apply a style to the legend div.
-     * @param {string} k
-     * @param {string} v
-     * @returns {this}
-     */
-    style(k, v) {
-        this.div.style(k, v)
-        return this
-    }
-
-    /**
-     * @param {Object} opts
-     * @abstract
-     */
-    update(opts) {
-        console.error('Legend update not implemented yet.')
-    }
-}
+//@ts-check
+'use strict'
+
+import { select } from 'd3-selection'
+
+/**
+ * A legend container.
+ *
+ * @author Joseph Davies, Julien Gaffuri
+ */
+export class Legend {
+    /**
+     * @param {Object} opts
+     */
+    constructor(opts) {
+        opts = opts || {}
+
+        /** @type {string} */
+        this.id = opts.id
+
+        //TODO stop using it. Use style method below instead.
+
+        /** @type {number} @deprecated */
+        this.top = opts.top
+        /** @type {number} @deprecated */
+        this.bottom = opts.bottom
+        /** @type {number} @deprecated */
+        this.left = opts.left
+        /** @type {number} @deprecated */
+        this.right = opts.right
+        /** @type {string} @deprecated */
+        this.background = opts.background || 'none'
+        /** @type {string} @deprecated */
+        this.padding = opts.padding || '5px'
+        /** @type {string} @deprecated */
+        this.border = opts.border || '0px'
+        /** @type {string} @deprecated */
+        this['border-radius'] = opts['border-radius'] || 'none'
+        /** @type {string} @deprecated */
+        this['box-shadow'] = opts['box-shadow'] || 'none'
+        /** @type {string} @deprecated */
+        this['font-family'] = opts['font-family'] || 'Helvetica, Arial, sans-serif'
+        /** @type {string} @deprecated */
+        this.width = opts.width
+        /** @type {string} @deprecated */
+        this.height = opts.height
+
+        //the div element
+        if (this.id) this.div = select('#' + this.id)
+
+        if (!this.div || this.div.empty()) {
+            this.div = select(document.createElement('div'))
+            if (this.id) this.div.attr('id', this.id)
+        }
+
+        //set style
+        this.div.style('background', this.background)
+        this.div.style('padding', this.padding)
+        this.div.style('border', this.border)
+        this.div.style('border-radius', this['border-radius'])
+        this.div.style('box-shadow', this['box-shadow'])
+        this.div.style('font-family', this['font-family'])
+
+        if (this.width) this.div.style('width', this.width)
+        if (this.height) this.div.style('height', this.height)
+    }
+
+    /**
+     * Apply a style to the legend div.
+     * @param {string} k
+     * @param {string} v
+     * @returns {this}
+     */
+    style(k, v) {
+        this.div.style(k, v)
+        return this
+    }
+
+    /**
+     * @param {Object} opts
+     * @abstract
+     */
+    update(opts) {
+        console.error('Legend update not implemented yet.')
+    }
+}

package/src/LineLayer.js

@@ -1,150 +1,150 @@
-//@ts-check
-'use strict'
-
-import { json } from 'd3-fetch'
-
-/**
- * @author Joseph Davies, Julien Gaffuri
- */
-export class LineLayer {
-    /**
-     * @param {object} opts
-     */
-    constructor(opts) {
-        opts = opts || {}
-
-        /**
-         * @private
-         * @type {string} */
-        this.url = opts.url
-
-        /**
-         * A preprocess to run on each feature after loading.
-         * It can be used to apply some specific treatment before, format the label data, project coordinates, etc.
-         * Return false if the label should not be kept.
-         * @private
-         * @type {function(object):boolean} */
-        this.preprocess = opts.preprocess
-
-        /**
-         * @private
-         * @type {function(object,number):string} */
-        this.color = opts.color || ((f, zf) => 'gray')
-        /**
-         * @private
-         * @type {function(object,number):number} */
-        this.width = opts.width || ((f, zf) => 2)
-        /**
-         * @private
-         * @type {function(object,number):Array.<number>|undefined} */
-        this.lineDash = opts.lineDash || ((f, zf) => undefined)
-
-        /**
-         * @private
-         * @type {Array.<object> | undefined} */
-        this.fs = undefined
-
-        /**
-         * @private
-         * @type {string} */
-        this.loadingStatus = 'notLoaded'
-    }
-
-    /**
-     * Draw the layer.
-     * @param {import("./GeoCanvas").GeoCanvas} cg The canvas where to draw the layer.
-     * @returns {void}
-     */
-    draw(cg) {
-        //load data, if not done yet.
-        if (!this.fs) {
-            this.load(cg.redraw)
-            return
-        }
-
-        //TODO sort lines by width ?
-
-        //zoom factor
-        const zf = cg.getZf()
-
-        //draw in geo coordinates
-        cg.setCanvasTransform()
-
-        for (const f of this.fs) {
-            const cs = f.geometry.coordinates
-            if (cs.length < 2) continue
-
-            //set color
-            const col = this.color(f, zf)
-            if (!col || col == 'none') continue
-            cg.ctx.strokeStyle = col
-
-            //set linewidth
-            const wP = this.width(f, zf)
-            if (!wP || wP < 0) continue
-            cg.ctx.lineWidth = wP * zf
-
-            //set line dash
-            const ldP = this.lineDash(f, zf)
-            if (ldP) cg.ctx.setLineDash(ldP)
-
-            //draw line
-            cg.ctx.beginPath()
-            cg.ctx.moveTo(cs[0][0], cs[0][1])
-            for (let i = 1; i < cs.length; i++) cg.ctx.lineTo(cs[i][0], cs[i][1])
-            cg.ctx.stroke()
-        }
-
-        //...
-        cg.ctx.setLineDash([])
-    }
-
-    /**
-     * Load data for labels, from URL this.url
-     * @param {function():void} callback
-     * @private
-     */
-    async load(callback) {
-        if (!this.url) {
-            console.log('Failed loading boundaries: No URL specified. ' + this.url)
-            this.loadingStatus = 'failed'
-            this.labels = []
-            return
-        }
-
-        //check if data already loaded
-        if (this.loadingStatus != 'notLoaded') return
-
-        //load data
-        this.loadingStatus = 'loading'
-
-        try {
-            const data_ = await json(this.url)
-
-            /** @type { Array.<object> } */
-            const data = data_.features
-
-            //preprocess/filter
-            if (this.preprocess) {
-                this.fs = []
-                for (const c of data) {
-                    const b = this.preprocess(c)
-                    if (b == false) continue
-                    this.fs.push(c)
-                }
-            } else {
-                //store labels
-                this.fs = data
-            }
-
-            this.loadingStatus = 'loaded'
-
-            //redraw
-            if (callback) callback()
-        } catch (error) {
-            console.log('Failed loading boundaries from ' + this.url)
-            this.fs = []
-            this.loadingStatus = 'failed'
-        }
-    }
-}
+//@ts-check
+'use strict'
+
+import { json } from 'd3-fetch'
+
+/**
+ * @author Joseph Davies, Julien Gaffuri
+ */
+export class LineLayer {
+    /**
+     * @param {object} opts
+     */
+    constructor(opts) {
+        opts = opts || {}
+
+        /**
+         * @private
+         * @type {string} */
+        this.url = opts.url
+
+        /**
+         * A preprocess to run on each feature after loading.
+         * It can be used to apply some specific treatment before, format the label data, project coordinates, etc.
+         * Return false if the label should not be kept.
+         * @private
+         * @type {function(object):boolean} */
+        this.preprocess = opts.preprocess
+
+        /**
+         * @private
+         * @type {function(object,number):string} */
+        this.color = opts.color || ((f, zf) => 'gray')
+        /**
+         * @private
+         * @type {function(object,number):number} */
+        this.width = opts.width || ((f, zf) => 2)
+        /**
+         * @private
+         * @type {function(object,number):Array.<number>|undefined} */
+        this.lineDash = opts.lineDash || ((f, zf) => undefined)
+
+        /**
+         * @private
+         * @type {Array.<object> | undefined} */
+        this.fs = undefined
+
+        /**
+         * @private
+         * @type {string} */
+        this.loadingStatus = 'notLoaded'
+    }
+
+    /**
+     * Draw the layer.
+     * @param {import("./GeoCanvas").GeoCanvas} cg The canvas where to draw the layer.
+     * @returns {void}
+     */
+    draw(cg) {
+        //load data, if not done yet.
+        if (!this.fs) {
+            this.load(cg.redraw)
+            return
+        }
+
+        //TODO sort lines by width ?
+
+        //zoom factor
+        const zf = cg.getZf()
+
+        //draw in geo coordinates
+        cg.setCanvasTransform()
+
+        for (const f of this.fs) {
+            const cs = f.geometry.coordinates
+            if (cs.length < 2) continue
+
+            //set color
+            const col = this.color(f, zf)
+            if (!col || col == 'none') continue
+            cg.ctx.strokeStyle = col
+
+            //set linewidth
+            const wP = this.width(f, zf)
+            if (!wP || wP < 0) continue
+            cg.ctx.lineWidth = wP * zf
+
+            //set line dash
+            const ldP = this.lineDash(f, zf)
+            if (ldP) cg.ctx.setLineDash(ldP)
+
+            //draw line
+            cg.ctx.beginPath()
+            cg.ctx.moveTo(cs[0][0], cs[0][1])
+            for (let i = 1; i < cs.length; i++) cg.ctx.lineTo(cs[i][0], cs[i][1])
+            cg.ctx.stroke()
+        }
+
+        //...
+        cg.ctx.setLineDash([])
+    }
+
+    /**
+     * Load data for labels, from URL this.url
+     * @param {function():void} callback
+     * @private
+     */
+    async load(callback) {
+        if (!this.url) {
+            console.log('Failed loading boundaries: No URL specified. ' + this.url)
+            this.loadingStatus = 'failed'
+            this.labels = []
+            return
+        }
+
+        //check if data already loaded
+        if (this.loadingStatus != 'notLoaded') return
+
+        //load data
+        this.loadingStatus = 'loading'
+
+        try {
+            const data_ = await json(this.url)
+
+            /** @type { Array.<object> } */
+            const data = data_.features
+
+            //preprocess/filter
+            if (this.preprocess) {
+                this.fs = []
+                for (const c of data) {
+                    const b = this.preprocess(c)
+                    if (b == false) continue
+                    this.fs.push(c)
+                }
+            } else {
+                //store labels
+                this.fs = data
+            }
+
+            this.loadingStatus = 'loaded'
+
+            //redraw
+            if (callback) callback()
+        } catch (error) {
+            console.log('Failed loading boundaries from ' + this.url)
+            this.fs = []
+            this.loadingStatus = 'failed'
+        }
+    }
+}