Extent router & NPM Prepublish Script (#7)

* Implement extentRouter Will help with agrc/atlas#202 * remove all babel/sass output and wire npm prepublish script * ignore babel/sass output * update items * ignore secrets files in npm package * remove unused secrets.json * remove function * casing craziness * this is a windows trick * lowercase 4lyfe
agrc · Jun 20, 2018 · 576ae4d · 576ae4d
1 parent 6434323
commit 576ae4d
Show file tree

Hide file tree

Showing 18 changed files with 392 additions and 242 deletions.
diff --git a/packages/map-tools/.gitignore b/packages/map-tools/.gitignore
@@ -4,3 +4,9 @@ node_modules/
 secrets.json
 tests/spec/
 vendor/
+/MapView.js
+MapView.js.map
+/extentRouter.js
+extentRouter.js.map
+resources/MapView.css
+resources/MapView.css.map
diff --git a/packages/map-tools/ExtentRouter.js b/packages/map-tools/ExtentRouter.js
diff --git a/packages/map-tools/ExtentRouter.js.map b/packages/map-tools/ExtentRouter.js.map
diff --git a/packages/map-tools/Gruntfile.js b/packages/map-tools/Gruntfile.js
@@ -49,6 +49,14 @@ module.exports = function (grunt) {
                 ]
             }
         },
+        exec: {
+            main: {
+                cmd: 'node node_modules/jasmine/bin/jasmine.js --config=tests/e2e/jasmine.json'
+            },
+            debug: {
+                cmd: 'DEBUG=true node node_modules/jasmine/bin/jasmine.js --config=tests/e2e/jasmine.json'
+            }
+        },
         jasmine: {
             main: {
                 options: {
@@ -112,6 +120,17 @@ module.exports = function (grunt) {
         'eslint',
         'connect',
         'babel',
-        'jasmine'
+        'jasmine',
+        'exec:main'
+    ]);
+
+    grunt.registerTask('e2e', [
+        'connect',
+        'exec:main'
+    ]);
+
+    grunt.registerTask('e2edebug', [
+        'connect',
+        'exec:debug'
     ]);
 };
diff --git a/packages/map-tools/MapView.js b/packages/map-tools/MapView.js
diff --git a/packages/map-tools/MapView.js.map b/packages/map-tools/MapView.js.map
diff --git a/packages/map-tools/_SpecRunner.html b/packages/map-tools/_SpecRunner.html
@@ -30,8 +30,6 @@
 
   <script src="tests/jasmineAMDErrorChecking.js"></script>
 
-  <script src="tests/spec/SpecExtentRouter.js"></script>
-
   <script src="tests/spec/SpecMapView.js"></script>
 
   <script src=".grunt/grunt-contrib-jasmine/reporter.js"></script>

diff --git a/packages/map-tools/_src/ExtentRouter.js b/packages/map-tools/_src/ExtentRouter.js
diff --git a/packages/map-tools/_src/MapView.js b/packages/map-tools/_src/MapView.js
@@ -7,7 +7,7 @@ define([
     'dojo/query',
     'dojo/text!./resources/templates/loader.html',
     'dojo/_base/declare'
-], function (
+], (
     _TemplatedMixin,
     _WidgetBase,
 
@@ -16,7 +16,7 @@ define([
     query,
     loaderTemplate,
     declare
-) {
+) => {
     return declare(null, {
         // loader: DomNode
         //      the widget containing the loader animation

diff --git a/packages/map-tools/_src/extentRouter.js b/packages/map-tools/_src/extentRouter.js
@@ -0,0 +1,72 @@
+define([
+    'dojo/hash',
+    'dojo/io-query',
+
+    'esri/core/watchUtils',
+    'esri/geometry/Point'
+], (
+    hash,
+    ioQuery,
+
+    watchUtils,
+    Point
+) => {
+    const updateExtentHash = (mapView) => {
+        // summary:
+        //      sets the extent props in the url hash
+        // mapView: esri/views/mapView
+        console.log('map-tools/ExtentRouter:updateExtentHash', arguments);
+
+        if ((!mapView.scale && !mapView.zoom) || !mapView.center) {
+            return;
+        }
+
+        const center = mapView.center;
+        // mixin any existing url props to allow for other routers
+        const newProps = Object.assign(ioQuery.queryToObject(hash()), {
+            x: Math.round(center.x),
+            y: Math.round(center.y)
+        });
+
+        if (mapView.zoom) {
+            newProps.zoom = mapView.zoom;
+        } else {
+            newProps.scale = Math.rount(mapView.scale);
+        }
+
+        return hash(ioQuery.objectToQuery(newProps), true);
+    };
+
+    return (mapView) => {
+        // summary:
+        //      sets up the url router for persisting the map extent
+        // mapView: esri/views/mapView
+        console.log('map-tools/ExtentRouter:constructor', arguments);
+
+        const urlObj = ioQuery.queryToObject(hash());
+        const options = {
+            scale: parseInt(urlObj.scale, 10),
+            center: new Point({
+                x: parseInt(urlObj.x, 10),
+                y: parseInt(urlObj.y, 10),
+                spatialReference: {wkid: 3857}
+            }),
+            zoom: parseInt(urlObj.zoom, 10)
+        };
+        mapView.when(() => {
+            if (options.center.x && options.center.y && (options.scale || options.zoom)) {
+                if (options.zoom) {
+                    mapView.zoom = options.zoom;
+                } else {
+                    mapView.scale = options.scale;
+                }
+
+                mapView.center = options.center;
+            }
+            watchUtils.whenTrue(mapView, 'stationary', updateExtentHash.bind(null, mapView));
+        });
+
+        // return for unit tests assertion
+        return options;
+    };
+});