gridviz 3.0.35 → 3.0.37

package/src/layer/BackgroundLayerImage.js

@@ -1,81 +1,81 @@
-//@ts-check
-'use strict'
-
-import { Layer } from '../core/Layer.js'
-
-/**
- *
- * A map background layer composed of a single image file, geolocated.
- *
- * @module layer
- * @author Julien Gaffuri
- */
-export class BackgroundLayerImage extends Layer {
-    /**
-     * @param {object} opts
-     */
-    constructor(opts) {
-        super(opts)
-        opts = opts || {}
-
-        /** The image file URL
-         * @type {string} */
-        this.url = opts.url
-
-        /** The image left coordinate
-         * @type {number} */
-        this.xMin = opts.xMin || 0
-        /** The image top coordinate
-         *  @type {number} */
-        this.yMax = opts.yMax || 0
-
-        /** The image width, in geo unit
-         * @type {number} */
-        this.width = opts.width || 20000
-        /** The image height, in geo unit
-         * @type {number} */
-        this.height = opts.height || 20000
-
-        /** The image object
-         * @type {HTMLImageElement|undefined} */
-        this.img = undefined
-    }
-
-    /**
-     * @param {import("../core/GeoCanvas.js").GeoCanvas} geoCanvas The canvas where to draw the layer.
-     * @returns {void}
-     */
-    draw(geoCanvas) {
-        //update map extent
-        //geoCanvas.updateExtentGeo(0)
-
-        if (this.img) {
-            //the image was already downloaded: draw it
-
-            //compute screen coordinates and size ratio
-            const x = geoCanvas.geoToPixX(this.xMin)
-            const y = geoCanvas.geoToPixY(this.yMax)
-            const z = geoCanvas.getView().z
-
-            //draw image
-            geoCanvas.initCanvasTransform()
-            geoCanvas.offscreenCtx.drawImage(this.img, x, y, this.width / z, this.height / z)
-        } else {
-            //retrieve image
-
-            if (!this.img) {
-                this.img = new Image()
-                this.img.onload = () => {
-                    geoCanvas.redraw()
-                }
-                this.img.onerror = () => {
-                    //case when no image
-                    console.warn('Could not retrieve background image from', this.url)
-                }
-            }
-
-            //set URL to launch the download
-            this.img.src = this.url
-        }
-    }
-}
+//@ts-check
+'use strict'
+
+import { Layer } from '../core/Layer.js'
+
+/**
+ *
+ * A map background layer composed of a single image file, geolocated.
+ *
+ * @module layer
+ * @author Julien Gaffuri
+ */
+export class BackgroundLayerImage extends Layer {
+    /**
+     * @param {object} opts
+     */
+    constructor(opts) {
+        super(opts)
+        opts = opts || {}
+
+        /** The image file URL
+         * @type {string} */
+        this.url = opts.url
+
+        /** The image left coordinate
+         * @type {number} */
+        this.xMin = opts.xMin || 0
+        /** The image top coordinate
+         *  @type {number} */
+        this.yMax = opts.yMax || 0
+
+        /** The image width, in geo unit
+         * @type {number} */
+        this.width = opts.width || 20000
+        /** The image height, in geo unit
+         * @type {number} */
+        this.height = opts.height || 20000
+
+        /** The image object
+         * @type {HTMLImageElement|undefined} */
+        this.img = undefined
+    }
+
+    /**
+     * @param {import("../core/GeoCanvas.js").GeoCanvas} geoCanvas The canvas where to draw the layer.
+     * @returns {void}
+     */
+    draw(geoCanvas) {
+        //update map extent
+        //geoCanvas.updateExtentGeo(0)
+
+        if (this.img) {
+            //the image was already downloaded: draw it
+
+            //compute screen coordinates and size ratio
+            const x = geoCanvas.geoToPixX(this.xMin)
+            const y = geoCanvas.geoToPixY(this.yMax)
+            const z = geoCanvas.getView().z
+
+            //draw image
+            geoCanvas.initCanvasTransform()
+            geoCanvas.offscreenCtx.drawImage(this.img, x, y, this.width / z, this.height / z)
+        } else {
+            //retrieve image
+
+            if (!this.img) {
+                this.img = new Image()
+                this.img.onload = () => {
+                    geoCanvas.redraw()
+                }
+                this.img.onerror = () => {
+                    //case when no image
+                    console.warn('Could not retrieve background image from', this.url)
+                }
+            }
+
+            //set URL to launch the download
+            this.img.src = this.url
+        }
+    }
+}

package/src/layer/BackgroundLayerWMS.js

@@ -1,104 +1,104 @@
-//@ts-check
-'use strict'
-
-import { Layer } from '../core/Layer.js'
-
-/**
- *
- * A map WMS background layer.
- *
- * @module layer
- * @author Julien Gaffuri
- */
-export class BackgroundLayerWMS extends Layer {
-    /**
-     * @param {object} opts
-     */
-    constructor(opts) {
-        super(opts)
-        opts = opts || {}
-
-        /**
-         * @type {string} */
-        this.url = opts.url
-
-        /** @type {HTMLImageElement|undefined} */
-        this.img = undefined
-
-        /** @type {number|undefined} */
-        this.xMin = undefined
-        /** @type {number|undefined} */
-        this.xMax = undefined
-        /** @type {number|undefined} */
-        this.yMin = undefined
-        /** @type {number|undefined} */
-        this.yMax = undefined
-    }
-
-    /** Check if the view has moved and a new image needs to be retrieved.
-     * @private */
-    hasMoved(extGeo) {
-        if (extGeo.xMin != this.xMin) return true
-        else if (extGeo.xMax != this.xMax) return true
-        else if (extGeo.yMin != this.yMin) return true
-        else if (extGeo.yMax != this.yMax) return true
-        else return false
-    }
-
-    /**
-     * @param {import("../core/GeoCanvas").GeoCanvas} geoCanvas The canvas where to draw the layer.
-     * @returns {void}
-     */
-    draw(geoCanvas) {
-        //update map extent
-        geoCanvas.updateExtentGeo(0)
-
-        if (!this.hasMoved(geoCanvas.extGeo) && this.img) {
-            //the map did not move and the image was already downloaded: draw the image
-            geoCanvas.initCanvasTransform()
-            geoCanvas.offscreenCtx.drawImage(this.img, 0, 0, geoCanvas.w, geoCanvas.h)
-        } else {
-            //the map moved: retrieve new image
-
-            //
-            this.xMin = geoCanvas.extGeo.xMin
-            this.xMax = geoCanvas.extGeo.xMax
-            this.yMin = geoCanvas.extGeo.yMin
-            this.yMax = geoCanvas.extGeo.yMax
-
-            //build WMS URL
-            const url = []
-            url.push(this.url)
-            url.push('&width=')
-            url.push(geoCanvas.w)
-            url.push('&height=')
-            url.push(geoCanvas.h)
-            //bbox: xmin ymin xmax ymax
-            url.push('&bbox=')
-            url.push(geoCanvas.extGeo.xMin)
-            url.push(',')
-            url.push(geoCanvas.extGeo.yMin)
-            url.push(',')
-            url.push(geoCanvas.extGeo.xMax)
-            url.push(',')
-            url.push(geoCanvas.extGeo.yMax)
-
-            const urlS = url.join('')
-            //console.log(urlS)
-
-            if (!this.img) {
-                this.img = new Image()
-                this.img.onload = () => {
-                    geoCanvas.redraw()
-                }
-                this.img.onerror = () => {
-                    //case when no image
-                    console.warn('Could not retrieve WMS background image from', urlS)
-                }
-            }
-
-            //set URL to launch the download
-            this.img.src = urlS
-        }
-    }
-}
+//@ts-check
+'use strict'
+
+import { Layer } from '../core/Layer.js'
+
+/**
+ *
+ * A map WMS background layer.
+ *
+ * @module layer
+ * @author Julien Gaffuri
+ */
+export class BackgroundLayerWMS extends Layer {
+    /**
+     * @param {object} opts
+     */
+    constructor(opts) {
+        super(opts)
+        opts = opts || {}
+
+        /**
+         * @type {string} */
+        this.url = opts.url
+
+        /** @type {HTMLImageElement|undefined} */
+        this.img = undefined
+
+        /** @type {number|undefined} */
+        this.xMin = undefined
+        /** @type {number|undefined} */
+        this.xMax = undefined
+        /** @type {number|undefined} */
+        this.yMin = undefined
+        /** @type {number|undefined} */
+        this.yMax = undefined
+    }
+
+    /** Check if the view has moved and a new image needs to be retrieved.
+     * @private */
+    hasMoved(extGeo) {
+        if (extGeo.xMin != this.xMin) return true
+        else if (extGeo.xMax != this.xMax) return true
+        else if (extGeo.yMin != this.yMin) return true
+        else if (extGeo.yMax != this.yMax) return true
+        else return false
+    }
+
+    /**
+     * @param {import("../core/GeoCanvas").GeoCanvas} geoCanvas The canvas where to draw the layer.
+     * @returns {void}
+     */
+    draw(geoCanvas) {
+        //update map extent
+        geoCanvas.updateExtentGeo(0)
+
+        if (!this.hasMoved(geoCanvas.extGeo) && this.img) {
+            //the map did not move and the image was already downloaded: draw the image
+            geoCanvas.initCanvasTransform()
+            geoCanvas.offscreenCtx.drawImage(this.img, 0, 0, geoCanvas.w, geoCanvas.h)
+        } else {
+            //the map moved: retrieve new image
+
+            //
+            this.xMin = geoCanvas.extGeo.xMin
+            this.xMax = geoCanvas.extGeo.xMax
+            this.yMin = geoCanvas.extGeo.yMin
+            this.yMax = geoCanvas.extGeo.yMax
+
+            //build WMS URL
+            const url = []
+            url.push(this.url)
+            url.push('&width=')
+            url.push(geoCanvas.w)
+            url.push('&height=')
+            url.push(geoCanvas.h)
+            //bbox: xmin ymin xmax ymax
+            url.push('&bbox=')
+            url.push(geoCanvas.extGeo.xMin)
+            url.push(',')
+            url.push(geoCanvas.extGeo.yMin)
+            url.push(',')
+            url.push(geoCanvas.extGeo.xMax)
+            url.push(',')
+            url.push(geoCanvas.extGeo.yMax)
+
+            const urlS = url.join('')
+            //console.log(urlS)
+
+            if (!this.img) {
+                this.img = new Image()
+                this.img.onload = () => {
+                    geoCanvas.redraw()
+                }
+                this.img.onerror = () => {
+                    //case when no image
+                    console.warn('Could not retrieve WMS background image from', urlS)
+                }
+            }
+
+            //set URL to launch the download
+            this.img.src = urlS
+        }
+    }
+}