@lgv/visualization-map 0.0.3 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lgv/visualization-map",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "description": "ES6 d3.js core visualization scaffold object and utilities for maps.",
   "main": "src/index.js",

package/src/visualization/index.js

@@ -68,11 +68,32 @@ class VisualizationMap extends LinearGrid {
      * Generate main visualization, i.e. everything that sits inside the svg.
      */
     determineDataType() {
-        this.isFeatureCollection = this.data && this.data.features;
+        this.isFeatureCollection = this.data && this.Data.source.features;
         this.isPoint = this.data && this.data.coordinates && this.data.type.lower() == "point";
         this.isXY = this.data && this.data.metadata && this.data.results;
     }
 
+    /**
+     * Fit map tightly to data boundary.
+     */
+    fitToData() {
+
+        // determine bounding box
+        let bounds = (this.isFeatureCollection || this.isPoint) ? L.geoJSON(this.Data.source).getBounds() : (this.isXY ? this.data.metadata.bounds : this.map.getBounds());
+
+        // fit to bounds
+        if (this.isFeatureCollection || this.isXY) {
+            // several data points
+            this.map.fitBounds(bounds);
+        } else if (this.isPoint) {
+            // zoom out if only provided single data point
+            this.map.setView(bounds.getCenter(), this.map.getMaxZoom() / 2);
+        } else {
+            // no geo data provided so center world
+            this.map.setView(bounds.getCenter());
+        }
+    }
+
     /**
      * Generate main visualization, i.e. everything that sits inside the svg.
      */
@@ -124,20 +145,8 @@ class VisualizationMap extends LinearGrid {
         // update tile server
         L.tileLayer(this.tileserver).addTo(this.map);
 
-        // determine bounding box
-        let bounds = (this.isFeatureCollection || this.isPoint) ? L.geoJSON(this.Data.source).getBounds() : (this.isXY ? this.data.metadata.bounds : this.map.getBounds());
-
         // fit to bounds
-        if (this.isFeatureCollection || this.isXY) {
-            // several data points
-            this.map.fitBounds(bounds);
-        } else if (this.isPoint) {
-            // zoom out if only provided single data point
-            this.map.setView(bounds.getCenter(), this.map.getMaxZoom() / 2);
-        } else {
-            // no geo data provided so center world
-            this.map.setView(bounds.getCenter());
-        }
+        this.fitToData();
 
     }
 
@@ -186,6 +195,9 @@ class VisualizationMap extends LinearGrid {
         // generate visualization
         this.generateChart();
 
+        // fit to bounds
+        this.fitToData();
+
     }
 
 }