Merge branch 'master' of https://github.com/CSBP-CPSE/web-mapping-dev

Author: Noznoc

config/population-viewer-prd.rollup.js

@@ -1,9 +1,9 @@
 import babel from 'rollup-plugin-babel';
 
 export default {
-    input: '../population-viewer/main.js',
+    input: '../web-mapping-dev/population-viewer/main.js',
     output: {
-        file: '../../web-mapping-prd/population-viewer/main.min.js',
+        file: '../web-mapping-prd/population-viewer/main.min.js',
         format: 'iife',
         name: 'bundle'
     },
@@ -13,4 +13,4 @@ export default {
 			configFile: './config/babel.config.js'
         })
     ]
-}
+}

config/proximity-viewer-prd.rollup.js

@@ -1,9 +1,9 @@
 import babel from 'rollup-plugin-babel';
 
 export default {
-    input: '../proximity-viewer/main.js',
+    input: '../web-mapping-dev/proximity-viewer/main.js',
     output: {
-        file: '../../web-mapping-prd/proximity-viewer/main.min.js',
+        file: '../web-mapping-prd/proximity-viewer/main.min.js',
         format: 'iife',
         name: 'bundle'
     },
@@ -13,4 +13,4 @@ export default {
 			configFile: './config/babel.config.js'
         })
     ]
-}
+}

lode-viewer/store.js

@@ -1,49 +1,102 @@
+/**
+ * The Store class contains various utility methods used to store lode-viewer map 
+ * properties in localStorage.
+ * @class
+ */
 export default class Store { 
-		
+	
+	/**
+	 * Get the lode-map value from localStorage
+	 * @returns {string} - map name
+	 */
 	static get Map() {
 		return localStorage.getItem("lode-map") || "trans";
 	}
-	
+
+	/**
+	 * Set the lode-map value in localStorage
+	 * @param {string} value - map name (e.g. odhf, odcaf) 
+	 */
 	static set Map(value) {
 		localStorage.setItem("lode-map", value);
 	}
 
+	/**
+	 * Get the lode-center-lat latitude value from localStorage
+	 * @returns {number} - latitude value
+	 */
 	static get Lat() {
 		return localStorage.getItem("lode-center-lat") || 60.847;
 	}
 
+	/**
+	 * Set the lode-center-lat latitude value from localStorage
+	 * @param {number} value - latitude value
+	 */
 	static set Lat(value) {
 		localStorage.setItem("lode-center-lat", value);
 	}
 
+	/**
+	 * Get the lode-center-lng longitude value from localStorage
+	 * @returns {number} - longitude value
+	 */
 	static get Lng() {
 		return localStorage.getItem("lode-center-lng") || -105.3905;
 	}
 
+	/**
+	 * Set the lode-center-lng longitude value from localStorage
+	 * @param {number} value - longitude value
+	 */
 	static set Lng(value) {
 		localStorage.setItem("lode-center-lng", value);
 	}
 
+	/**
+	 * Get the lode-zoom map zoom level from localStorage
+	 * @returns {number} map zoom level
+	 */
 	static get Zoom() {
-		return localStorage.getItem("lode-zoom") || 3;
+		return localStorage.getItem("lode-zoom") || 2;
 	}
 
+	/**
+	 * Set the lode-zoom map zoom level from localStorage
+	 * @param {number} value - map zoom level
+	 */
 	static set Zoom(value) {
 		localStorage.setItem("lode-zoom", value);
 	}
 
+	/**
+	 * Get the lode-opacity vector opacity level from localStorage
+	 * @returns {number} - opacity value
+	 */
 	static get Opacity() {
 		return localStorage.getItem("lode-opacity") || 0.75;
 	}
 
+	/**
+	 * Set the lode-opacity vector opacity level in localStorage
+	 * @param {number} value - opacity value ranging from 0 - 1.
+	 */
 	static set Opacity(value) {
 		localStorage.setItem("lode-opacity", value);
 	}
 
+	/**
+	 * Get the lode-layer layer from localStorage
+	 * @returns {string} - layer name
+	 */
 	static get Layer() {
 		return localStorage.getItem("lode-layer") || "da";
 	}
 
+	/**
+	 * Set the lode-layer layer from localStorage
+	 * @param {string} value - layer name
+	 */
 	static set Layer(value) {
 		localStorage.setItem("lode-layer", value);
 	}

mapbox-tools/components/map.js

@@ -36,12 +36,16 @@ export default class Map extends Evented {
 
 		this.layers = [];
 		this.original = {};
+		this.maxExtent = [[-162.0, 41.0], [-32.0, 83.5]];
 		this.style = options.style;
 
 		this.click = this.OnLayerClick_Handler.bind(this);;
 
 		this.map = new mapboxgl.Map(options); 
 
+		// Set the maximum bounds of the map
+		this.SetMaxBounds(this.maxExtent);
+
 		this.map.once('styledata', this.OnceStyleData_Handler.bind(this));
 
 		// this.map.on('click', this.click);
@@ -164,7 +168,11 @@ export default class Map extends Evented {
 	FitBounds(bounds, options) {		
 		this.map.fitBounds(bounds, options);
 	}
-	
+
+	SetMaxBounds(bounds) {
+		this.map.setMaxBounds(bounds);
+	}
+
 	SetStyle(style) {
 		this.style = style;
 
@@ -202,4 +210,4 @@ export default class Map extends Evented {
 
 		this.map.on(oEv, f);
 	}
-}
+}