gridviz 2.0.44 → 2.0.46

package/src/dataset/CSVGrid.js

@@ -1,104 +1,104 @@
-//@ts-check
-'use strict'
-
-/** @typedef {{ dims: object, crs: string, tileSizeCell: number, originPoint: {x:number,y:number}, resolutionGeo: number, tilingBounds:import("../Dataset").Envelope }} GridInfo */
-
-import { csv } from 'd3-fetch'
-import { DatasetComponent } from '../DatasetComponent.js'
-
-/**
- * A dataset composed of a single CSV file (not tiled).
- *
- * @author Joseph Davies, Julien Gaffuri
- */
-export class CSVGrid extends DatasetComponent {
-    /**
-     * @param {string} url The URL of the dataset.
-     * @param {number} resolution The dataset resolution in geographical unit.
-     * @param {{preprocess?:(function(import("../Dataset").Cell):boolean)}} opts
-     */
-    constructor(url, resolution, opts = {}) {
-        super(url, resolution, opts)
-
-        /**
-         * @private
-         * @type {Array.<import("../Dataset").Cell>} */
-        this.cells = []
-
-        /**
-         * @type {string}
-         * @private  */
-        this.infoLoadingStatus = 'notLoaded'
-    }
-
-    /**
-     * Request data within a geographic envelope.
-     *
-     * @param {import("../Dataset").Envelope|undefined} e
-     * @param {function():void} redraw
-     */
-    getData(e, redraw) {
-        //check if data already loaded
-        if (this.infoLoadingStatus != 'notLoaded') return this
-
-        //load data
-        this.infoLoadingStatus = 'loading'
-        ;(async () => {
-            try {
-                const data = await csv(this.url)
-
-                //convert coordinates in numbers
-                for (const c of data) {
-                    c.x = +c.x
-                    c.y = +c.y
-                }
-
-                //preprocess/filter
-                if (this.preprocess) {
-                    this.cells = []
-                    for (const c of data) {
-                        const b = this.preprocess(c)
-                        if (b == false) continue
-                        this.cells.push(c)
-                    }
-                } else {
-                    this.cells = data
-                }
-
-                //TODO check if redraw is necessary
-                //that is if the dataset belongs to a layer which is visible at the current zoom level
-
-                //execute the callback, usually a draw function
-                if (redraw) redraw()
-
-                this.infoLoadingStatus = 'loaded'
-            } catch (error) {
-                //mark as failed
-                this.infoLoadingStatus = 'failed'
-                this.cells = []
-            }
-        })()
-
-        return this
-    }
-
-    /**
-     * Fill the view cache with all cells which are within a geographical envelope.
-     *
-     * @param {import("../Dataset").Envelope} extGeo
-     * @returns {void}
-     */
-    updateViewCache(extGeo) {
-        //data not loaded yet
-        if (!this.cells) return
-
-        this.cellsViewCache = []
-        for (const cell of this.cells) {
-            if (+cell.x + this.resolution < extGeo.xMin) continue
-            if (+cell.x - this.resolution > extGeo.xMax) continue
-            if (+cell.y + this.resolution < extGeo.yMin) continue
-            if (+cell.y - this.resolution > extGeo.yMax) continue
-            this.cellsViewCache.push(cell)
-        }
-    }
-}
+//@ts-check
+'use strict'
+
+/** @typedef {{ dims: object, crs: string, tileSizeCell: number, originPoint: {x:number,y:number}, resolutionGeo: number, tilingBounds:import("../Dataset").Envelope }} GridInfo */
+
+import { csv } from 'd3-fetch'
+import { DatasetComponent } from '../DatasetComponent.js'
+
+/**
+ * A dataset composed of a single CSV file (not tiled).
+ *
+ * @author Joseph Davies, Julien Gaffuri
+ */
+export class CSVGrid extends DatasetComponent {
+    /**
+     * @param {string} url The URL of the dataset.
+     * @param {number} resolution The dataset resolution in geographical unit.
+     * @param {{preprocess?:(function(import("../Dataset").Cell):boolean)}} opts
+     */
+    constructor(url, resolution, opts = {}) {
+        super(url, resolution, opts)
+
+        /**
+         * @private
+         * @type {Array.<import("../Dataset").Cell>} */
+        this.cells = []
+
+        /**
+         * @type {string}
+         * @private  */
+        this.infoLoadingStatus = 'notLoaded'
+    }
+
+    /**
+     * Request data within a geographic envelope.
+     *
+     * @param {import("../Dataset").Envelope|undefined} e
+     * @param {function():void} redraw
+     */
+    getData(e, redraw) {
+        //check if data already loaded
+        if (this.infoLoadingStatus != 'notLoaded') return this
+
+        //load data
+        this.infoLoadingStatus = 'loading'
+        ;(async () => {
+            try {
+                const data = await csv(this.url)
+
+                //convert coordinates in numbers
+                for (const c of data) {
+                    c.x = +c.x
+                    c.y = +c.y
+                }
+
+                //preprocess/filter
+                if (this.preprocess) {
+                    this.cells = []
+                    for (const c of data) {
+                        const b = this.preprocess(c)
+                        if (b == false) continue
+                        this.cells.push(c)
+                    }
+                } else {
+                    this.cells = data
+                }
+
+                //TODO check if redraw is necessary
+                //that is if the dataset belongs to a layer which is visible at the current zoom level
+
+                //execute the callback, usually a draw function
+                if (redraw) redraw()
+
+                this.infoLoadingStatus = 'loaded'
+            } catch (error) {
+                //mark as failed
+                this.infoLoadingStatus = 'failed'
+                this.cells = []
+            }
+        })()
+
+        return this
+    }
+
+    /**
+     * Fill the view cache with all cells which are within a geographical envelope.
+     *
+     * @param {import("../Dataset").Envelope} extGeo
+     * @returns {void}
+     */
+    updateViewCache(extGeo) {
+        //data not loaded yet
+        if (!this.cells) return
+
+        this.cellsViewCache = []
+        for (const cell of this.cells) {
+            if (+cell.x + this.resolution < extGeo.xMin) continue
+            if (+cell.x - this.resolution > extGeo.xMax) continue
+            if (+cell.y + this.resolution < extGeo.yMin) continue
+            if (+cell.y - this.resolution > extGeo.yMax) continue
+            this.cellsViewCache.push(cell)
+        }
+    }
+}

package/src/dataset/GeoTIFF.js

@@ -1,127 +1,127 @@
-//@ts-check
-'use strict'
-
-import { DatasetComponent } from '../DatasetComponent.js'
-//import { fromUrl } from "geotiff"
-
-/**
- * @todo
- * A dataset composed of a single GeoTiff file.
- *
- * @author Joseph Davies, Julien Gaffuri
- */
-export class GeoTIFF extends DatasetComponent {
-    /**
-     * @param {string} url The URL of the dataset.
-     * @param {number} resolution The dataset resolution in geographical unit.
-     * @param {{preprocess?:(function(import("../Dataset").Cell):boolean)}} opts
-     */
-    constructor(url, resolution, opts = {}) {
-        super(url, resolution, opts)
-
-        /**
-         * @private
-         * @type {Array.<import("../Dataset").Cell>} */
-        this.cells = []
-
-        /**
-         * @type {string}
-         * @private  */
-        this.infoLoadingStatus = 'notLoaded'
-    }
-
-    /**
-     * Request data within a geographic envelope.
-     *
-     * @param {import("../Dataset").Envelope|undefined} e
-     * @param {function():void} redraw
-     */
-    getData(e, redraw) {
-        //check if data already loaded
-        if (this.infoLoadingStatus != 'notLoaded') return this
-
-        //load data
-        this.infoLoadingStatus = 'loading'
-
-        /*
-
-        fromUrl(this.url)
-            .then(tiff => {
-                console.log(tiff);
-
-                (async function () {
-                    const image = await tiff.getImage();
-                    const width = image.getWidth();
-                    const height = image.getHeight();
-                    const tileWidth = image.getTileWidth();
-                    const tileHeight = image.getTileHeight();
-                    const samplesPerPixel = image.getSamplesPerPixel();
-
-                    //for geotiff
-                    const origin = image.getOrigin();
-                    const resolution = image.getResolution();
-                    const bbox = image.getBoundingBox();
-
-                    console.log(image)
-                    console.log(width, height)
-                    console.log(tileWidth, tileHeight)
-                    console.log(samplesPerPixel)
-                    console.log(origin)
-                    console.log(resolution)
-                    console.log(bbox)
-
-                    console.log("-------")
-
-                    const data = await image.readRasters();
-                    console.log(data)
-
-                })()
-
-                //convert coordinates in numbers
-                //for (const c of data) { c.x = +c.x; c.y = +c.y; }
-
-                //this.cells = data;
-
-                //execute preprocess, if any
-                //if (this.preprocess) for (const c of this.cells) this.preprocess(c);
-
-                //TODO check if redraw is necessary
-                //that is if the dataset belongs to a layer which is visible at the current zoom level
-
-                //execute the callback, usually a draw function
-                if (redraw) redraw()
-
-                this.infoLoadingStatus = "loaded";
-
-
-            })
-            .catch(() => {
-                //mark as failed
-                this.infoLoadingStatus = "failed";
-                this.cells = []
-            });
-*/
-
-        return this
-    }
-
-    /**
-     * Fill the view cache with all cells which are within a geographical envelope.
-     *
-     * @param {import("../Dataset").Envelope} extGeo
-     * @returns {void}
-     */
-    updateViewCache(extGeo) {
-        //data not loaded yet
-        if (!this.cells) return
-
-        this.cellsViewCache = []
-        for (const cell of this.cells) {
-            if (+cell.x + this.resolution < extGeo.xMin) continue
-            if (+cell.x - this.resolution > extGeo.xMax) continue
-            if (+cell.y + this.resolution < extGeo.yMin) continue
-            if (+cell.y - this.resolution > extGeo.yMax) continue
-            this.cellsViewCache.push(cell)
-        }
-    }
-}
+//@ts-check
+'use strict'
+
+import { DatasetComponent } from '../DatasetComponent.js'
+//import { fromUrl } from "geotiff"
+
+/**
+ * @todo
+ * A dataset composed of a single GeoTiff file.
+ *
+ * @author Joseph Davies, Julien Gaffuri
+ */
+export class GeoTIFF extends DatasetComponent {
+    /**
+     * @param {string} url The URL of the dataset.
+     * @param {number} resolution The dataset resolution in geographical unit.
+     * @param {{preprocess?:(function(import("../Dataset").Cell):boolean)}} opts
+     */
+    constructor(url, resolution, opts = {}) {
+        super(url, resolution, opts)
+
+        /**
+         * @private
+         * @type {Array.<import("../Dataset").Cell>} */
+        this.cells = []
+
+        /**
+         * @type {string}
+         * @private  */
+        this.infoLoadingStatus = 'notLoaded'
+    }
+
+    /**
+     * Request data within a geographic envelope.
+     *
+     * @param {import("../Dataset").Envelope|undefined} e
+     * @param {function():void} redraw
+     */
+    getData(e, redraw) {
+        //check if data already loaded
+        if (this.infoLoadingStatus != 'notLoaded') return this
+
+        //load data
+        this.infoLoadingStatus = 'loading'
+
+        /*
+
+        fromUrl(this.url)
+            .then(tiff => {
+                console.log(tiff);
+
+                (async function () {
+                    const image = await tiff.getImage();
+                    const width = image.getWidth();
+                    const height = image.getHeight();
+                    const tileWidth = image.getTileWidth();
+                    const tileHeight = image.getTileHeight();
+                    const samplesPerPixel = image.getSamplesPerPixel();
+
+                    //for geotiff
+                    const origin = image.getOrigin();
+                    const resolution = image.getResolution();
+                    const bbox = image.getBoundingBox();
+
+                    console.log(image)
+                    console.log(width, height)
+                    console.log(tileWidth, tileHeight)
+                    console.log(samplesPerPixel)
+                    console.log(origin)
+                    console.log(resolution)
+                    console.log(bbox)
+
+                    console.log("-------")
+
+                    const data = await image.readRasters();
+                    console.log(data)
+
+                })()
+
+                //convert coordinates in numbers
+                //for (const c of data) { c.x = +c.x; c.y = +c.y; }
+
+                //this.cells = data;
+
+                //execute preprocess, if any
+                //if (this.preprocess) for (const c of this.cells) this.preprocess(c);
+
+                //TODO check if redraw is necessary
+                //that is if the dataset belongs to a layer which is visible at the current zoom level
+
+                //execute the callback, usually a draw function
+                if (redraw) redraw()
+
+                this.infoLoadingStatus = "loaded";
+
+
+            })
+            .catch(() => {
+                //mark as failed
+                this.infoLoadingStatus = "failed";
+                this.cells = []
+            });
+*/
+
+        return this
+    }
+
+    /**
+     * Fill the view cache with all cells which are within a geographical envelope.
+     *
+     * @param {import("../Dataset").Envelope} extGeo
+     * @returns {void}
+     */
+    updateViewCache(extGeo) {
+        //data not loaded yet
+        if (!this.cells) return
+
+        this.cellsViewCache = []
+        for (const cell of this.cells) {
+            if (+cell.x + this.resolution < extGeo.xMin) continue
+            if (+cell.x - this.resolution > extGeo.xMax) continue
+            if (+cell.y + this.resolution < extGeo.yMin) continue
+            if (+cell.y - this.resolution > extGeo.yMax) continue
+            this.cellsViewCache.push(cell)
+        }
+    }
+}

package/src/dataset/GridTile.js

@@ -1,41 +1,41 @@
-//@ts-check
-'use strict'
-
-/**
- * A grid tile.
- *
- * @author Joseph Davies, Julien Gaffuri
- */
-export class GridTile {
-    /**
-     * @param {Array.<import("../Dataset").Cell>} cells The tile cells.
-     * @param {number} xT The X position of the tile.
-     * @param {number} yT The Y position of the tile.
-     * @param {import("./CSVGrid").GridInfo} gridInfo The grid info object.
-     */
-    constructor(cells, xT, yT, gridInfo) {
-        /** @type {Array.<import("../Dataset").Cell>} */
-        this.cells = cells
-        /** @type {number} */
-        this.x = xT
-        /** @type {number} */
-        this.y = yT
-
-        const r = gridInfo.resolutionGeo
-        const s = gridInfo.tileSizeCell
-
-        /** @type {import("../Dataset").Envelope} */
-        this.extGeo = {
-            xMin: gridInfo.originPoint.x + r * s * this.x,
-            xMax: gridInfo.originPoint.x + r * s * (this.x + 1),
-            yMin: gridInfo.originPoint.y + r * s * this.y,
-            yMax: gridInfo.originPoint.y + r * s * (this.y + 1),
-        }
-
-        //convert cell coordinates into geographical coordinates
-        for (let cell of this.cells) {
-            cell.x = this.extGeo.xMin + cell.x * r
-            cell.y = this.extGeo.yMin + cell.y * r
-        }
-    }
-}
+//@ts-check
+'use strict'
+
+/**
+ * A grid tile.
+ *
+ * @author Joseph Davies, Julien Gaffuri
+ */
+export class GridTile {
+    /**
+     * @param {Array.<import("../Dataset").Cell>} cells The tile cells.
+     * @param {number} xT The X position of the tile.
+     * @param {number} yT The Y position of the tile.
+     * @param {import("./CSVGrid").GridInfo} gridInfo The grid info object.
+     */
+    constructor(cells, xT, yT, gridInfo) {
+        /** @type {Array.<import("../Dataset").Cell>} */
+        this.cells = cells
+        /** @type {number} */
+        this.x = xT
+        /** @type {number} */
+        this.y = yT
+
+        const r = gridInfo.resolutionGeo
+        const s = gridInfo.tileSizeCell
+
+        /** @type {import("../Dataset").Envelope} */
+        this.extGeo = {
+            xMin: gridInfo.originPoint.x + r * s * this.x,
+            xMax: gridInfo.originPoint.x + r * s * (this.x + 1),
+            yMin: gridInfo.originPoint.y + r * s * this.y,
+            yMax: gridInfo.originPoint.y + r * s * (this.y + 1),
+        }
+
+        //convert cell coordinates into geographical coordinates
+        for (let cell of this.cells) {
+            cell.x = this.extGeo.xMin + cell.x * r
+            cell.y = this.extGeo.yMin + cell.y * r
+        }
+    }
+}