From 0c9c493c4992962cdb2ac7769e4f198a81ccd1b3 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 25 Sep 2017 15:19:35 -0400
Subject: [PATCH 01/34] Fix Disabling Draw Tool If Zoom < Layer MinZoom

* At some point the draw tool option buttons must have switched to `<span>`s,
  which don't have the "disabled" attribute, which we were still trying to use

* Make the draw tools proper buttons again, and re-render them on map zoom to
  keep the disabled state synced with the map
---
 src/mmw/js/src/draw/templates/drawTool.html | 16 +++++++++++-----
 src/mmw/js/src/draw/views.js                |  2 ++
 src/mmw/sass/pages/_draw.scss               | 10 ++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/mmw/js/src/draw/templates/drawTool.html b/src/mmw/js/src/draw/templates/drawTool.html
index 12101fd92..2c1d5205f 100644
--- a/src/mmw/js/src/draw/templates/drawTool.html
+++ b/src/mmw/js/src/draw/templates/drawTool.html
@@ -13,6 +13,17 @@
         <ul class="dropdown-menu draw-pane-list">
             {% for item in toolData.items %}
                 <li class="draw-pane-list-item" role="presentation">
+                    <button class="draw-pane-list-item-button" role="button" tabindex="-1"
+                          data-min-zoom="{{ item.minZoom }}"
+                          href="#" id="{{ item.id }}"
+                          {%- if currentZoomLevel < item.minZoom %}
+                          disabled
+                          {% endif -%}>
+                        {{ item.title }}
+                        {% if currentZoomLevel < item.minZoom %}
+                        &mdash; Zoom in to use
+                        {% endif %}
+                    </button>
                     <a class="help pull-right" data-toggle="popover" tabindex="0" data-html="true"
                         data-container="body" role="button" data-content="{{ item.info | safe }}"
                         data-template="<div class='popover'><div class='pull-right'
@@ -20,11 +31,6 @@
                             class='popover-content'></div><div class='arrow'></div></div>">
                         <i class="fa fa-question-circle"></i>
                     </a>
-                    <span class="draw-pane-list-item-button" role="button" tabindex="-1"
-                        data-min-zoom="{{ item.minZoom }}"
-                        href="#" id="{{ item.id }}" {{ 'disabled' if currentZoomLevel < item.minZoom }}>
-                        {{ item.title }}
-                    </span>
                 </li>
                 {% if not loop.last %}
                     <li role="separator" class="divider"></li>
diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js
index a62c0de7b..987510ff4 100644
--- a/src/mmw/js/src/draw/views.js
+++ b/src/mmw/js/src/draw/views.js
@@ -515,6 +515,8 @@ var DrawToolBaseView = Marionette.ItemView.extend({
                 self.model.closeDrawTool();
             }
         });
+
+        this.listenTo(App.getLeafletMap(), 'zoomend', _.bind(this.render, this));
     },
 
     templateHelpers: function() {
diff --git a/src/mmw/sass/pages/_draw.scss b/src/mmw/sass/pages/_draw.scss
index 7deea5444..a20a1fd42 100644
--- a/src/mmw/sass/pages/_draw.scss
+++ b/src/mmw/sass/pages/_draw.scss
@@ -127,12 +127,16 @@
     width: 100%;
 
     & .draw-pane-list-item {
-      list-style-type: none;
-      font-size: $font-size-h4;
+        list-style-type: none;
+        font-size: $font-size-h4;
+        display: flex;
 
       & .draw-pane-list-item-button {
         background: transparent;
         display: block;
+        width: 100%;
+        text-align: left;
+        border: none;
         padding-top: 0.5rem;
         padding-bottom: 0.5rem;
         padding-left: 0.8rem;
@@ -154,6 +158,8 @@
       & a.help {
         color: #999;
         padding: 0.5rem 1rem;
+        margin-right: 0;
+        margin-left: auto;
 
         &:hover {
           color: inherit;

From d3aa3d94ec260cf475a53fda665753fea957ba24 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <ttuhinanshu@azavea.com>
Date: Mon, 25 Sep 2017 17:09:46 -0400
Subject: [PATCH 02/34] Revert "Use Hydroshare Playground while production
 broken"

The production URL is no longer broken, so we switch back
to using it instead of the playground URL.

Refs #2149
---
 src/mmw/apps/bigcz/clients/hydroshare/search.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py
index f5952aca3..dd27a19c2 100644
--- a/src/mmw/apps/bigcz/clients/hydroshare/search.py
+++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py
@@ -14,7 +14,7 @@
 
 
 CATALOG_NAME = 'hydroshare'
-CATALOG_URL = 'https://playground.hydroshare.org/hsapi/resource/'
+CATALOG_URL = 'https://www.hydroshare.org/hsapi/resource/'
 
 
 def parse_date(value):

From bb8f51a596234b3ace44398579bc73a1b2086402 Mon Sep 17 00:00:00 2001
From: jfrankl <jfrankl@azavea.com>
Date: Tue, 19 Sep 2017 18:53:45 -0400
Subject: [PATCH 03/34] Restyle data detail view

---
 .../templates/resultDetailsCuahsi.html        | 70 +++++++++++--------
 src/mmw/sass/pages/_data-catalog.scss         | 32 ++++++++-
 2 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
index baa09da4f..520aaf7b9 100644
--- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
+++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
@@ -6,33 +6,43 @@
         <h2>
             Site: {{ location }} {{ title }}
         </h2>
-        <p>
-            Source: {{ service_org }} {{ service_title }}
-            <a data-toggle="popover" tabindex="0"
-               data-html="true" data-container="body" role="button"
-               data-content="{{ description }}"
-               data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
-                <i class="fa fa-info-circle black"></i>
-            </a>
-        </p>
+        <table class="table-data-detail">
+            <tr>
+                <th>Source</th>
+                <td>{{ service_org }}<br>{{ service_title }}
+                    <a data-toggle="popover" tabindex="0"
+                       data-html="true" data-container="body" role="button"
+                       data-content="{{ description }}"
+                       data-template="<div class='popover'><div class='pull-right' id='popover-close-button' onclick='closePopover()'><i class='fa fa-times' /></div><div class='popover-content'></div><div class='arrow'></div></div>">
+                        <i class="fa fa-info-circle black"></i>
+                    </a>
+                </td>
+            </tr>
+            {% if author %}
+                <tr>
+                    <th>Author</th>
+                    <td>
+                        {{ author }}
+                    </td>
+                </tr>
+            {% endif %}
+            <tr>
+                {% if begin_date == end_date %}
+                    <th>Data collected on</th>
+                    <td>{{ begin_date|toDateWithoutTime }}</td>
+                {% else %}
+                    <th>Data collected between</th>
+                    <td>{{ begin_date|toDateWithoutTime }}&ensp;&ndash;&ensp;{{ end_date|toDateWithoutTime }}</td>
+                {% endif %}
+            </tr>
+            <tr>
+                <th>Medium</th>
+                <td>
+                    {{ sample_mediums|join(", ") }}
+                </td>
+            </tr>
+        </table>
     </div>
-    {% if author %}
-        <p>
-            <i class="fa fa-user"></i>{{ author }}
-        </p>
-    {% endif %}
-    {% if begin_date == end_date %}
-        <p>
-            Data collected on: {{ begin_date|toDateWithoutTime }}
-        </p>
-    {% else %}
-        <p>
-            Data collected between: {{ begin_date|toDateWithoutTime }} - {{ end_date|toDateWithoutTime }}
-        </p>
-    {% endif %}
-    <p>
-        Medium: {{ sample_mediums|join(", ") }}
-    </p>
     <p>
         {% if details_url %}
             <a class="btn btn-secondary" href="{{ details_url }}"
@@ -45,7 +55,8 @@ <h2>
             <i class="fa fa-globe"></i>&nbsp;Web Services
         </a>
     </p>
-    <hr />
+    <hr>
+    <h3>Source Data</h3>
     <p>
         Last collected value {{ end_date|toTimeAgo }}:
     </p>
@@ -68,6 +79,7 @@ <h2>
         </tbody>
     </table>
     <!-- TODO Insert Chart https://github.com/WikiWatershed/model-my-watershed/issues/2238 -->
-    <hr />
-    <p>Citation: {{ service_citation }}</p>
+    <hr>
+    <h3>Citation</h3>
+    <p>{{ service_citation }}</p>
 </div>
diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss
index 327de1576..12a0130d7 100644
--- a/src/mmw/sass/pages/_data-catalog.scss
+++ b/src/mmw/sass/pages/_data-catalog.scss
@@ -33,13 +33,17 @@
             .result-detail-header {
               h2 {
                   display: inline-block;
-                  margin: 4px 0;
+                  margin: 10px 0 4px;
                   max-width: 95%;
               }
 
               a.zoom {
                 display: block;
               }
+
+              .close {
+                opacity: 0.6;
+              }
             }
         }
     }
@@ -311,3 +315,29 @@
         margin-top: 8px;
     }
 }
+
+.result-details-region {
+    p,
+    .btn {
+        font-size: $font-size-h5;
+    }
+}
+
+.table-data-detail {
+    font-size: $font-size-h5;
+    margin: 14px 0 6px;
+
+    td,
+    th {
+        vertical-align: top;
+        padding-bottom: 10px;
+    }
+
+    td {
+        color: #777;
+    }
+
+    th {
+        padding-right: 20px;
+    }
+}

From 533065c5a003882aca30f3a9d1ff48c512630e91 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 25 Sep 2017 15:45:44 -0400
Subject: [PATCH 04/34] Close Draw Tool If Outside Its Min Zoom

* If a draw tool is open and you zoom out beyond its min zoom, close the tool
---
 src/mmw/js/src/draw/views.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js
index 987510ff4..9282f477f 100644
--- a/src/mmw/js/src/draw/views.js
+++ b/src/mmw/js/src/draw/views.js
@@ -516,12 +516,11 @@ var DrawToolBaseView = Marionette.ItemView.extend({
             }
         });
 
-        this.listenTo(App.getLeafletMap(), 'zoomend', _.bind(this.render, this));
+        this.listenTo(App.getLeafletMap(), 'zoomend', _.bind(this.onMapZoom, this));
     },
 
     templateHelpers: function() {
         var activeDrawTool = this.model.get('activeDrawTool'),
-            activeDrawToolItem = this.model.get('activeDrawToolItem'),
             currentZoomLevel = App.getLeafletMap().getZoom(),
             openDrawTool = this.model.get('openDrawTool'),
             activeTitle = null,
@@ -529,9 +528,7 @@ var DrawToolBaseView = Marionette.ItemView.extend({
             toolData = this.getToolData();
 
         if (activeDrawTool === toolData.id) {
-            var activeItem = _.find(toolData.items, function(item) {
-                return item.id === activeDrawToolItem;
-            });
+            var activeItem = this.getActiveToolDataItem();
             activeTitle = activeItem.title;
             activeDirections = activeItem.directions;
         }
@@ -553,6 +550,21 @@ var DrawToolBaseView = Marionette.ItemView.extend({
         this.activatePopovers();
     },
 
+    onMapZoom: function() {
+        var activeItem = this.getActiveToolDataItem();
+        if (activeItem && App.getLeafletMap().getZoom() < activeItem.minZoom) {
+            this.resetDrawingState();
+        }
+        this.render();
+    },
+
+    getActiveToolDataItem: function() {
+        var activeDrawToolItem = this.model.get('activeDrawToolItem');
+        return _.find(this.getToolData().items, function(item) {
+            return item.id === activeDrawToolItem;
+        });
+    },
+
     openDrawTool: function() {
         this.model.openDrawTool(this.id);
     },

From 2295772836c66244984e2450369c474080f649e3 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 25 Sep 2017 16:17:40 -0400
Subject: [PATCH 05/34] Lower Boundary Layer Min Zoom

* We cache the boundary layer tiles forever, so we can afford to lower their min
  zoom levels and allow the user to view/select them from a higher-altitude
---
 src/mmw/mmw/settings/layer_settings.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mmw/mmw/settings/layer_settings.py b/src/mmw/mmw/settings/layer_settings.py
index 832c04e5f..8ebf1a88c 100644
--- a/src/mmw/mmw/settings/layer_settings.py
+++ b/src/mmw/mmw/settings/layer_settings.py
@@ -237,7 +237,7 @@
                         'target=\'_blank\' rel=\'noreferrer noopener\'>Model '
                         'My Watershed Technical Documentation on Boundaries.'
                         '</a>',
-            'minZoom': 7,
+            'minZoom': 6,
             'selectable': True,
             'searchable': True,
             'search_rank': 30,
@@ -274,7 +274,7 @@
                         'target=\'_blank\' rel=\'noreferrer noopener\'>Model '
                         'My Watershed Technical Documentation on Boundaries.'
                         '</a>',
-            'minZoom': 9,
+            'minZoom': 8,
             'selectable': True,
             'searchable': True,
             'search_rank': 10,
@@ -291,7 +291,7 @@
                         'target=\'_blank\' rel=\'noreferrer noopener\'>Model '
                         'My Watershed Technical Documentation on Boundaries.'
                         '</a>',
-            'minZoom': 9,
+            'minZoom': 6,
             'selectable': True,
         },
         {
@@ -307,7 +307,7 @@
                         'target=\'_blank\' rel=\'noreferrer noopener\'>Model '
                         'My Watershed Technical Documentation on Boundaries.'
                         '</a>',
-            'minZoom': 6,
+            'minZoom': 5,
             'selectable': True,
         },
         {
@@ -322,7 +322,7 @@
                         'target=\'_blank\' rel=\'noreferrer noopener\'>Model '
                         'My Watershed Technical Documentation on Boundaries.'
                         '</a>',
-            'minZoom': 9,
+            'minZoom': 8,
             'selectable': True,
         },
         {
@@ -330,7 +330,7 @@
             'table_name': 'dep_municipalities',
             'display': 'PA Municipalities',
             'short_display': 'PA Municipalities',
-            'minZoom': 7,
+            'minZoom': 6,
             'perimeter': pa_perimeter,
         },
     ],

From dec4ddaa87888d4dea05e7f4f1e8d6c0476c8e23 Mon Sep 17 00:00:00 2001
From: Kelly Innes <kinnes@azavea.com>
Date: Tue, 26 Sep 2017 12:21:38 -0400
Subject: [PATCH 06/34] Adjust user dropdown zindex

- set user dropdown zindex to 1010 to surpass the conservation practice
  dropdown button's zindex of 1002
---
 src/mmw/sass/base/_header.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mmw/sass/base/_header.scss b/src/mmw/sass/base/_header.scss
index 9b03557b0..ba613ce76 100644
--- a/src/mmw/sass/base/_header.scss
+++ b/src/mmw/sass/base/_header.scss
@@ -53,6 +53,7 @@ header {
         .dropdown-menu {
           left: auto;
           right: 0px;
+          z-index: 1010;
           a {
             color: $ui-secondary;
 

From 9046b2b125471940e961c79b97c89f95f258bdbc Mon Sep 17 00:00:00 2001
From: jfrankl <jfrankl@azavea.com>
Date: Tue, 26 Sep 2017 12:59:06 -0400
Subject: [PATCH 07/34] Change 'X' to back button

---
 .../templates/resultDetailsCuahsi.html          |  4 ++--
 src/mmw/sass/pages/_data-catalog.scss           | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
index 520aaf7b9..31bd5c7eb 100644
--- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
+++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
@@ -1,7 +1,7 @@
 <div class="result">
     <div class="result-detail-header">
         <button type="button" class="close" aria-label="Close">
-            <span aria-hidden="true">×</span>
+            <i class="fa fa-arrow-left black"></i> Back
         </button>
         <h2>
             Site: {{ location }} {{ title }}
@@ -58,7 +58,7 @@ <h2>
     <hr>
     <h3>Source Data</h3>
     <p>
-        Last collected value {{ end_date|toTimeAgo }}:
+        Last collected value {{ end_date|toTimeAgo }}
     </p>
     <table class="table custom-hover" data-toggle="table">
         <thead>
diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss
index 12a0130d7..c68d4b4ac 100644
--- a/src/mmw/sass/pages/_data-catalog.scss
+++ b/src/mmw/sass/pages/_data-catalog.scss
@@ -42,7 +42,14 @@
               }
 
               .close {
-                opacity: 0.6;
+                float: none;
+                display: block;
+                opacity: 1;
+                color: #389b9b;
+                text-shadow: none;
+                font-size: 13px;
+                font-weight: 400;
+                padding: 6px 0 2px;
               }
             }
         }
@@ -174,6 +181,14 @@
 
 .data-catalog-window,
 .data-catalog-resource-popover {
+    .btn-secondary {
+        height: auto;
+    }
+
+    h3 {
+        margin-bottom: 7px;
+    }
+
     .resource-description {
         color: $ui-grey;
         font-size: $font-size-h5;

From bf7ba5d786905064588137602102965b6d03fc6d Mon Sep 17 00:00:00 2001
From: jfrankl <jfrankl@azavea.com>
Date: Tue, 26 Sep 2017 15:30:43 -0400
Subject: [PATCH 08/34] Switch close to back arrow on cincergi and hydroshare

---
 .../src/data_catalog/templates/resultDetailsCinergi.html   | 7 +++----
 .../data_catalog/templates/resultDetailsHydroshare.html    | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html
index ac96714b8..0e7e8a41c 100644
--- a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html
+++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html
@@ -1,12 +1,11 @@
 <div class="result">
     <div class="result-detail-header">
+        <button type="button" class="close" aria-label="Close">
+            <i class="fa fa-arrow-left black"></i> Back
+        </button>
         <h2>
             {{ title }}
         </h2>
-        <button type="button" class="close" aria-label="Close">
-            <span aria-hidden="true">×</span>
-        </button>
-        <a href="#"><i class="fa fa-search-plus"></i> Zoom to extent</a>
     </div>
     <hr>
     {% if author %}
diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html
index aacadd961..c9c811f42 100644
--- a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html
+++ b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html
@@ -1,12 +1,11 @@
 <div class="result">
     <div class="result-detail-header">
+        <button type="button" class="close" aria-label="Close">
+            <i class="fa fa-arrow-left black"></i> Back
+        </button>
         <h2>
             {{ title }}
         </h2>
-        <button type="button" class="close" aria-label="Close">
-            <span aria-hidden="true">×</span>
-        </button>
-        <a href="#"><i class="fa fa-search-plus"></i> Zoom to extent</a>
     </div>
     <hr>
     {% if author %}

From e996ee12b8ac1fd3fe6287c4a992b2e694a7aa64 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <ttuhinanshu@azavea.com>
Date: Tue, 26 Sep 2017 15:54:42 -0400
Subject: [PATCH 09/34] Add WDC label in WDC Details View

Refs #2295
---
 .../js/src/data_catalog/templates/resultDetailsCuahsi.html    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
index 31bd5c7eb..4c19a0880 100644
--- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
+++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html
@@ -41,6 +41,10 @@ <h2>
                     {{ sample_mediums|join(", ") }}
                 </td>
             </tr>
+            <tr>
+                <th>Catalog</th>
+                <td>Water Data Center</td>
+            </tr>
         </table>
     </div>
     <p>

From a0ec233c675f68dea9c1c87a69d22379fab35a0a Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <terence@tuhinanshu.com>
Date: Tue, 26 Sep 2017 14:06:33 -0400
Subject: [PATCH 10/34] Merge pull request #2287 from
 WikiWatershed/tt/upgrade-celery

Upgrade Celery

Connects #2249
---
 .../defaults/main.yml                         |  3 +-
 .../model-my-watershed.celery/tasks/main.yml  |  1 -
 scripts/debugcelery.sh                        |  2 +-
 src/mmw/apps/core/tasks.py                    | 15 ++--
 src/mmw/apps/geoprocessing_api/tasks.py       | 28 +++----
 src/mmw/apps/geoprocessing_api/views.py       | 11 ++-
 src/mmw/apps/modeling/geoprocessing.py        |  8 +-
 src/mmw/apps/modeling/mapshed/tasks.py        | 17 +---
 src/mmw/apps/modeling/tests.py                |  8 +-
 src/mmw/apps/modeling/views.py                |  4 +-
 src/mmw/mmw/celery.py                         | 78 +------------------
 src/mmw/mmw/settings/base.py                  | 14 ++--
 src/mmw/requirements/base.txt                 |  1 +
 13 files changed, 49 insertions(+), 141 deletions(-)

diff --git a/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml
index 4e9c8919a..7d8dddc3c 100644
--- a/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml
+++ b/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml
@@ -1,3 +1,2 @@
 ---
-celery_version: 3.1.18
-djcelery_version: 3.1.16
+celery_version: 4.1.0
diff --git a/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml b/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml
index 82a6c4ea6..26213b088 100644
--- a/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml
+++ b/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml
@@ -3,4 +3,3 @@
   pip: name="{{ item.name }}" version={{ item.version }} state=present
   with_items:
     - { name: "celery[redis]", version: "{{ celery_version }}" }
-    - { name: "django-celery", version: "{{ djcelery_version }}" }
diff --git a/scripts/debugcelery.sh b/scripts/debugcelery.sh
index 7c9bbab3a..5a32d1c0e 100755
--- a/scripts/debugcelery.sh
+++ b/scripts/debugcelery.sh
@@ -6,6 +6,6 @@ set -e
 
 STOP_SERVICE="(sudo service celeryd stop || /bin/true)"
 CHANGE_DIR="cd /opt/app/"
-RUN_CELERY="envdir /etc/mmw.d/env celery -A 'mmw.celery:app' worker --autoreload -l debug -n debug@%n"
+RUN_CELERY="envdir /etc/mmw.d/env celery -A 'mmw.celery:app' worker -l debug -n debug@%n"
 
 vagrant ssh worker -c "$STOP_SERVICE && $CHANGE_DIR && $RUN_CELERY"
diff --git a/src/mmw/apps/core/tasks.py b/src/mmw/apps/core/tasks.py
index ed3b958ea..09c90e916 100644
--- a/src/mmw/apps/core/tasks.py
+++ b/src/mmw/apps/core/tasks.py
@@ -14,8 +14,8 @@
 logger = logging.getLogger(__name__)
 
 
-@shared_task(bind=True)
-def save_job_error(self, uuid, job_id):
+@shared_task
+def save_job_error(request, exc, traceback, job_id):
     """
     A handler task attached to the Celery chain. Any exception thrown along the
     chain will trigger this task, which logs the failure to the Job row so that
@@ -24,15 +24,14 @@ def save_job_error(self, uuid, job_id):
     To see failing task in Flower, follow instructions here:
     https://github.com/WikiWatershed/model-my-watershed/pull/551#issuecomment-119333146
     """
-    result = self.app.AsyncResult(uuid)
     error_message = 'Task {0} run from job {1} raised exception: {2}\n{3}'
-    logger.error(error_message.format(str(uuid), str(job_id),
-                                      str(result.result),
-                                      str(result.traceback)))
+    logger.error(error_message.format(str(request.id), str(job_id),
+                                      str(exc),
+                                      str(traceback)))
     try:
         job = Job.objects.get(id=job_id)
-        job.error = result.result
-        job.traceback = result.traceback
+        job.error = exc
+        job.traceback = traceback
         job.delivered_at = now()
         job.status = 'failed'
         job.save()
diff --git a/src/mmw/apps/geoprocessing_api/tasks.py b/src/mmw/apps/geoprocessing_api/tasks.py
index 653984a51..00fc57fad 100644
--- a/src/mmw/apps/geoprocessing_api/tasks.py
+++ b/src/mmw/apps/geoprocessing_api/tasks.py
@@ -175,38 +175,28 @@ def analyze_climate(result, category, month):
 
 
 @shared_task
-def combine_climate(results):
+def collect_climate(results):
     """
     Given an array of dictionaries resulting from multiple analyze_climate
     calls, combines them so that the 'ppt' values are grouped together and
     'tmean' together. Each group is a dictionary where the keys are strings
     of the month '1', '2', ..., '12', and the values the average in the
     area of interest.
+
+    Then, transforms these dictionaries into a final result of the format used
+    for all other Analyze operations. The 'categories' contain twelve objects,
+    one for each month, with a 'month' field containing the name of the month,
+    and 'ppt' and 'tmean' fields with corresponding values. The 'index' can be
+    used for sorting purposes on the client side.
     """
     ppt = {k[5:]: v for r in results for k, v in r.items() if 'ppt' in k}
     tmean = {k[7:]: v for r in results for k, v in r.items() if 'tmean' in k}
 
-    return {
-        'ppt': ppt,
-        'tmean': tmean,
-    }
-
-
-@shared_task
-def collect_climate(results):
-    """
-    Given the two dictionaries from combine_climate, transforms them into a
-    final result of the format used for all other Analyze operations. The
-    'categories' contain twelve objects, one for each month, with a 'month'
-    field containing the name of the month, and 'ppt' and 'tmean' fields with
-    corresponding values. The 'index' can be used for sorting purposes on the
-    client side.
-    """
     categories = [{
         'monthidx': i,
         'month': month_name[i],
-        'ppt': results['ppt'][str(i)] * CM_PER_MM,
-        'tmean': results['tmean'][str(i)],
+        'ppt': ppt[str(i)] * CM_PER_MM,
+        'tmean': tmean[str(i)],
     } for i in xrange(1, 13)]
 
     return {
diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py
index cc5fa7be5..c93ce1b31 100644
--- a/src/mmw/apps/geoprocessing_api/views.py
+++ b/src/mmw/apps/geoprocessing_api/views.py
@@ -934,9 +934,8 @@ def start_analyze_climate(request, format=None):
 
     return start_celery_job([
         group(geotasks),
-        tasks.combine_climate.s(),
         tasks.collect_climate.s(),
-    ], area_of_interest, user)
+    ], area_of_interest, user, link_error=False)
 
 
 def _initiate_rwd_job_chain(location, snapping, data_source,
@@ -948,7 +947,7 @@ def _initiate_rwd_job_chain(location, snapping, data_source,
         .apply_async(link_error=errback)
 
 
-def start_celery_job(task_list, job_input, user=None):
+def start_celery_job(task_list, job_input, user=None, link_error=True):
     """
     Given a list of Celery tasks and it's input, starts a Celery async job with
     those tasks, adds save_job_result and save_job_error handlers, and returns
@@ -957,6 +956,7 @@ def start_celery_job(task_list, job_input, user=None):
     :param task_list: A list of Celery tasks to execute. Is made into a chain
     :param job_input: Input to the first task, used in recording started jobs
     :param user: The user requesting the job. Optional.
+    :param link_error: Whether or not to apply error handler to entire chain
     :return: A Response contianing the job id, marked as 'started'
     """
     created = now()
@@ -968,7 +968,10 @@ def start_celery_job(task_list, job_input, user=None):
     error = save_job_error.s(job.id)
 
     task_list.append(success)
-    task_chain = chain(task_list).apply_async(link_error=error)
+    if link_error:
+        task_chain = chain(task_list).apply_async(link_error=error)
+    else:
+        task_chain = chain(task_list).apply_async()
 
     job.uuid = task_chain.id
     job.save()
diff --git a/src/mmw/apps/modeling/geoprocessing.py b/src/mmw/apps/modeling/geoprocessing.py
index 159dde16a..a82d28b24 100644
--- a/src/mmw/apps/modeling/geoprocessing.py
+++ b/src/mmw/apps/modeling/geoprocessing.py
@@ -19,7 +19,7 @@
 from django.conf import settings
 
 
-@shared_task(bind=True, default_retry_delay=1, max_retries=42)
+@shared_task(bind=True, default_retry_delay=1, max_retries=6)
 def run(self, opname, input_data, wkaoi=None, cache_key=''):
     """
     Run a geoprocessing operation.
@@ -75,9 +75,13 @@ def run(self, opname, input_data, wkaoi=None, cache_key=''):
         return result
     except Retry as r:
         raise r
+    except ConnectionError:
+        return {
+            'error': 'Could not reach the geoprocessing service'
+        }
     except Exception as x:
         return {
-            'error': x.message
+            'error': str(x)
         }
 
 
diff --git a/src/mmw/apps/modeling/mapshed/tasks.py b/src/mmw/apps/modeling/mapshed/tasks.py
index 8061e8250..de59a1b1e 100644
--- a/src/mmw/apps/modeling/mapshed/tasks.py
+++ b/src/mmw/apps/modeling/mapshed/tasks.py
@@ -45,7 +45,9 @@
 
 
 @shared_task
-def collect_data(geop_result, geojson):
+def collect_data(geop_results, geojson):
+    geop_result = {k: v for r in geop_results for k, v in r.items()}
+
     geom = GEOSGeometry(geojson, srid=4326)
     area = geom.transform(5070, clone=True).area  # Square Meters
 
@@ -491,19 +493,6 @@ def geoprocessing_chains(aoi, wkaoi, errback):
     ]
 
 
-@shared_task
-def combine(geop_results):
-    """
-    Flattens the incoming results dictionaries into one
-    which has all the keys of the components.
-
-    This could be a part of collect_data, but we need
-    a buffer in a chord as a workaround to
-    https://github.com/celery/celery/issues/3191
-    """
-    return {k: v for r in geop_results for k, v in r.items()}
-
-
 def get_lu_index(nlcd):
     # Convert NLCD code into MapShed Land Use Index
     if nlcd == 81:
diff --git a/src/mmw/apps/modeling/tests.py b/src/mmw/apps/modeling/tests.py
index af0a286a0..f43f468fb 100644
--- a/src/mmw/apps/modeling/tests.py
+++ b/src/mmw/apps/modeling/tests.py
@@ -202,7 +202,7 @@ def setUp(self):
                                       status='started')
         self.job.save()
 
-    @override_settings(CELERY_ALWAYS_EAGER=True)
+    @override_settings(CELERY_TASK_ALWAYS_EAGER=True)
     def test_tr55_job_runs_in_chain(self):
         # For the purposes of this test, there are no modifications
         self.model_input['modification_pieces'] = []
@@ -228,7 +228,7 @@ def test_tr55_job_runs_in_chain(self):
                          'complete',
                          'Job found but incomplete.')
 
-    @override_settings(CELERY_ALWAYS_EAGER=True)
+    @override_settings(CELERY_TASK_ALWAYS_EAGER=True)
     def test_tr55_job_error_in_chain(self):
         model_input = {
             'inputs': [],
@@ -401,7 +401,7 @@ def test_tr55_chain_doesnt_generate_aoi_census_if_it_exists_and_no_mods(self):
                             else False for t in needed_tasks]),
                         'missing necessary job in chain')
 
-    @override_settings(CELERY_ALWAYS_EAGER=True)
+    @override_settings(CELERY_TASK_ALWAYS_EAGER=True)
     def test_tr55_chain_generates_modification_censuses_if_they_are_old(self):
         """If they modification censuses exist in the model input, but the
         hash stored with the censuses does not match the hash passed in
@@ -455,7 +455,7 @@ def test_tr55_chain_generates_modification_censuses_if_they_are_old(self):
                             else False for t in needed_tasks]),
                         'missing necessary job in chain')
 
-    @override_settings(CELERY_ALWAYS_EAGER=True)
+    @override_settings(CELERY_TASK_ALWAYS_EAGER=True)
     def test_tr55_chain_generates_both_censuses_if_they_are_missing(self):
         """If neither the AoI censuses or the modification censuses exist,
         they are both generated.
diff --git a/src/mmw/apps/modeling/views.py b/src/mmw/apps/modeling/views.py
index 823a01aad..7797d997a 100644
--- a/src/mmw/apps/modeling/views.py
+++ b/src/mmw/apps/modeling/views.py
@@ -31,7 +31,6 @@
 from apps.core.decorators import log_request
 from apps.modeling import tasks, geoprocessing
 from apps.modeling.mapshed.tasks import (geoprocessing_chains,
-                                         combine,
                                          collect_data,
                                          )
 from apps.modeling.models import Project, Scenario
@@ -230,11 +229,10 @@ def _initiate_mapshed_job_chain(mapshed_input, job_id):
 
     job_chain = (
         group(geoprocessing_chains(area_of_interest, wkaoi, errback)) |
-        combine.s() |
         collect_data.s(area_of_interest).set(link_error=errback) |
         save_job_result.s(job_id, mapshed_input))
 
-    return chain(job_chain).apply_async(link_error=errback)
+    return chain(job_chain).apply_async()
 
 
 @decorators.api_view(['POST'])
diff --git a/src/mmw/mmw/celery.py b/src/mmw/mmw/celery.py
index 3a94ea79a..8bf22279e 100644
--- a/src/mmw/mmw/celery.py
+++ b/src/mmw/mmw/celery.py
@@ -2,87 +2,13 @@
 
 import os
 import rollbar
-import logging
 
 from celery import Celery
-from celery._state import connect_on_app_finalize
 from celery.signals import task_failure
 
 from django.conf import settings
 
 
-@connect_on_app_finalize
-def add_unlock_chord_task_shim(app):
-    """
-    Override native unlock_chord to support configurable max_retries.
-    Original code taken from https://goo.gl/3mX0ie
-
-    This task is used by result backends without native chord support.
-    It joins chords by creating a task chain polling the header for completion.
-    """
-    from celery.canvas import maybe_signature
-    from celery.exceptions import ChordError
-    from celery.result import allow_join_result, result_from_tuple
-
-    logger = logging.getLogger(__name__)
-
-    MAX_RETRIES = settings.CELERY_CHORD_UNLOCK_MAX_RETRIES
-
-    @app.task(name='celery.chord_unlock', shared=False, default_retry_delay=1,
-              ignore_result=True, lazy=False, bind=True,
-              max_retries=MAX_RETRIES)
-    def unlock_chord(self, group_id, callback, interval=None,
-                     max_retries=MAX_RETRIES, result=None,
-                     Result=app.AsyncResult, GroupResult=app.GroupResult,
-                     result_from_tuple=result_from_tuple, **kwargs):
-        if interval is None:
-            interval = self.default_retry_delay
-
-        # check if the task group is ready, and if so apply the callback.
-        callback = maybe_signature(callback, app)
-        deps = GroupResult(
-            group_id,
-            [result_from_tuple(r, app=app) for r in result],
-            app=app,
-        )
-        j = deps.join_native if deps.supports_native_join else deps.join
-
-        try:
-            ready = deps.ready()
-        except Exception as exc:
-            raise self.retry(
-                exc=exc, countdown=interval, max_retries=max_retries)
-        else:
-            if not ready:
-                raise self.retry(countdown=interval, max_retries=max_retries)
-
-        callback = maybe_signature(callback, app=app)
-        try:
-            with allow_join_result():
-                ret = j(timeout=3.0, propagate=True)
-        except Exception as exc:
-            try:
-                culprit = next(deps._failed_join_report())
-                reason = 'Dependency {0.id} raised {1!r}'.format(
-                    culprit, exc,
-                )
-            except StopIteration:
-                reason = repr(exc)
-            logger.error('Chord %r raised: %r', group_id, exc, exc_info=1)
-            app.backend.chord_error_from_stack(callback,
-                                               ChordError(reason))
-        else:
-            try:
-                callback.delay(ret)
-            except Exception as exc:
-                logger.error('Chord %r raised: %r', group_id, exc, exc_info=1)
-                app.backend.chord_error_from_stack(
-                    callback,
-                    exc=ChordError('Callback error: {0!r}'.format(exc)),
-                )
-    return unlock_chord
-
-
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE',
                       'mmw.settings.production')
@@ -91,8 +17,8 @@ def unlock_chord(self, group_id, callback, interval=None,
 
 # Using a string here means the worker will not have to
 # pickle the object when using Windows.
-app.config_from_object('django.conf:settings')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+app.config_from_object('django.conf:settings', namespace='CELERY')
+app.autodiscover_tasks()
 
 rollbar_settings = getattr(settings, 'ROLLBAR', {})
 if rollbar_settings:
diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py
index 75a962bcf..5ae3fddbe 100644
--- a/src/mmw/mmw/settings/base.py
+++ b/src/mmw/mmw/settings/base.py
@@ -115,22 +115,21 @@ def get_env_setting(setting):
 
 
 # CELERY CONFIGURATION
-BROKER_URL = 'redis://{0}:{1}/2'.format(
+CELERY_BROKER_URL = 'redis://{0}:{1}/2'.format(
     environ.get('MMW_CACHE_HOST', 'localhost'),
     environ.get('MMW_CACHE_PORT', 6379))
 
-CELERY_IMPORTS = ('celery.task.http',
-                  # Submodule task is not always autodiscovered
-                  'apps.modeling.mapshed.tasks',
-                  )
+CELERY_IMPORTS = (
+    # Submodule task is not always autodiscovered
+    'apps.modeling.mapshed.tasks',
+)
 CELERY_ACCEPT_CONTENT = ['json']
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_RESULT_SERIALIZER = 'json'
-CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
+CELERY_RESULT_BACKEND = 'django-cache'
 STATSD_CELERY_SIGNALS = True
 CELERY_CREATE_MISSING_QUEUES = True
 CELERY_CHORD_PROPAGATES = True
-CELERY_CHORD_UNLOCK_MAX_RETRIES = 60
 CELERY_DEFAULT_QUEUE = STACK_COLOR
 CELERY_DEFAULT_ROUTING_KEY = "task.%s" % STACK_COLOR
 # END CELERY CONFIGURATION
@@ -294,6 +293,7 @@ def get_env_setting(setting):
     'rest_framework_swagger',
     'rest_framework.authtoken',
     'registration',
+    'django_celery_results',
 )
 
 # THIRD-PARTY CONFIGURATION
diff --git a/src/mmw/requirements/base.txt b/src/mmw/requirements/base.txt
index 8508c5a92..8839ad100 100644
--- a/src/mmw/requirements/base.txt
+++ b/src/mmw/requirements/base.txt
@@ -18,3 +18,4 @@ rollbar==0.13.8
 retry==0.9.1
 python-dateutil==2.6.0
 suds==0.4
+django_celery_results==1.0.1

From 922cb7215ba19d7dd4c33e0631d9ab9d28acfbf0 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <ttuhinanshu@azavea.com>
Date: Thu, 28 Sep 2017 16:49:54 -0400
Subject: [PATCH 11/34] Don't use listenTo for non-Backbone events

Apparently by using listenTo on non-Backbone events caused all
pre-existing listeners on that event to be removed or corrupted.
By using the common "on" pattern we achieve the same behavior
while maintaining map interaction.
---
 src/mmw/js/src/draw/views.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js
index 9282f477f..cad73213e 100644
--- a/src/mmw/js/src/draw/views.js
+++ b/src/mmw/js/src/draw/views.js
@@ -507,7 +507,10 @@ var DrawToolBaseView = Marionette.ItemView.extend({
 
     initialize: function(options) {
         this.resetDrawingState = options.resetDrawingState;
-        var self = this;
+        this.onMapZoom = _.bind(this.onMapZoom, this);
+
+        var self = this,
+            map = App.getLeafletMap();
 
         $(document).on('mouseup', function(e) {
             var isTargetOutside = $(e.target).parents('.dropdown-menu').length === 0;
@@ -516,7 +519,7 @@ var DrawToolBaseView = Marionette.ItemView.extend({
             }
         });
 
-        this.listenTo(App.getLeafletMap(), 'zoomend', _.bind(this.onMapZoom, this));
+        map.on('zoomend', this.onMapZoom);
     },
 
     templateHelpers: function() {
@@ -574,6 +577,12 @@ var DrawToolBaseView = Marionette.ItemView.extend({
             placement: 'top',
             trigger: 'focus'
         });
+    },
+
+    onDestroy: function() {
+        var map = App.getLeafletMap();
+
+        map.off('zoomend', this.onMapZoom);
     }
 });
 

From 9572763be165ba69e49a40e532d84b6753f58e94 Mon Sep 17 00:00:00 2001
From: Kelly Innes <kinnes@azavea.com>
Date: Tue, 26 Sep 2017 14:26:05 -0400
Subject: [PATCH 12/34] Show compare pagination btns only if > 5 scenarios

- hide compare view pagination btns only if there are > 5 scenarios
- show compare view pagination btns otherwise
---
 src/mmw/js/src/compare/models.js |  2 +-
 src/mmw/js/src/compare/views.js  | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/mmw/js/src/compare/models.js b/src/mmw/js/src/compare/models.js
index f67dab90d..a83f23d62 100644
--- a/src/mmw/js/src/compare/models.js
+++ b/src/mmw/js/src/compare/models.js
@@ -7,7 +7,7 @@ var _ = require('lodash'),
 
 var CHART = 'chart',
     TABLE = 'table',
-    MIN_VISIBLE_SCENARIOS = 3,
+    MIN_VISIBLE_SCENARIOS = 5,
     CHART_AXIS_WIDTH = 82,
     COMPARE_COLUMN_WIDTH = 134;
 
diff --git a/src/mmw/js/src/compare/views.js b/src/mmw/js/src/compare/views.js
index 0a10bf2b6..44506f015 100644
--- a/src/mmw/js/src/compare/views.js
+++ b/src/mmw/js/src/compare/views.js
@@ -66,16 +66,21 @@ var CompareWindow2 = modalViews.ModalBaseView.extend({
             prevButton = this.ui.prevButton,
             nextButton = this.ui.nextButton;
 
-        if (i < 1) {
-            prevButton.removeClass('active');
+        if (total <= minScenarios) {
+            prevButton.hide();
+            nextButton.hide();
         } else {
-            prevButton.addClass('active');
-        }
+            if (i < 1) {
+                prevButton.removeClass('active');
+            } else {
+                prevButton.addClass('active');
+            }
 
-        if (i + minScenarios >= total) {
-            nextButton.removeClass('active');
-        } else {
-            nextButton.addClass('active');
+            if (i + minScenarios >= total) {
+                nextButton.removeClass('active');
+            } else {
+                nextButton.addClass('active');
+            }
         }
     },
 

From dc70182fd074a61331cd1e83a354da421bdd2907 Mon Sep 17 00:00:00 2001
From: jfrankl <jfrankl@azavea.com>
Date: Fri, 29 Sep 2017 19:45:14 -0400
Subject: [PATCH 13/34] Style filter sidebar panel

---
 .../templates/checkboxFilter.html             |  4 +-
 .../data_catalog/templates/dateFilter.html    |  5 +-
 src/mmw/sass/pages/_data-catalog.scss         | 71 ++++++++++++++++---
 3 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/src/mmw/js/src/data_catalog/templates/checkboxFilter.html b/src/mmw/js/src/data_catalog/templates/checkboxFilter.html
index 23cfd40a6..57a72a1fb 100644
--- a/src/mmw/js/src/data_catalog/templates/checkboxFilter.html
+++ b/src/mmw/js/src/data_catalog/templates/checkboxFilter.html
@@ -1,11 +1,11 @@
 <div class="checkbox data-catalog-filter-checkbox">
-    <h5>{{ label }}</h5>
      <label>
          <input type="checkbox"
                 name={{id}}
                 id={{id}}
                 {{ "checked" if active }}
          >
-         Active
+         <div class="checkbox--styled"></div>
+         Exclude gridded services
      </label>
  </div>
diff --git a/src/mmw/js/src/data_catalog/templates/dateFilter.html b/src/mmw/js/src/data_catalog/templates/dateFilter.html
index 468882984..2e1689084 100644
--- a/src/mmw/js/src/data_catalog/templates/dateFilter.html
+++ b/src/mmw/js/src/data_catalog/templates/dateFilter.html
@@ -1,6 +1,5 @@
 <div class="data-catalog-search-dates">
-    <h5>Data collected between</h5>
-    <label for="from-date">From Date</label>
+    <label for="from-date">From date</label>
     <div class="data-catalog-clearable-input">
         <input
             id="from-date"
@@ -13,7 +12,7 @@ <h5>Data collected between</h5>
         </a>
         {% endif %}
     </div>
-    <label for="to-date">To Date</label>
+    <label for="to-date">To date</label>
     <div class="data-catalog-clearable-input">
         <input
             id="to-date"
diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss
index c68d4b4ac..79e4d74ea 100644
--- a/src/mmw/sass/pages/_data-catalog.scss
+++ b/src/mmw/sass/pages/_data-catalog.scss
@@ -120,7 +120,7 @@
         .filter-sidebar-toggle {
           position: absolute;
           right: 1.5rem;
-          top: -36px;
+          top: -42px;
         }
     }
 
@@ -222,7 +222,7 @@
     .resource {
         .resource-title {
             font-size: $font-size-h4;
-            font-weight: 600;
+            font-weight: 800;
             margin-bottom: 4px;
         }
 
@@ -249,7 +249,7 @@
 
 .data-catalog-filter-window {
     padding: 1rem;
-    padding-top: 2rem;
+    padding-top: 1.4rem;
     left: $sidebar-width;
     width: $secondary-sidebar-width;
     transition: all 200ms;
@@ -264,6 +264,7 @@
 .data-catalog-filter-window > .data-catalog-filters-header {
     display: flex;
     flex-direction: row;
+    padding-bottom: 6px;
     > .filter-title {
         line-height: $height-md;
     }
@@ -271,13 +272,20 @@
         margin-left: auto;
         font-weight: 600;
         color: $brand-primary;
+        padding: 0;
+        font-size: 13px;
+        position: relative;
+        top: 0px;
     }
 }
 
 .data-catalog-filter-window > .data-catalog-filter-group {
-    h5 {
-        text-transform: uppercase;
-        font-weight: 800;
+    & > h5,
+    & > label {
+        font-weight: 700;
+        margin-top: 4px;
+        font-size: 12px;
+        color: #4d6d82;
     }
 }
 
@@ -285,6 +293,37 @@
     input[type=checkbox] {
       position: relative;
       margin-right: 5px;
+      display: none;
+      &:checked + .checkbox--styled {
+        background-color: $brand-primary;
+        border-color: $brand-primary;
+        text-align: center;
+        &:after {
+            content: "\f00c";
+            font-family: FontAwesome;
+            color: #fff;
+            position: absolute;
+            top: 1px;
+            left: 2px;
+        }
+      }
+    }
+
+    .checkbox--styled {
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        border: 0;
+        border-radius: 2px;
+        position: relative;
+        margin-right: 3px;
+        top: 3px;
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+        background-color: #fff;
+    }
+
+    input, .checkbox--styled {
+        border: 1px solid #ccc;
     }
 
     label {
@@ -293,11 +332,10 @@
 }
 
 .data-catalog-filter-group .data-catalog-search-dates {
-    padding: 12px 10px;
-    margin: 0 -10px 10px;
+    padding: 0 10px;
+    margin: 0 -10px 0;
 
     label {
-        text-transform: uppercase;
         display: block;
         font-size: $font-size-h5;
     }
@@ -311,7 +349,6 @@
     }
     .data-catalog-date-input {
         height: 38px;
-        border: none;
         border-radius: 0;
         display: inline;
         margin-bottom: 12px;
@@ -356,3 +393,17 @@
         padding-right: 20px;
     }
 }
+
+.data-catalog-search-dates label {
+    font-weight: 600;
+    color: #555;
+    font-size: 13px;
+    margin: 10px 0px 12px;
+}
+
+.data-catalog-filter-group .data-catalog-filter-checkbox label {
+    font-size: 13px;
+    font-weight: 600;
+    color: #555;
+    padding-left: 0;
+}

From 9c2c5405dd4fb877fd3ca284ac9809fea68769a8 Mon Sep 17 00:00:00 2001
From: jfrankl <jfrankl@azavea.com>
Date: Fri, 29 Sep 2017 19:56:28 -0400
Subject: [PATCH 14/34] Switch to more consistent centering method

---
 src/mmw/sass/pages/_data-catalog.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss
index 79e4d74ea..a568245b4 100644
--- a/src/mmw/sass/pages/_data-catalog.scss
+++ b/src/mmw/sass/pages/_data-catalog.scss
@@ -303,8 +303,9 @@
             font-family: FontAwesome;
             color: #fff;
             position: absolute;
-            top: 1px;
-            left: 2px;
+            left: 0;
+            right: 0;
+            line-height: 18px;
         }
       }
     }

From 039cfdd8f6290e8240eb733075328a6335376443 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <ttuhinanshu@azavea.com>
Date: Mon, 2 Oct 2017 12:27:26 -0400
Subject: [PATCH 15/34] Reverse Gridded Services Filter

Previously, the filter was called "Gridded Services" and disabled
by default. If it were turned on, a search option named "gridded"
would be sent, to include gridded services.

However, this is not how most search filters behave. Intuitively,
each filter reduces the number of results, and disabling should
increase the number of results.

To better match this intuition, the filter is now reversed to be
named "Exclude Gridded Services". When it is turned on, the
gridded services will be excluded, and turning it off will include
them, thus expanding the number of results.

This filter is now turned on by default, to maintain current
behavior of not including gridded services unless explicitly
requested by the user.
---
 src/mmw/apps/bigcz/clients/cuahsi/search.py            | 10 +++++-----
 src/mmw/js/src/data_catalog/models.js                  |  5 +++--
 .../js/src/data_catalog/templates/checkboxFilter.html  |  2 +-
 src/mmw/js/src/data_catalog/views.js                   |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/mmw/apps/bigcz/clients/cuahsi/search.py b/src/mmw/apps/bigcz/clients/cuahsi/search.py
index fbc4fee50..e4ce8a265 100644
--- a/src/mmw/apps/bigcz/clients/cuahsi/search.py
+++ b/src/mmw/apps/bigcz/clients/cuahsi/search.py
@@ -65,16 +65,16 @@ def recursive_asdict(d):
     return out
 
 
-def filter_networkIDs(services, gridded=False):
+def filter_networkIDs(services, exclude_gridded=False):
     """
     Transforms list of services to list of ServiceIDs, with respect to
     given options.
 
-    If gridded=False, then GRIDDED services will not be included.
+    If exclude_gridded=True, then GRIDDED services will not be included.
 
     If no filters apply, we return an empty list to disable filtering.
     """
-    if not gridded:
+    if exclude_gridded:
         return [str(s['ServiceID']) for s in services
                 if s['NetworkName'] not in GRIDDED]
 
@@ -261,7 +261,7 @@ def search(**kwargs):
     bbox = kwargs.get('bbox')
     to_date = kwargs.get('to_date')
     from_date = kwargs.get('from_date')
-    gridded = 'gridded' in kwargs.get('options')
+    exclude_gridded = 'exclude_gridded' in kwargs.get('options')
 
     if not bbox:
         raise ValidationError({
@@ -270,7 +270,7 @@ def search(**kwargs):
     world = BBox(-180, -90, 180, 90)
 
     services = get_services_in_box(world)
-    networkIDs = filter_networkIDs(services, gridded)
+    networkIDs = filter_networkIDs(services, exclude_gridded)
     series = get_series_catalog_in_box(bbox, from_date, to_date, networkIDs)
     series = group_series_by_location(series)
     results = sorted(parse_records(series, services),
diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js
index d940899d9..8f6fec476 100644
--- a/src/mmw/js/src/data_catalog/models.js
+++ b/src/mmw/js/src/data_catalog/models.js
@@ -55,9 +55,10 @@ var SearchOption = FilterModel.extend({
 
 var GriddedServicesFilter = SearchOption.extend({
     defaults: _.defaults({
-        id: 'gridded',
+        id: 'exclude_gridded',
         type: 'checkbox',
-        label: 'Gridded Services',
+        label: 'Exclude Gridded Services',
+        active: true,
     }, SearchOption.prototype.defaults)
 });
 
diff --git a/src/mmw/js/src/data_catalog/templates/checkboxFilter.html b/src/mmw/js/src/data_catalog/templates/checkboxFilter.html
index 57a72a1fb..e1c6ec5e6 100644
--- a/src/mmw/js/src/data_catalog/templates/checkboxFilter.html
+++ b/src/mmw/js/src/data_catalog/templates/checkboxFilter.html
@@ -6,6 +6,6 @@
                 {{ "checked" if active }}
          >
          <div class="checkbox--styled"></div>
-         Exclude gridded services
+         {{ label }}
      </label>
  </div>
diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js
index abf7713d8..d1d66053d 100644
--- a/src/mmw/js/src/data_catalog/views.js
+++ b/src/mmw/js/src/data_catalog/views.js
@@ -596,7 +596,7 @@ var CheckboxFilterView = FilterBaseView.extend({
     },
 
     modelEvents: {
-        'change:active': 'render'
+        'change': 'render'
     },
 
     toggleState: function() {

From 69180e144813447d9c8adf0d719b5b6745b51afa Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <ttuhinanshu@azavea.com>
Date: Mon, 2 Oct 2017 12:42:44 -0400
Subject: [PATCH 16/34] Fix Button Styling

Active buttons should only override border color,
not other attributes
---
 src/mmw/sass/components/_buttons.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mmw/sass/components/_buttons.scss b/src/mmw/sass/components/_buttons.scss
index c48f50481..6e8c7a536 100644
--- a/src/mmw/sass/components/_buttons.scss
+++ b/src/mmw/sass/components/_buttons.scss
@@ -76,12 +76,12 @@
   position: relative;
   display: inline-block;
   background-color: $brand-primary !important;
-  border: darken($brand-primary, 5%);
+  border-color: darken($brand-primary, 5%);
 
   &:hover, &:focus {
     color: $paper!important;
     background-color: darken($brand-primary, 5%);
-    border: darken($brand-primary, 10%);
+    border-color: darken($brand-primary, 10%);
   }
 }
 

From b6e904c93bc70a67a4f4f96380185a31b545dd50 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <ttuhinanshu@azavea.com>
Date: Mon, 2 Oct 2017 12:47:17 -0400
Subject: [PATCH 17/34] Update Filters Label when switching Catalogs

Since different catalogs can have different filters, the Filter
button should update to reflect currently active filter for the
active tab whenever switching to a new catalog tab.
---
 src/mmw/js/src/data_catalog/views.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js
index d1d66053d..8827d61a2 100644
--- a/src/mmw/js/src/data_catalog/views.js
+++ b/src/mmw/js/src/data_catalog/views.js
@@ -200,6 +200,8 @@ var FormView = Marionette.ItemView.extend({
                 this.showFilterSidebar();
             }
 
+            this.render();
+
         }, this);
 
         // Update the filter sidebar when there's a new active catalog

From f4243f10e8039723149e716278fff3f2a386f0af Mon Sep 17 00:00:00 2001
From: Kelly Innes <kinnes@azavea.com>
Date: Mon, 2 Oct 2017 16:01:08 -0400
Subject: [PATCH 18/34] Temporarily remove compare view download button

- temporarily remove compare view download button in advance of next
  release
---
 src/mmw/js/src/compare/templates/compareInputs.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/mmw/js/src/compare/templates/compareInputs.html b/src/mmw/js/src/compare/templates/compareInputs.html
index 5d80f11a2..53dd79716 100644
--- a/src/mmw/js/src/compare/templates/compareInputs.html
+++ b/src/mmw/js/src/compare/templates/compareInputs.html
@@ -3,8 +3,3 @@
     <button id="compare-input-button-chart" class="{{ 'active' if mode == 'chart' }}"><i class="fa fa-bar-chart"></i></button>
     <button id="compare-input-button-table" class="{{ 'active' if mode == 'table' }}"><i class="fa fa-table"></i></button>
 </div>
-<div class="compare-download compare-input">
-    <button>
-        <i class="fa fa-download"></i>
-    </button>
-</div>

From 18c59e05d09b46fec170c0af4a7e17a1576aadaa Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 2 Oct 2017 17:51:45 -0400
Subject: [PATCH 19/34] Remove spaces from Compare chart name

* The name we were using for the chart svg ids had spaces in it, causing
  certain elements not work, such as the clipPath nvd3 creates

* Remove spaces from the chart name so all charts have a clipPath
---
 src/mmw/js/src/compare/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mmw/js/src/compare/views.js b/src/mmw/js/src/compare/views.js
index 44506f015..c102a14c4 100644
--- a/src/mmw/js/src/compare/views.js
+++ b/src/mmw/js/src/compare/views.js
@@ -353,6 +353,7 @@ var ChartRowView = Marionette.ItemView.extend({
             chartDiv = this.model.get('chartDiv'),
             chartEl = document.getElementById(chartDiv),
             name = this.model.get('name'),
+            chartName = name.replace(/\s/g, ''),
             label = this.model.get('unitLabel') +
                     ' (' + this.model.get('unit') + ')',
             colors = this.model.get('seriesColors'),
@@ -384,7 +385,7 @@ var ChartRowView = Marionette.ItemView.extend({
 
         $(chartEl.parentNode).css({ 'width': ((_.size(this.model.get('values')) * models.constants.COMPARE_COLUMN_WIDTH + models.constants.CHART_AXIS_WIDTH)  + 'px') });
         chart.renderCompareMultibarChart(
-            chartEl, name, label, colors, stacked, yMax, data,
+            chartEl, chartName, label, colors, stacked, yMax, data,
             models.constants.COMPARE_COLUMN_WIDTH, models.constants.CHART_AXIS_WIDTH, onRenderComplete);
     },
 });

From a78bcbf2ee4df20df022b488746d036cbac0df4f Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 2 Oct 2017 14:03:58 -0400
Subject: [PATCH 20/34] Fix compare chart clipPath so it only cuts off tooltips
 where needed

* Expand and adjust the chart clipPath so that it doesn't
  cutoff tooltips that render at the top of a tall bar

* Slide clipPath when sliding window to see more scenarios so
  tooltips don't float outside the chart
---
 src/mmw/js/src/compare/views.js |  7 +++++++
 src/mmw/js/src/core/chart.js    | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/mmw/js/src/compare/views.js b/src/mmw/js/src/compare/views.js
index c102a14c4..4e392037f 100644
--- a/src/mmw/js/src/compare/views.js
+++ b/src/mmw/js/src/compare/views.js
@@ -422,6 +422,13 @@ var ChartView = Marionette.CollectionView.extend({
             'transform': 'translate(' + (-marginLeft) + 'px)',
         });
 
+        // Slide clipPath so tooltips don't show outside charts
+        // It doesn't matter too much what the y-translate is
+        // so long as its sufficiently large
+        this.$('defs > clipPath > rect').attr({
+            'transform': 'translate(' + (-marginLeft) + ', -30)',
+        });
+
         // Show charts from visibleScenarioIndex
         this.$('.nv-group > rect:nth-child(n + ' + (i+1) + ')').css({
             'opacity': '',
diff --git a/src/mmw/js/src/core/chart.js b/src/mmw/js/src/core/chart.js
index 93b8adad4..7361f7ebc 100644
--- a/src/mmw/js/src/core/chart.js
+++ b/src/mmw/js/src/core/chart.js
@@ -383,6 +383,17 @@ function renderCompareMultibarChart(chartEl, name, label, colors, stacked, yMax,
             .datum(data)
             .call(chart);
 
+        // The clipPath that nvd3 creates wraps the bars,
+        // not the bars+tooltip. Scale and move the clipPath
+        // so it doesn't cut the tooltip off
+        d3.select(svg)
+            .selectAll("defs")
+            .selectAll("clipPath")
+            .selectAll("rect")
+            .attr("height", "100%")
+            .attr("width", "100%")
+            .attr("transform", "translate(0, -30)");
+
         // filter definition for drop shadows
         var filter =
             d3.select(svg)

From e38f869626fd7a08858992c6721fa38f86118926 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 2 Oct 2017 16:12:15 -0400
Subject: [PATCH 21/34] Don't show compare tooltips for zero value-ed sections

* We were showing tooltips for stacked chart sections
  that had a value of zero. This was confusing because
  the tooltip looked like it was referring to another
  part of the stack
---
 src/mmw/js/src/core/chart.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mmw/js/src/core/chart.js b/src/mmw/js/src/core/chart.js
index 7361f7ebc..7f3acc25d 100644
--- a/src/mmw/js/src/core/chart.js
+++ b/src/mmw/js/src/core/chart.js
@@ -430,6 +430,12 @@ function renderCompareMultibarChart(chartEl, name, label, colors, stacked, yMax,
                     parentG.attr("id", chartContainerId);
 
                     g.selectAll(".nv-bar").each(function(bar) {
+                        // If the value is zero, and the chart
+                        // is stacked, don't show any tooltip
+                        if (stacked && parseFloat(bar.y) === 0) {
+                            return;
+                        }
+
                         var b = d3.select(this);
                         var barWidth = b.attr("width");
                         var bgWidth = 40.0;

From 57a7cca2bb49fad0e1b6da2d41c009dc13791d60 Mon Sep 17 00:00:00 2001
From: Justin Walgran <jwalgran@azavea.com>
Date: Thu, 28 Sep 2017 11:36:45 -0700
Subject: [PATCH 22/34] Fix gis_data serialization

We recently changed the `ProjectSerializer` to use a `JsonField` serializer for
the `gis_data` field to reflect that fact that this data is now returned from
the geoprocessing service as an actual JSON object rather than a string
containing JSON data. Because this field serializer change was not also made to
the `ProjectUpdateSerializer` we ended up saving the string representation of a
Python dict into the database rather than a JSON string. This caused the model
to crash when attempting to load a previously saved project.

Adding a plain `JsonField()` to the `ProjectUpdateSerializer` caused test
failures that were resolved by adding attributes signifying that it is a
nullable field, which matches the underlying model. I changed both usages of
`JsonField` for consistency.

I tried to make `ProjectUpdateSerializer` inherit from `ProjectSerializer` but
it caused problems with scenario serialization.
---
 .../0023_fix_gis_data_serialization.py        | 26 +++++++++++++++++++
 src/mmw/apps/modeling/serializers.py          |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 src/mmw/apps/modeling/migrations/0023_fix_gis_data_serialization.py

diff --git a/src/mmw/apps/modeling/migrations/0023_fix_gis_data_serialization.py b/src/mmw/apps/modeling/migrations/0023_fix_gis_data_serialization.py
new file mode 100644
index 000000000..d55bf180e
--- /dev/null
+++ b/src/mmw/apps/modeling/migrations/0023_fix_gis_data_serialization.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import ast
+import json
+
+from django.db import migrations
+
+
+def fix_gis_data_serialization(apps, schema_editor):
+    Project = apps.get_model('modeling', 'Project')
+    for project in Project.objects.filter(gis_data__startswith='{u'):
+        project.gis_data = json.dumps(ast.literal_eval(project.gis_data))
+        project.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('modeling', '0022_project_wkaoi'),
+    ]
+
+    operations = [
+         migrations.RunPython(fix_gis_data_serialization,
+                              migrations.RunPython.noop)
+    ]
diff --git a/src/mmw/apps/modeling/serializers.py b/src/mmw/apps/modeling/serializers.py
index 010ba4190..8bcff85bf 100644
--- a/src/mmw/apps/modeling/serializers.py
+++ b/src/mmw/apps/modeling/serializers.py
@@ -40,7 +40,7 @@ class Meta:
         geo_field = 'area_of_interest'
 
     user = UserSerializer(default=serializers.CurrentUserDefault())
-    gis_data = JsonField()
+    gis_data = JsonField(required=False, allow_null=True)
     scenarios = ScenarioSerializer(many=True, read_only=True)
 
 
@@ -61,3 +61,4 @@ class Meta:
 
     user = UserSerializer(default=serializers.CurrentUserDefault(),
                           read_only=True)
+    gis_data = JsonField(required=False, allow_null=True)

From a45dba5aa3cfe5972407cdf71bfab05c9ad68900 Mon Sep 17 00:00:00 2001
From: Casey Cesari <ccesari@azavea.com>
Date: Tue, 3 Oct 2017 12:36:27 -0400
Subject: [PATCH 23/34] Fix rename scenario for Internet Explorer

Using _.curry appeared to call the validate function before it needed to
be called, which resulted in a JS error and prevented the modal from
being displayed. Keeping the correct scope for the validate function is
slightly reworked here so that _.curry does not need to be used, which
lets things work as expected in IE.

Also, update tests for new function signature.

Refs #2315
---
 src/mmw/js/src/modeling/models.js |  8 ++++----
 src/mmw/js/src/modeling/tests.js  | 13 +++++++------
 src/mmw/js/src/modeling/views.js  |  5 ++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/mmw/js/src/modeling/models.js b/src/mmw/js/src/modeling/models.js
index e0381add9..c59d5d195 100644
--- a/src/mmw/js/src/modeling/models.js
+++ b/src/mmw/js/src/modeling/models.js
@@ -977,20 +977,20 @@ var ScenariosCollection = Backbone.Collection.extend({
     },
 
     /** Validate the new scenario name
-    @param model - the model your trying to rename
+    The value of *this* is the scenario model.
     @param newName the new name string
     @returns If valid, null
              If invalid, a string with the error
     **/
-    validateNewScenarioName: function(model, newName) {
+    validateNewScenarioName: function(newName) {
         var trimmedNewName = newName.trim();
 
         // Bail early if the name actually didn't change.
-        if (model.get('name') === trimmedNewName) {
+        if (this.get('name') === trimmedNewName) {
             return null;
         }
 
-        var match = this.find(function(model) {
+        var match = this.collection.find(function(model) {
             return model.get('name').toLowerCase() === trimmedNewName.toLowerCase();
         });
 
diff --git a/src/mmw/js/src/modeling/tests.js b/src/mmw/js/src/modeling/tests.js
index 82d9000f9..2e0718dc6 100644
--- a/src/mmw/js/src/modeling/tests.js
+++ b/src/mmw/js/src/modeling/tests.js
@@ -921,24 +921,25 @@ describe('Modeling', function() {
             describe('#validateNewScenarioName', function() {
                 it ('returns null if valid rename', function() {
                     var collection = getTestScenarioCollection(),
-                        validationMessage = collection.validateNewScenarioName(collection.at(1),
-                                                'My New Unique Scenario Name');
+                        boundFunc = _.bind(collection.validateNewScenarioName, collection.at(1)),
+                        validationMessage = boundFunc('My New Unique Scenario Name');
 
                     assert.equal(validationMessage, null);
                 });
 
                 it('ignores case when comparing the new name with existing names', function() {
                     var collection = getTestScenarioCollection(),
-                        validationMessage = collection.validateNewScenarioName(collection.at(1),
-                                                'cUrreNt condiTIONS');
+                        boundFunc = _.bind(collection.validateNewScenarioName, collection.at(1)),
+                        validationMessage = boundFunc('cUrreNt condiTIONS');
 
                     assert.notEqual(validationMessage, null);
                 });
 
                 it('will not show error when leaving name as is', function() {
                     var collection = getTestScenarioCollection(),
-                        validationMessage = collection.validateNewScenarioName(collection.at(1),
-                                                'New Scenario 1');
+                        boundFunc = _.bind(collection.validateNewScenarioName, collection.at(1)),
+                        validationMessage = boundFunc('New Scenario 1');
+
                     assert.equal(validationMessage, null);
                 });
             });
diff --git a/src/mmw/js/src/modeling/views.js b/src/mmw/js/src/modeling/views.js
index d9bdaae53..4bb76ad34 100644
--- a/src/mmw/js/src/modeling/views.js
+++ b/src/mmw/js/src/modeling/views.js
@@ -457,14 +457,13 @@ var ScenarioDropDownMenuOptionsView = Marionette.ItemView.extend({
     renameScenario: function() {
         var self = this,
             collection = self.model.collection,
-            validate = _.bind(collection.validateNewScenarioName, collection),
-            curriedValidationFunction = _.curry(validate)(this.model),
+            validate = _.bind(collection.validateNewScenarioName, self.model),
             rename = new modalViews.InputView({
                 model: new modalModels.InputModel({
                     initial: this.model.get('name'),
                     title: 'Rename Scenario',
                     fieldLabel: 'Scenario Name',
-                    validationFunction: curriedValidationFunction,
+                    validationFunction: validate,
                 })
         });
 

From 1dff59f9e72891e448d085f6d5fb01047787372d Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Tue, 3 Oct 2017 19:04:28 -0400
Subject: [PATCH 24/34] Round Compare Chart Tooltip to 3 Decimal Places

* Values are sometimes small enough that rounded to only 2 decimal,
  places they appear as 0.00. Round values to 3 dec places to match
  the chart.
---
 src/mmw/js/src/core/chart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mmw/js/src/core/chart.js b/src/mmw/js/src/core/chart.js
index 7f3acc25d..78571c420 100644
--- a/src/mmw/js/src/core/chart.js
+++ b/src/mmw/js/src/core/chart.js
@@ -512,7 +512,7 @@ function renderCompareMultibarChart(chartEl, name, label, colors, stacked, yMax,
                         parentG.append("text")
                             .each(function() {
                                 d3.select(this).text(function() {
-                                    return parseFloat(bar.y).toFixed(2);
+                                    return parseFloat(bar.y).toFixed(3);
                                 });
 
                                 var width = this.getBBox().width;

From be441ef5b5a38e56518798a171bf1bad1964c20e Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Thu, 5 Oct 2017 08:24:52 -0400
Subject: [PATCH 25/34] Fix Compare View in IE11

* Previously the compare view was stuck on the upper left
  corner of the page and unscrollable

* We were only partially using the bootstrap modal classes,
  missing .modal-dialog and .modal-content. Flex box was
  taking care of the rest on Chrome and FF, but not even
  autoprefixers could get IE11 to render it correctly

* Wrap the compare view in the expected bootstrap-style elements,
  so that IE11 shows the compare view in the same as the other
  browsers
    - This required adjusting some of the styling for the modal
      to override the new bootstrap styling getting applied

Ref #2098
---
 .../src/compare/templates/compareWindow2.html | 44 ++++++++++---------
 src/mmw/sass/pages/_compare.scss              | 38 ++++++++++------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/mmw/js/src/compare/templates/compareWindow2.html b/src/mmw/js/src/compare/templates/compareWindow2.html
index beed90045..f162ba57d 100644
--- a/src/mmw/js/src/compare/templates/compareWindow2.html
+++ b/src/mmw/js/src/compare/templates/compareWindow2.html
@@ -1,22 +1,24 @@
-<div class="compare-scenario-gradient"></div>
-<div class="compare-header">
-    <div class="compare-title">
-        <h1>Compare</h1>
-    </div>
-    <div class="spinner hidden"></div>
-    <div class="compare-close">
-        <button>
-            <i class="fa fa-times"></i>
-        </button>
-    </div>
-    <div class="compare-actions">
-        <div class="compare-tabs">
+<div id="compare-new-dialog" class="modal-dialog">
+    <div class="modal-content compare-modal-content">
+        <div class="compare-header">
+            <div class="compare-title">
+                <h1>Compare</h1>
+            </div>
+            <div class="spinner hidden"></div>
+            <div class="compare-close">
+                <button>
+                    <i class="fa fa-times"></i>
+                </button>
+            </div>
+            <div class="compare-actions">
+                <div class="compare-tabs">
+                </div>
+                <div class="compare-inputs">
+                </div>
+            </div>
         </div>
-        <div class="compare-inputs">
-        </div>
-    </div>
-</div>
-<div class="compare-scenarios">
+        <div class="compare-scenario-gradient"></div>
+        <div class="compare-scenarios">
     <div class="compare-scenario-row-description">
         <h2>Scenarios</h2>
     </div>
@@ -30,6 +32,8 @@ <h2>Scenarios</h2>
             <i class="fa fa-arrow-right"></i>
         </button>
     </div>
-</div>
-<div class="compare-sections polling">
+        </div>
+        <div class="compare-sections polling">
+        </div>
+    </div>
 </div>
diff --git a/src/mmw/sass/pages/_compare.scss b/src/mmw/sass/pages/_compare.scss
index 68d8f3619..dec0b2a34 100644
--- a/src/mmw/sass/pages/_compare.scss
+++ b/src/mmw/sass/pages/_compare.scss
@@ -287,20 +287,21 @@ $compare-chart-table-height: calc(100vh - #{$height-lg} - #{$compare-footer-heig
 }
 
 #compare-new {
-  background-color: #fff;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 8000;
-  display: flex;
-  flex-direction: column;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 20px;
-  max-width: 1200px;
-  max-height: calc(100% - 20px);
-  -webkit-font-smoothing: antialiased;
+    overflow-y: hidden;
+    padding-left: 0 !important;
+}
+
+#compare-new-dialog {
+    z-index: 8000;
+    display: flex;
+    flex-direction: column;
+    margin-left: auto;
+    margin-right: auto;
+    width: auto;
+    height: auto;
+    margin-top: 20px;
+    max-width: 1200px;
+    height: calc(100% - 20px);
 
   @media screen and (max-width: 1300px) {
     max-width: 1000px;
@@ -311,6 +312,14 @@ $compare-chart-table-height: calc(100vh - #{$height-lg} - #{$compare-footer-heig
     max-height: 100%;
   }
 
+  .compare-modal-content {
+      padding: 0;
+      display: flex;
+      flex-direction: column;
+      height: calc(100% - 20px);
+      -webkit-font-smoothing: antialiased;
+  }
+
   .compare-actions {
     padding-top: 20px;
     @include clearfix;
@@ -493,6 +502,7 @@ $compare-chart-table-height: calc(100vh - #{$height-lg} - #{$compare-footer-heig
   }
 
   .compare-header {
+    position: relative;
     padding: $compare-padding $compare-padding 11px;
     background-color: #eee;
     border-bottom: 1px solid #ccc;

From fc4d098b9a149728f1dc8ff10796a18dd94b1c66 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Thu, 5 Oct 2017 11:27:38 -0400
Subject: [PATCH 26/34] Fix Compare Leaflet Maps When In Bootstrap Modal

* When rendered in a bootstrap modal dialog, the
  leaflet maps were trying to set themselves up
  before they had rendered fully, resulting
  in zoomed out maps

* Show the view with the leaflet maps only after
  the bootstrap "shown.bs.modal" has fired. This
  way the setup happens after all modal rendering
  has completed
---
 src/mmw/js/src/compare/views.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/mmw/js/src/compare/views.js b/src/mmw/js/src/compare/views.js
index 4e392037f..ea4cd9dcc 100644
--- a/src/mmw/js/src/compare/views.js
+++ b/src/mmw/js/src/compare/views.js
@@ -59,6 +59,21 @@ var CompareWindow2 = modalViews.ModalBaseView.extend({
         sectionsRegion: '.compare-sections',
     },
 
+    initialize: function() {
+        var self = this;
+
+        // Show the scenario row only after the bootstrap
+        // modal has fired its shown event. The map
+        // set up in the scenarios row needs to happen
+        // after it has fully rendered
+        this.$el.on('shown.bs.modal', function() {
+            self.scenariosRegion.show(new ScenariosRowView({
+                model: self.model,
+                collection: self.model.get('scenarios'),
+            }));
+        });
+    },
+
     highlightButtons: function() {
         var i = this.model.get('visibleScenarioIndex'),
             total = this.model.get('scenarios').length,
@@ -96,10 +111,6 @@ var CompareWindow2 = modalViews.ModalBaseView.extend({
         this.inputsRegion.show(new InputsView({
             model: this.model,
         }));
-        this.scenariosRegion.show(new ScenariosRowView({
-            model: this.model,
-            collection: this.model.get('scenarios'),
-        }));
 
         showSectionsView();
         this.highlightButtons();

From be4091766e4beac5946043351111fba745fa886a Mon Sep 17 00:00:00 2001
From: Kelly Innes <kinnes@azavea.com>
Date: Thu, 5 Oct 2017 10:53:09 -0400
Subject: [PATCH 27/34] Adjust compare view during ITSI screenshots

- add CSS rules for compare view to supplement flexbox -- which isn't
  supported by PhatomJS -- with rules to keep rows horizontal & aligned
---
 src/mmw/js/src/app.js            | 59 ++++++++++++++++++++++++++++++++
 src/mmw/sass/pages/_compare.scss | 21 ++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js
index d3c20da76..23d1759c0 100644
--- a/src/mmw/js/src/app.js
+++ b/src/mmw/js/src/app.js
@@ -155,6 +155,57 @@ function RestAPI() {
     };
 }
 
+function adjustCompareViewBeforeITSIScreenshot() {
+    toggleCompareViewForITSIScreenshot(true);
+}
+
+function adjustCompareViewAfterITSIScreenshot() {
+    toggleCompareViewForITSIScreenshot(false);
+}
+
+function toggleCompareViewForITSIScreenshot(adjustForScreenshot) {
+    var itsiCompareDialog = 'itsi-compare-dialog',
+        itsiCompareModal = 'itsi-compare-modal',
+        itsiCompareRow = 'itsi-compare-row',
+        compareDialog = '#compare-new-dialog',
+        compareModalContent = '.compare-modal-content',
+        compareCloseButton = '.compare-close',
+        compareChartButton = '#compare-input-button-chart',
+        compareTableButton = '#compare-input-button-table',
+        compareChartRow = '.compare-chart-row',
+        compareTableRow = '.compare-table-row',
+        compareScenariosRow = '.compare-scenarios',
+        compareMapsRow = '.compare-scenario-row-content';
+
+    if (adjustForScreenshot) {
+        $(compareDialog).addClass(itsiCompareDialog);
+        $(compareModalContent).addClass(itsiCompareModal);
+        $(compareCloseButton).hide();
+        $(compareChartButton).hide();
+        $(compareTableButton).hide();
+        $(compareScenariosRow).addClass(itsiCompareRow);
+        $(compareMapsRow).addClass(itsiCompareRow);
+        if ($(compareChartRow).length) {
+            $(compareChartRow).addClass(itsiCompareRow);
+        } else if ($(compareTableRow).length) {
+            $(compareTableRow).addClass(itsiCompareRow);
+        }
+    } else {
+        $(compareDialog).removeClass(itsiCompareDialog);
+        $(compareModalContent).removeClass(itsiCompareModal);
+        $(compareCloseButton).show();
+        $(compareChartButton).show();
+        $(compareTableButton).show();
+        $(compareScenariosRow).removeClass(itsiCompareRow);
+        $(compareMapsRow).removeClass(itsiCompareRow);
+        if ($(compareChartRow)) {
+            $(compareChartRow).removeClass(itsiCompareRow);
+        } else if ($(compareTableRow).length) {
+            $(compareTableRow).removeClass(itsiCompareRow);
+        }
+    }
+}
+
 function initializeShutterbug() {
     var googleTileLayerSelector = '#map > .leaflet-google-layer > div > div > div:nth-child(1) > div:nth-child(1)';
 
@@ -187,6 +238,10 @@ function initializeShutterbug() {
             // '/' then to empty string, which leaves a '#' in the URL.
             document.location.hash = '/';
             document.location.hash = '';
+
+            if ($('#compare-new').length) {
+                adjustCompareViewBeforeITSIScreenshot();
+            }
         })
         .on('shutterbug-asyouwere', function() {
             // Reset after screenshot has been taken
@@ -209,6 +264,10 @@ function initializeShutterbug() {
                     top: '',
                 });
             }
+
+            if ($('#compare-new').length) {
+                adjustCompareViewAfterITSIScreenshot();
+            }
         });
 
     shutterbug.enable('body');
diff --git a/src/mmw/sass/pages/_compare.scss b/src/mmw/sass/pages/_compare.scss
index dec0b2a34..c1a8c484c 100644
--- a/src/mmw/sass/pages/_compare.scss
+++ b/src/mmw/sass/pages/_compare.scss
@@ -656,3 +656,24 @@ $compare-chart-table-height: calc(100vh - #{$height-lg} - #{$compare-footer-heig
     }
   }
 }
+
+.itsi-compare-modal {
+  max-width: 100% !important;
+  max-height: 100% !important;
+}
+
+.itsi-compare-row {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-flex-wrap: wrap;
+  flex-wrap: wrap;
+}
+
+.itsi-compare-dialog {
+  margin-left: 3% !important;
+  max-width: 70% !important;
+  max-height: 100% !important;
+  width: 70% !important;
+  height: 100% !important;
+}

From 6753ec8098fa2194cadadb9b233cc7fd98e5f9ac Mon Sep 17 00:00:00 2001
From: Hector Castro <hcastro@azavea.com>
Date: Thu, 5 Oct 2017 14:54:42 -0400
Subject: [PATCH 28/34] Adjust PostgreSQL versions to fix package installs

The PostgreSQL 10 release has caused a number of changes to the
official APT repositories we depend on. Many of the core packages
begin with 10.x. Also, Psycopg2 2.6.x had a bug where it was
expecting PostgreSQL version numbers in the 9.x range.
---
 deployment/ansible/group_vars/all | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
index b53f6a419..0377d8037 100644
--- a/deployment/ansible/group_vars/all
+++ b/deployment/ansible/group_vars/all
@@ -21,8 +21,8 @@ postgresql_database: mmw
 postgresql_version: "9.4"
 postgresql_package_version: "9.4.*.pgdg14.04+1"
 postgresql_support_repository_channel: "main"
-postgresql_support_libpq_version: "9.6.*.pgdg14.04+1"
-postgresql_support_psycopg2_version: "2.6"
+postgresql_support_libpq_version: "10.0-*.pgdg14.04+1"
+postgresql_support_psycopg2_version: "2.7"
 postgis_version: "2.1"
 postgis_package_version: "2.1.*.pgdg14.04+1"
 

From ac05f83ac368f2503e2982ed40f26ebb4269916a Mon Sep 17 00:00:00 2001
From: Kelly Innes <kinnes@azavea.com>
Date: Mon, 9 Oct 2017 11:47:03 -0400
Subject: [PATCH 29/34] Fix analyze/model tab toggle in IE11

- toggle `.active` on analyze & modeling tabs to ensure they work in
  IE11
---
 src/mmw/js/src/modeling/views.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mmw/js/src/modeling/views.js b/src/mmw/js/src/modeling/views.js
index 4bb76ad34..a89aee632 100644
--- a/src/mmw/js/src/modeling/views.js
+++ b/src/mmw/js/src/modeling/views.js
@@ -990,6 +990,9 @@ var ResultsView = Marionette.LayoutView.extend({
         } else {
             this.aoiRegion.empty();
         }
+
+        this.analyzeRegion.$el.toggleClass('active');
+        this.modelingRegion.$el.toggleClass('active');
     },
 
     transitionInCss: {

From 0e05f50cd1c6e114c6c2d9e7dbf7542ce450bf6c Mon Sep 17 00:00:00 2001
From: Kelly Innes <kinnes@azavea.com>
Date: Fri, 6 Oct 2017 12:04:58 -0400
Subject: [PATCH 30/34] Adjust modeling view during ITSI screenshots

- add CSS rules to supplement flexbox during ITSI screnshots, since
  PhantomJS doesn't support it
---
 src/mmw/js/src/app.js          | 33 +++++++++++++++++++++++++++++++++
 src/mmw/sass/pages/_model.scss |  8 ++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js
index 23d1759c0..c07c896e4 100644
--- a/src/mmw/js/src/app.js
+++ b/src/mmw/js/src/app.js
@@ -155,6 +155,31 @@ function RestAPI() {
     };
 }
 
+function adjustModelViewBeforeITSIScreenshot() {
+    toggleModelViewForITSIScreenshot(true);
+}
+
+function adjustModelViewAfterITSIScreenshot() {
+    toggleModelViewForITSIScreenshot(false);
+}
+
+function toggleModelViewForITSIScreenshot(adjustForScreenshot) {
+    var modelHeaderProject = '.project',
+        modelHeaderToolbar = '.toolbar',
+        modelToolbarContainer = '.toolbar-container',
+        itsiModelToolbar = 'itsi-model-toolbar';
+
+    if (adjustForScreenshot) {
+        $(modelHeaderProject).addClass(itsiModelToolbar);
+        $(modelHeaderToolbar).addClass(itsiModelToolbar);
+        $(modelToolbarContainer).addClass(itsiModelToolbar);
+    } else {
+        $(modelHeaderProject).removeClass(itsiModelToolbar);
+        $(modelHeaderToolbar).removeClass(itsiModelToolbar);
+        $(modelToolbarContainer).removeClass(itsiModelToolbar);
+    }
+}
+
 function adjustCompareViewBeforeITSIScreenshot() {
     toggleCompareViewForITSIScreenshot(true);
 }
@@ -242,6 +267,10 @@ function initializeShutterbug() {
             if ($('#compare-new').length) {
                 adjustCompareViewBeforeITSIScreenshot();
             }
+
+            if ($('.project')) {
+                adjustModelViewBeforeITSIScreenshot();
+            }
         })
         .on('shutterbug-asyouwere', function() {
             // Reset after screenshot has been taken
@@ -268,6 +297,10 @@ function initializeShutterbug() {
             if ($('#compare-new').length) {
                 adjustCompareViewAfterITSIScreenshot();
             }
+
+            if ($('.project')) {
+                adjustModelViewAfterITSIScreenshot();
+            }
         });
 
     shutterbug.enable('body');
diff --git a/src/mmw/sass/pages/_model.scss b/src/mmw/sass/pages/_model.scss
index ffa0cb9e7..a8b3265c5 100644
--- a/src/mmw/sass/pages/_model.scss
+++ b/src/mmw/sass/pages/_model.scss
@@ -108,3 +108,11 @@
         margin-left: 0;
     }
 }
+
+.itsi-model-toolbar {
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: flex !important;
+  -webkit-flex-wrap: nowrap !important;
+  flex-wrap: nowrap !important;
+}

From d98cd60860b0c2d16e64ed81c4b01ae055cacf33 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 9 Oct 2017 14:35:24 -0400
Subject: [PATCH 31/34] Update mock scenario

* The previous mock scenario was missing elements of
  its results collection needed for testing the compare
  view (eg pc_unmodified). It was also using the old
  stringified version of the taskModel results, though
  this wasn't interfering with anything at the moment

* Replace the mock scenario with a newer one taken from
  stringified model created in the app
---
 src/mmw/js/src/modeling/mocks.js | 2305 +++++++++++++++++++++++++++---
 1 file changed, 2079 insertions(+), 226 deletions(-)

diff --git a/src/mmw/js/src/modeling/mocks.js b/src/mmw/js/src/modeling/mocks.js
index 80a341545..6cb1a34d9 100644
--- a/src/mmw/js/src/modeling/mocks.js
+++ b/src/mmw/js/src/modeling/mocks.js
@@ -8,265 +8,2118 @@ var polling = {
 
 var scenarios = {
     sample: {
-        "active": true,
-        "census": {
-            "cell_count": 100,
-            "distribution": {
-                "a:deciduous_forest": {
-                    "cell_count": 30
-                },
-                "c:developed_high": {
-                    "cell_count": 70
-                }
-            },
-            "modification_hash": "87c42548da30fe1615eb6e6f5a3b0371",
-            "modifications": [
-                {
-                    "cell_count": 8,
-                    "distribution": {
-                        "c:developed_high": {
-                            "cell_count": 8
-                        }
-                    },
-                    "reclassification": "a:shrub"
-                }
-            ]
-        },
-        "created_at": "2015-07-14T21:45:07.446363Z",
-        "id": 120,
+        "id": 839,
         "inputs": [
             {
-                "area": "0",
                 "name": "precipitation",
+                "area": "0",
+                "effectiveUnits": null,
+                "value": 0.984252,
                 "shape": null,
-                "type": "",
+                "effectiveShape": null,
                 "units": "m<sup>2</sup>",
-                "value": 4.6
+                "effectiveArea": null,
+                "type": "",
+                "isValidForAnalysis": false
             }
         ],
-        "inputmod_hash": "d000ef136a6c566032ed84c487508ab287c42548da30fe1615eb6e6f5a3b0371",
-        "is_current_conditions": false,
-        "job_id": null,
-        "modification_hash": "87c42548da30fe1615eb6e6f5a3b0371",
-        "modifications": [
-            {
-                "area": 648.1614728140878,
-                "name": "landcover",
-                "shape": {
-                    "geometry": {
-                        "coordinates": [
-                            [
-                                [
-                                    -75.1647502183914,
-                                    39.95236473500341
-                                ],
-                                [
-                                    -75.16454637050629,
-                                    39.95232772476147
-                                ],
-                                [
-                                    -75.16461610794067,
-                                    39.952011080761736
-                                ],
-                                [
-                                    -75.1648199558258,
-                                    39.952031642104906
-                                ],
-                                [
-                                    -75.1647502183914,
-                                    39.95236473500341
-                                ]
-                            ]
-                        ],
-                        "type": "Polygon"
-                    },
-                    "properties": {},
-                    "type": "Feature"
+
+        "aoi_census": {
+            "cell_count": 1110,
+            "BMPs": null,
+            "distribution": {
+                "c:deciduous_forest": {
+                    "cell_count": 570
                 },
-                "type": "",
-                "units": "m<sup>2</sup>",
-                "value": "grassland"
-            },
-            {
-                "area": 279.12201442036167,
-                "name": "landcover",
-                "shape": {
-                    "geometry": {
-                        "coordinates": [
-                            [
-                                [
-                                    -75.16457855701447,
-                                    39.953195404053794
-                                ],
-                                [
-                                    -75.1643317937851,
-                                    39.953166618661406
-                                ],
-                                [
-                                    -75.16432106494904,
-                                    39.95328176015835
-                                ],
-                                [
-                                    -75.16454637050629,
-                                    39.953322882074595
-                                ],
-                                [
-                                    -75.16457855701447,
-                                    39.953195404053794
-                                ]
-                            ]
-                        ],
-                        "type": "Polygon"
-                    },
-                    "properties": {},
-                    "type": "Feature"
+                "c:developed_open": {
+                    "cell_count": 12
                 },
-                "type": "",
-                "units": "m<sup>2</sup>",
-                "value": "developed_high"
+                "b:deciduous_forest": {
+                    "cell_count": 50
+                },
+                "b:developed_open": {
+                    "cell_count": 3
+                },
+                "b:developed_low": {
+                    "cell_count": 2
+                },
+                "c:evergreen_forest": {
+                    "cell_count": 190
+                },
+                "c:grassland": {
+                    "cell_count": 18
+                },
+                "b:grassland": {
+                    "cell_count": 13
+                },
+                "c:developed_low": {
+                    "cell_count": 1
+                },
+                "c:mixed_forest": {
+                    "cell_count": 7
+                },
+                "b:pasture": {
+                    "cell_count": 102
+                },
+                "c:pasture": {
+                    "cell_count": 136
+                },
+                "b:evergreen_forest": {
+                    "cell_count": 6
+                }
             }
-        ],
-        "modified_at": "2015-07-14T21:45:38.497360Z",
-        "name": "New Scenario",
-        "project": 63,
+        },
+        "modification_censuses": null,
         "results": [
             {
                 "displayName": "Runoff",
                 "name": "runoff",
-                "polling": false,
-                "inputmod_hash": "d000ef136a6c566032ed84c487508ab287c42548da30fe1615eb6e6f5a3b0371",
+                "inputmod_hash": "18ab2ee3dca78bfa88ce0e5e9cac73ecd751713988987e9331980363e24189ce",
+                "activeVar": null,
                 "result": {
-                    "modified": {
-                        "bod": 168.53055291800564,
-                        "cell_count": 100,
+                    "modification_hash": "d751713988987e9331980363e24189ce",
+                    "aoi_census": {
+                        "cell_count": 1110,
+                        "BMPs": null,
                         "distribution": {
-                            "a:deciduous_forest": {
-                                "bod": 0,
-                                "cell_count": 30,
-                                "et": 0.14489999999999997,
-                                "inf": 4.4551,
-                                "runoff": 0,
-                                "tn": 0,
-                                "tp": 0,
-                                "tss": 0
-                            },
-                            "c:developed_high": {
-                                "bod": 168.53055291800564,
-                                "cell_count": 70,
-                                "distribution": {
-                                    "a:shrub": {
-                                        "bod": 0.01101971503083698,
-                                        "cell_count": 8,
-                                        "et": 0.207,
-                                        "inf": 4.352681141178938,
-                                        "runoff": 0.04031885882106137,
-                                        "tn": 3.4323702555066e-05,
-                                        "tp": 1.0839063964757685e-06,
-                                        "tss": 0.007045391577092494
-                                    },
-                                    "c:developed_high": {
-                                        "bod": 168.5195332029748,
-                                        "cell_count": 62,
-                                        "et": 0.012419999999999999,
-                                        "inf": 0.6738166467659927,
-                                        "runoff": 3.913763353234007,
-                                        "tn": 1.2367159291508636,
-                                        "tp": 0.19570010307442237,
-                                        "tss": 34.36983060244543
-                                    }
-                                },
-                                "et": 0.034657714285714285,
-                                "inf": 1.0942583032703295,
-                                "runoff": 3.4710839824439557,
-                                "tn": 1.2367502528534187,
-                                "tp": 0.19570118698081884,
-                                "tss": 34.37687599402253
+                            "c:deciduous_forest": {
+                                "cell_count": 570
+                            },
+                            "c:developed_open": {
+                                "cell_count": 12
+                            },
+                            "b:deciduous_forest": {
+                                "cell_count": 50
+                            },
+                            "b:developed_open": {
+                                "cell_count": 3
+                            },
+                            "b:developed_low": {
+                                "cell_count": 2
+                            },
+                            "c:evergreen_forest": {
+                                "cell_count": 190
+                            },
+                            "c:grassland": {
+                                "cell_count": 18
+                            },
+                            "b:grassland": {
+                                "cell_count": 13
+                            },
+                            "c:developed_low": {
+                                "cell_count": 1
+                            },
+                            "c:mixed_forest": {
+                                "cell_count": 7
+                            },
+                            "b:pasture": {
+                                "cell_count": 102
+                            },
+                            "c:pasture": {
+                                "cell_count": 136
+                            },
+                            "b:evergreen_forest": {
+                                "cell_count": 6
                             }
+                        }
+                    },
+                    "modification_censuses": [],
+                    "inputmod_hash": "18ab2ee3dca78bfa88ce0e5e9cac73ecd751713988987e9331980363e24189ce",
+                    "runoff": {
+                        "pc_modified": {
+                            "BMPs": null,
+                            "inf": 1.9650996795809825,
+                            "cell_count": 1110,
+                            "tp": 0.023234766028064686,
+                            "tn": 0.190783886995466,
+                            "runoff": 0.007945684743342011,
+                            "et": 0.5269547156756756,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:deciduous_forest": {
+                                            "cell_count": 570,
+                                            "tp": 0.013642150147106619,
+                                            "tn": 0.11018659734201498,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.05246980825810238,
+                                            "tss": 4.722282743229214
+                                        }
+                                    },
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 12,
+                                    "tp": 0.0002872031609917182,
+                                    "tn": 0.002319717838779263,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:developed_open": {
+                                            "cell_count": 12,
+                                            "tp": 0.0002872031609917182,
+                                            "tn": 0.002319717838779263,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.0011046275422758394,
+                                            "tss": 0.09941647880482556
+                                        }
+                                    },
+                                    "bod": 0.0011046275422758394,
+                                    "tss": 0.09941647880482556
+                                },
+                                "b:deciduous_forest": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:deciduous_forest": {
+                                            "cell_count": 50,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_low": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 2,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:developed_low": {
+                                            "cell_count": 2,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:evergreen_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:evergreen_forest": {
+                                            "cell_count": 190,
+                                            "tp": 0.004547383382368874,
+                                            "tn": 0.03672886578067167,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.01748993608603413,
+                                            "tss": 1.5740942477430715
+                                        }
+                                    },
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "c:grassland": {
+                                    "inf": 1.9154271574434862,
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "c:grassland": {
+                                            "cell_count": 18,
+                                            "tp": 0.001311591405696853,
+                                            "tn": 0.013712091968648917,
+                                            "runoff": 0.006586819904139329,
+                                            "et": 0.22356000000000004,
+                                            "inf": 0.7541051800958607,
+                                            "bod": 0.0029808895584019384,
+                                            "tss": 0.2909348209000292
+                                        }
+                                    },
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:grassland": {
+                                    "inf": 1.9321576800000002,
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "b:grassland": {
+                                            "cell_count": 13,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.22356,
+                                            "inf": 0.760692,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_open": {
+                                    "inf": 1.9742200800000005,
+                                    "cell_count": 3,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:developed_open": {
+                                            "cell_count": 3,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.7772520000000002,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:mixed_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:mixed_forest": {
+                                            "cell_count": 7,
+                                            "tp": 0.00016753517724516902,
+                                            "tn": 0.0013531687392879035,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.0006443660663275732,
+                                            "tss": 0.05799294596948158
+                                        }
+                                    },
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5257799999999999,
+                                    "distribution": {
+                                        "b:pasture": {
+                                            "cell_count": 102,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.20699999999999996,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 1,
+                                    "tp": 2.3933596749309858e-05,
+                                    "tn": 0.0001933098198982719,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:developed_low": {
+                                            "cell_count": 1,
+                                            "tp": 2.3933596749309858e-05,
+                                            "tn": 0.0001933098198982719,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 9.20522951896533e-05,
+                                            "tss": 0.008284706567068797
+                                        }
+                                    },
+                                    "bod": 9.20522951896533e-05,
+                                    "tss": 0.008284706567068797
+                                },
+                                "c:pasture": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 136,
+                                    "tp": 0.003254969157906141,
+                                    "tn": 0.026290135506164988,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:pasture": {
+                                            "cell_count": 136,
+                                            "tp": 0.003254969157906141,
+                                            "tn": 0.026290135506164988,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.01251911214579285,
+                                            "tss": 1.1267200931213563
+                                        }
+                                    },
+                                    "bod": 0.01251911214579285,
+                                    "tss": 1.1267200931213563
+                                },
+                                "b:evergreen_forest": {
+                                    "inf": 1.9742200800000005,
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:evergreen_forest": {
+                                            "cell_count": 6,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.7772520000000002,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 0.08730079195212437,
+                            "tss": 7.879726036335047
+                        },
+                        "unmodified": {
+                            "BMPs": null,
+                            "inf": 1.9586814534290045,
+                            "cell_count": 1110,
+                            "tp": 0.15658117288902584,
+                            "tn": 1.3858648079470084,
+                            "runoff": 0.02118010386829332,
+                            "et": 0.5201385227027028,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "cell_count": 12,
+                                    "tp": 0.03622349082905331,
+                                    "tn": 0.2558284039801889,
+                                    "runoff": 0.47650252433898943,
+                                    "et": 0.49949099999999996,
+                                    "inf": 1.5240065556610105,
+                                    "bod": 0.645230930392512,
+                                    "tss": 11.297201202311
+                                },
+                                "c:grassland": {
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9154271574434862,
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:developed_open": {
+                                    "cell_count": 3,
+                                    "tp": 0.008073104824569256,
+                                    "tn": 0.057016302823520375,
+                                    "runoff": 0.4247911772296808,
+                                    "et": 0.49949099999999996,
+                                    "inf": 1.5757179027703194,
+                                    "bod": 0.1438021796876399,
+                                    "tss": 2.517799567162537
+                                },
+                                "b:developed_low": {
+                                    "cell_count": 2,
+                                    "tp": 0.009132964949421495,
+                                    "tn": 0.06200802518291435,
+                                    "runoff": 0.6070218557883352,
+                                    "et": 0.22082759999999999,
+                                    "inf": 1.6721506242116648,
+                                    "bod": 0.1442047097277078,
+                                    "tss": 3.028298904281864
+                                },
+                                "c:evergreen_forest": {
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "b:deciduous_forest": {
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:grassland": {
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9321576800000002,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "cell_count": 1,
+                                    "tp": 0.004919761629035195,
+                                    "tn": 0.03340259211292317,
+                                    "runoff": 0.6539832027456437,
+                                    "et": 0.22082759999999999,
+                                    "inf": 1.6251892772543566,
+                                    "bod": 0.07768044677423994,
+                                    "tss": 1.6312893822590386
+                                },
+                                "c:mixed_forest": {
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.49949099999999996,
+                                    "inf": 2.00050908,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:pasture": {
+                                    "cell_count": 136,
+                                    "tp": 0.07856319054452905,
+                                    "tn": 0.815628760016838,
+                                    "runoff": 0.05305467322445484,
+                                    "et": 0.49949099999999996,
+                                    "inf": 1.9474544067755453,
+                                    "bod": 1.8569481401434142,
+                                    "tss": 20.71211387083039
+                                },
+                                "b:evergreen_forest": {
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000005,
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 2.94145140669438,
+                            "tss": 45.83200768468663
                         },
-                        "et": 0.0677304,
-                        "inf": 2.1025108122892306,
-                        "modification_hash": "87c42548da30fe1615eb6e6f5a3b0371",
-                        "runoff": 2.429758787710769,
-                        "tn": 1.2367502528534187,
-                        "tp": 0.19570118698081884,
-                        "tss": 34.37687599402253
+                        "modified": {
+                            "BMPs": null,
+                            "inf": 1.958681453429004,
+                            "cell_count": 1110,
+                            "tp": 0.15658117288902582,
+                            "tn": 1.3858648079470084,
+                            "runoff": 0.02118010386829332,
+                            "et": 0.5201385227027026,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:deciduous_forest": {
+                                            "cell_count": 570,
+                                            "tp": 0.013642150147106619,
+                                            "tn": 0.11018659734201498,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.05246980825810238,
+                                            "tss": 4.722282743229214
+                                        }
+                                    },
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "inf": 1.5240065556610105,
+                                    "cell_count": 12,
+                                    "tp": 0.03622349082905331,
+                                    "tn": 0.2558284039801889,
+                                    "runoff": 0.47650252433898943,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "c:developed_open": {
+                                            "cell_count": 12,
+                                            "tp": 0.03622349082905331,
+                                            "tn": 0.2558284039801889,
+                                            "runoff": 0.1875994190310982,
+                                            "et": 0.19665,
+                                            "inf": 0.6000025809689018,
+                                            "bod": 0.645230930392512,
+                                            "tss": 11.297201202311
+                                        }
+                                    },
+                                    "bod": 0.645230930392512,
+                                    "tss": 11.297201202311
+                                },
+                                "b:deciduous_forest": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:deciduous_forest": {
+                                            "cell_count": 50,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_low": {
+                                    "inf": 1.6721506242116648,
+                                    "cell_count": 2,
+                                    "tp": 0.009132964949421495,
+                                    "tn": 0.06200802518291435,
+                                    "runoff": 0.6070218557883352,
+                                    "et": 0.22082759999999999,
+                                    "distribution": {
+                                        "b:developed_low": {
+                                            "cell_count": 2,
+                                            "tp": 0.009132964949421495,
+                                            "tn": 0.06200802518291435,
+                                            "runoff": 0.23898498259383275,
+                                            "et": 0.08693999999999999,
+                                            "inf": 0.6583270174061673,
+                                            "bod": 0.1442047097277078,
+                                            "tss": 3.028298904281864
+                                        }
+                                    },
+                                    "bod": 0.1442047097277078,
+                                    "tss": 3.028298904281864
+                                },
+                                "c:evergreen_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:evergreen_forest": {
+                                            "cell_count": 190,
+                                            "tp": 0.004547383382368874,
+                                            "tn": 0.03672886578067167,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.01748993608603413,
+                                            "tss": 1.5740942477430715
+                                        }
+                                    },
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "c:grassland": {
+                                    "inf": 1.9154271574434862,
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "c:grassland": {
+                                            "cell_count": 18,
+                                            "tp": 0.001311591405696853,
+                                            "tn": 0.013712091968648917,
+                                            "runoff": 0.006586819904139329,
+                                            "et": 0.22356000000000004,
+                                            "inf": 0.7541051800958607,
+                                            "bod": 0.0029808895584019384,
+                                            "tss": 0.2909348209000292
+                                        }
+                                    },
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:grassland": {
+                                    "inf": 1.9321576800000002,
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "b:grassland": {
+                                            "cell_count": 13,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.22356,
+                                            "inf": 0.760692,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_open": {
+                                    "inf": 1.5757179027703194,
+                                    "cell_count": 3,
+                                    "tp": 0.008073104824569256,
+                                    "tn": 0.057016302823520375,
+                                    "runoff": 0.4247911772296808,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "b:developed_open": {
+                                            "cell_count": 3,
+                                            "tp": 0.008073104824569256,
+                                            "tn": 0.057016302823520375,
+                                            "runoff": 0.16724062095656725,
+                                            "et": 0.19665,
+                                            "inf": 0.6203613790434328,
+                                            "bod": 0.1438021796876399,
+                                            "tss": 2.517799567162537
+                                        }
+                                    },
+                                    "bod": 0.1438021796876399,
+                                    "tss": 2.517799567162537
+                                },
+                                "c:mixed_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:mixed_forest": {
+                                            "cell_count": 7,
+                                            "tp": 0.00016753517724516902,
+                                            "tn": 0.0013531687392879035,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.0006443660663275732,
+                                            "tss": 0.05799294596948158
+                                        }
+                                    },
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "inf": 2.00050908,
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "b:pasture": {
+                                            "cell_count": 102,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.19665,
+                                            "inf": 0.787602,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "inf": 1.6251892772543566,
+                                    "cell_count": 1,
+                                    "tp": 0.004919761629035195,
+                                    "tn": 0.03340259211292317,
+                                    "runoff": 0.6539832027456437,
+                                    "et": 0.22082759999999999,
+                                    "distribution": {
+                                        "c:developed_low": {
+                                            "cell_count": 1,
+                                            "tp": 0.004919761629035195,
+                                            "tn": 0.03340259211292317,
+                                            "runoff": 0.25747370186836366,
+                                            "et": 0.08693999999999999,
+                                            "inf": 0.6398382981316364,
+                                            "bod": 0.07768044677423994,
+                                            "tss": 1.6312893822590386
+                                        }
+                                    },
+                                    "bod": 0.07768044677423994,
+                                    "tss": 1.6312893822590386
+                                },
+                                "c:pasture": {
+                                    "inf": 1.9474544067755453,
+                                    "cell_count": 136,
+                                    "tp": 0.07856319054452905,
+                                    "tn": 0.815628760016838,
+                                    "runoff": 0.05305467322445484,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "c:pasture": {
+                                            "cell_count": 136,
+                                            "tp": 0.07856319054452905,
+                                            "tn": 0.815628760016838,
+                                            "runoff": 0.020887666623801118,
+                                            "et": 0.19665,
+                                            "inf": 0.7667143333761989,
+                                            "bod": 1.8569481401434142,
+                                            "tss": 20.71211387083039
+                                        }
+                                    },
+                                    "bod": 1.8569481401434142,
+                                    "tss": 20.71211387083039
+                                },
+                                "b:evergreen_forest": {
+                                    "inf": 1.9742200800000005,
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:evergreen_forest": {
+                                            "cell_count": 6,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.7772520000000002,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 2.94145140669438,
+                            "tss": 45.83200768468663
+                        },
+                        "pc_unmodified": {
+                            "BMPs": null,
+                            "inf": 1.9650996795809825,
+                            "cell_count": 1110,
+                            "tp": 0.023234766028064686,
+                            "tn": 0.19078388699546597,
+                            "runoff": 0.007945684743342011,
+                            "et": 0.5269547156756755,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "cell_count": 12,
+                                    "tp": 0.0002872031609917182,
+                                    "tn": 0.002319717838779263,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.0011046275422758394,
+                                    "tss": 0.09941647880482556
+                                },
+                                "c:grassland": {
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9154271574434862,
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:developed_open": {
+                                    "cell_count": 3,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000005,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_low": {
+                                    "cell_count": 2,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:evergreen_forest": {
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "b:deciduous_forest": {
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:grassland": {
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9321576800000002,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "cell_count": 1,
+                                    "tp": 2.3933596749309858e-05,
+                                    "tn": 0.0001933098198982719,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 9.20522951896533e-05,
+                                    "tss": 0.008284706567068797
+                                },
+                                "c:mixed_forest": {
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5257799999999999,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:pasture": {
+                                    "cell_count": 136,
+                                    "tp": 0.003254969157906141,
+                                    "tn": 0.026290135506164988,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.01251911214579285,
+                                    "tss": 1.1267200931213563
+                                },
+                                "b:evergreen_forest": {
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000005,
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 0.08730079195212437,
+                            "tss": 7.879726036335047
+                        }
                     },
-                    "unmodified": {
-                        "bod": 190.26398910013282,
-                        "cell_count": 100,
-                        "distribution": {
-                            "a:deciduous_forest": {
-                                "bod": 0,
-                                "cell_count": 30,
-                                "et": 0.14489999999999997,
-                                "inf": 4.4551,
-                                "runoff": 0,
-                                "tn": 0,
-                                "tp": 0,
-                                "tss": 0
-                            },
-                            "c:developed_high": {
-                                "bod": 190.26398910013282,
-                                "cell_count": 70,
-                                "et": 0.012419999999999999,
-                                "inf": 0.6738166467659927,
-                                "runoff": 3.9137633532340064,
-                                "tn": 1.3962921780735555,
-                                "tp": 0.2209517292775736,
-                                "tss": 38.804647454373864
+                    "quality": {
+                        "pc_modified": [
+                            {
+                                "load": 3.5741806922732864,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.08653804487004742,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.010539103992201917,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Phosphorus"
                             }
-                        },
-                        "et": 0.052163999999999995,
-                        "inf": 1.8082016527361946,
-                        "modification_hash": "87c42548da30fe1615eb6e6f5a3b0371",
-                        "runoff": 2.7396343472638045,
-                        "tn": 1.3962921780735555,
-                        "tp": 0.2209517292775736,
-                        "tss": 38.804647454373864
+                        ],
+                        "unmodified": [
+                            {
+                                "load": 20.789032029712377,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.6286171899662994,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.071023967373079,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Phosphorus"
+                            }
+                        ],
+                        "modified": [
+                            {
+                                "load": 20.789032029712377,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.6286171899662994,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.07102396737307899,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Phosphorus"
+                            }
+                        ],
+                        "pc_unmodified": [
+                            {
+                                "load": 3.5741806922732864,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.0865380448700474,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.010539103992201917,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Phosphorus"
+                            }
+                        ]
                     }
-                }
+                },
+                "polling": false,
+                "active": false
             },
             {
                 "displayName": "Water Quality",
                 "name": "quality",
-                "polling": false,
-                "inputmod_hash": "d000ef136a6c566032ed84c487508ab287c42548da30fe1615eb6e6f5a3b0371",
-                "result": [
-                    {
-                        "load": 168.53055291800564,
-                        "measure": "Biochemical Oxygen Demand"
-                    },
-                    {
-                        "load": 34.37687599402253,
-                        "measure": "Total Suspended Solids"
+                "inputmod_hash": "18ab2ee3dca78bfa88ce0e5e9cac73ecd751713988987e9331980363e24189ce",
+                "activeVar": null,
+                "result": {
+                    "modification_hash": "d751713988987e9331980363e24189ce",
+                    "aoi_census": {
+                        "cell_count": 1110,
+                        "BMPs": null,
+                        "distribution": {
+                            "c:deciduous_forest": {
+                                "cell_count": 570
+                            },
+                            "c:developed_open": {
+                                "cell_count": 12
+                            },
+                            "b:deciduous_forest": {
+                                "cell_count": 50
+                            },
+                            "b:developed_open": {
+                                "cell_count": 3
+                            },
+                            "b:developed_low": {
+                                "cell_count": 2
+                            },
+                            "c:evergreen_forest": {
+                                "cell_count": 190
+                            },
+                            "c:grassland": {
+                                "cell_count": 18
+                            },
+                            "b:grassland": {
+                                "cell_count": 13
+                            },
+                            "c:developed_low": {
+                                "cell_count": 1
+                            },
+                            "c:mixed_forest": {
+                                "cell_count": 7
+                            },
+                            "b:pasture": {
+                                "cell_count": 102
+                            },
+                            "c:pasture": {
+                                "cell_count": 136
+                            },
+                            "b:evergreen_forest": {
+                                "cell_count": 6
+                            }
+                        }
                     },
-                    {
-                        "load": 1.2367502528534187,
-                        "measure": "Total Nitrogen"
+                    "modification_censuses": [],
+                    "inputmod_hash": "18ab2ee3dca78bfa88ce0e5e9cac73ecd751713988987e9331980363e24189ce",
+                    "runoff": {
+                        "pc_modified": {
+                            "BMPs": null,
+                            "inf": 1.9650996795809825,
+                            "cell_count": 1110,
+                            "tp": 0.023234766028064686,
+                            "tn": 0.190783886995466,
+                            "runoff": 0.007945684743342011,
+                            "et": 0.5269547156756756,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:deciduous_forest": {
+                                            "cell_count": 570,
+                                            "tp": 0.013642150147106619,
+                                            "tn": 0.11018659734201498,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.05246980825810238,
+                                            "tss": 4.722282743229214
+                                        }
+                                    },
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 12,
+                                    "tp": 0.0002872031609917182,
+                                    "tn": 0.002319717838779263,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:developed_open": {
+                                            "cell_count": 12,
+                                            "tp": 0.0002872031609917182,
+                                            "tn": 0.002319717838779263,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.0011046275422758394,
+                                            "tss": 0.09941647880482556
+                                        }
+                                    },
+                                    "bod": 0.0011046275422758394,
+                                    "tss": 0.09941647880482556
+                                },
+                                "b:deciduous_forest": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:deciduous_forest": {
+                                            "cell_count": 50,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_low": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 2,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:developed_low": {
+                                            "cell_count": 2,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:evergreen_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:evergreen_forest": {
+                                            "cell_count": 190,
+                                            "tp": 0.004547383382368874,
+                                            "tn": 0.03672886578067167,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.01748993608603413,
+                                            "tss": 1.5740942477430715
+                                        }
+                                    },
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "c:grassland": {
+                                    "inf": 1.9154271574434862,
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "c:grassland": {
+                                            "cell_count": 18,
+                                            "tp": 0.001311591405696853,
+                                            "tn": 0.013712091968648917,
+                                            "runoff": 0.006586819904139329,
+                                            "et": 0.22356000000000004,
+                                            "inf": 0.7541051800958607,
+                                            "bod": 0.0029808895584019384,
+                                            "tss": 0.2909348209000292
+                                        }
+                                    },
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:grassland": {
+                                    "inf": 1.9321576800000002,
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "b:grassland": {
+                                            "cell_count": 13,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.22356,
+                                            "inf": 0.760692,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_open": {
+                                    "inf": 1.9742200800000005,
+                                    "cell_count": 3,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:developed_open": {
+                                            "cell_count": 3,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.7772520000000002,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:mixed_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:mixed_forest": {
+                                            "cell_count": 7,
+                                            "tp": 0.00016753517724516902,
+                                            "tn": 0.0013531687392879035,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.0006443660663275732,
+                                            "tss": 0.05799294596948158
+                                        }
+                                    },
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5257799999999999,
+                                    "distribution": {
+                                        "b:pasture": {
+                                            "cell_count": 102,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.20699999999999996,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 1,
+                                    "tp": 2.3933596749309858e-05,
+                                    "tn": 0.0001933098198982719,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:developed_low": {
+                                            "cell_count": 1,
+                                            "tp": 2.3933596749309858e-05,
+                                            "tn": 0.0001933098198982719,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 9.20522951896533e-05,
+                                            "tss": 0.008284706567068797
+                                        }
+                                    },
+                                    "bod": 9.20522951896533e-05,
+                                    "tss": 0.008284706567068797
+                                },
+                                "c:pasture": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 136,
+                                    "tp": 0.003254969157906141,
+                                    "tn": 0.026290135506164988,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:pasture": {
+                                            "cell_count": 136,
+                                            "tp": 0.003254969157906141,
+                                            "tn": 0.026290135506164988,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.01251911214579285,
+                                            "tss": 1.1267200931213563
+                                        }
+                                    },
+                                    "bod": 0.01251911214579285,
+                                    "tss": 1.1267200931213563
+                                },
+                                "b:evergreen_forest": {
+                                    "inf": 1.9742200800000005,
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:evergreen_forest": {
+                                            "cell_count": 6,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.7772520000000002,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 0.08730079195212437,
+                            "tss": 7.879726036335047
+                        },
+                        "unmodified": {
+                            "BMPs": null,
+                            "inf": 1.9586814534290045,
+                            "cell_count": 1110,
+                            "tp": 0.15658117288902584,
+                            "tn": 1.3858648079470084,
+                            "runoff": 0.02118010386829332,
+                            "et": 0.5201385227027028,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "cell_count": 12,
+                                    "tp": 0.03622349082905331,
+                                    "tn": 0.2558284039801889,
+                                    "runoff": 0.47650252433898943,
+                                    "et": 0.49949099999999996,
+                                    "inf": 1.5240065556610105,
+                                    "bod": 0.645230930392512,
+                                    "tss": 11.297201202311
+                                },
+                                "c:grassland": {
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9154271574434862,
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:developed_open": {
+                                    "cell_count": 3,
+                                    "tp": 0.008073104824569256,
+                                    "tn": 0.057016302823520375,
+                                    "runoff": 0.4247911772296808,
+                                    "et": 0.49949099999999996,
+                                    "inf": 1.5757179027703194,
+                                    "bod": 0.1438021796876399,
+                                    "tss": 2.517799567162537
+                                },
+                                "b:developed_low": {
+                                    "cell_count": 2,
+                                    "tp": 0.009132964949421495,
+                                    "tn": 0.06200802518291435,
+                                    "runoff": 0.6070218557883352,
+                                    "et": 0.22082759999999999,
+                                    "inf": 1.6721506242116648,
+                                    "bod": 0.1442047097277078,
+                                    "tss": 3.028298904281864
+                                },
+                                "c:evergreen_forest": {
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "b:deciduous_forest": {
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:grassland": {
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9321576800000002,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "cell_count": 1,
+                                    "tp": 0.004919761629035195,
+                                    "tn": 0.03340259211292317,
+                                    "runoff": 0.6539832027456437,
+                                    "et": 0.22082759999999999,
+                                    "inf": 1.6251892772543566,
+                                    "bod": 0.07768044677423994,
+                                    "tss": 1.6312893822590386
+                                },
+                                "c:mixed_forest": {
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.49949099999999996,
+                                    "inf": 2.00050908,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:pasture": {
+                                    "cell_count": 136,
+                                    "tp": 0.07856319054452905,
+                                    "tn": 0.815628760016838,
+                                    "runoff": 0.05305467322445484,
+                                    "et": 0.49949099999999996,
+                                    "inf": 1.9474544067755453,
+                                    "bod": 1.8569481401434142,
+                                    "tss": 20.71211387083039
+                                },
+                                "b:evergreen_forest": {
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000005,
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 2.94145140669438,
+                            "tss": 45.83200768468663
+                        },
+                        "modified": {
+                            "BMPs": null,
+                            "inf": 1.958681453429004,
+                            "cell_count": 1110,
+                            "tp": 0.15658117288902582,
+                            "tn": 1.3858648079470084,
+                            "runoff": 0.02118010386829332,
+                            "et": 0.5201385227027026,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:deciduous_forest": {
+                                            "cell_count": 570,
+                                            "tp": 0.013642150147106619,
+                                            "tn": 0.11018659734201498,
+                                            "runoff": 0.0036613144530706857,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.05246980825810238,
+                                            "tss": 4.722282743229214
+                                        }
+                                    },
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "inf": 1.5240065556610105,
+                                    "cell_count": 12,
+                                    "tp": 0.03622349082905331,
+                                    "tn": 0.2558284039801889,
+                                    "runoff": 0.47650252433898943,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "c:developed_open": {
+                                            "cell_count": 12,
+                                            "tp": 0.03622349082905331,
+                                            "tn": 0.2558284039801889,
+                                            "runoff": 0.1875994190310982,
+                                            "et": 0.19665,
+                                            "inf": 0.6000025809689018,
+                                            "bod": 0.645230930392512,
+                                            "tss": 11.297201202311
+                                        }
+                                    },
+                                    "bod": 0.645230930392512,
+                                    "tss": 11.297201202311
+                                },
+                                "b:deciduous_forest": {
+                                    "inf": 1.9742200800000003,
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:deciduous_forest": {
+                                            "cell_count": 50,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.777252,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_low": {
+                                    "inf": 1.6721506242116648,
+                                    "cell_count": 2,
+                                    "tp": 0.009132964949421495,
+                                    "tn": 0.06200802518291435,
+                                    "runoff": 0.6070218557883352,
+                                    "et": 0.22082759999999999,
+                                    "distribution": {
+                                        "b:developed_low": {
+                                            "cell_count": 2,
+                                            "tp": 0.009132964949421495,
+                                            "tn": 0.06200802518291435,
+                                            "runoff": 0.23898498259383275,
+                                            "et": 0.08693999999999999,
+                                            "inf": 0.6583270174061673,
+                                            "bod": 0.1442047097277078,
+                                            "tss": 3.028298904281864
+                                        }
+                                    },
+                                    "bod": 0.1442047097277078,
+                                    "tss": 3.028298904281864
+                                },
+                                "c:evergreen_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:evergreen_forest": {
+                                            "cell_count": 190,
+                                            "tp": 0.004547383382368874,
+                                            "tn": 0.03672886578067167,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.01748993608603413,
+                                            "tss": 1.5740942477430715
+                                        }
+                                    },
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "c:grassland": {
+                                    "inf": 1.9154271574434862,
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "c:grassland": {
+                                            "cell_count": 18,
+                                            "tp": 0.001311591405696853,
+                                            "tn": 0.013712091968648917,
+                                            "runoff": 0.006586819904139329,
+                                            "et": 0.22356000000000004,
+                                            "inf": 0.7541051800958607,
+                                            "bod": 0.0029808895584019384,
+                                            "tss": 0.2909348209000292
+                                        }
+                                    },
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:grassland": {
+                                    "inf": 1.9321576800000002,
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "distribution": {
+                                        "b:grassland": {
+                                            "cell_count": 13,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.22356,
+                                            "inf": 0.760692,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_open": {
+                                    "inf": 1.5757179027703194,
+                                    "cell_count": 3,
+                                    "tp": 0.008073104824569256,
+                                    "tn": 0.057016302823520375,
+                                    "runoff": 0.4247911772296808,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "b:developed_open": {
+                                            "cell_count": 3,
+                                            "tp": 0.008073104824569256,
+                                            "tn": 0.057016302823520375,
+                                            "runoff": 0.16724062095656725,
+                                            "et": 0.19665,
+                                            "inf": 0.6203613790434328,
+                                            "bod": 0.1438021796876399,
+                                            "tss": 2.517799567162537
+                                        }
+                                    },
+                                    "bod": 0.1438021796876399,
+                                    "tss": 2.517799567162537
+                                },
+                                "c:mixed_forest": {
+                                    "inf": 1.9649203412892005,
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "c:mixed_forest": {
+                                            "cell_count": 7,
+                                            "tp": 0.00016753517724516902,
+                                            "tn": 0.0013531687392879035,
+                                            "runoff": 0.003661314453070686,
+                                            "et": 0.207,
+                                            "inf": 0.7735906855469293,
+                                            "bod": 0.0006443660663275732,
+                                            "tss": 0.05799294596948158
+                                        }
+                                    },
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "inf": 2.00050908,
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "b:pasture": {
+                                            "cell_count": 102,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.19665,
+                                            "inf": 0.787602,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "inf": 1.6251892772543566,
+                                    "cell_count": 1,
+                                    "tp": 0.004919761629035195,
+                                    "tn": 0.03340259211292317,
+                                    "runoff": 0.6539832027456437,
+                                    "et": 0.22082759999999999,
+                                    "distribution": {
+                                        "c:developed_low": {
+                                            "cell_count": 1,
+                                            "tp": 0.004919761629035195,
+                                            "tn": 0.03340259211292317,
+                                            "runoff": 0.25747370186836366,
+                                            "et": 0.08693999999999999,
+                                            "inf": 0.6398382981316364,
+                                            "bod": 0.07768044677423994,
+                                            "tss": 1.6312893822590386
+                                        }
+                                    },
+                                    "bod": 0.07768044677423994,
+                                    "tss": 1.6312893822590386
+                                },
+                                "c:pasture": {
+                                    "inf": 1.9474544067755453,
+                                    "cell_count": 136,
+                                    "tp": 0.07856319054452905,
+                                    "tn": 0.815628760016838,
+                                    "runoff": 0.05305467322445484,
+                                    "et": 0.49949099999999996,
+                                    "distribution": {
+                                        "c:pasture": {
+                                            "cell_count": 136,
+                                            "tp": 0.07856319054452905,
+                                            "tn": 0.815628760016838,
+                                            "runoff": 0.020887666623801118,
+                                            "et": 0.19665,
+                                            "inf": 0.7667143333761989,
+                                            "bod": 1.8569481401434142,
+                                            "tss": 20.71211387083039
+                                        }
+                                    },
+                                    "bod": 1.8569481401434142,
+                                    "tss": 20.71211387083039
+                                },
+                                "b:evergreen_forest": {
+                                    "inf": 1.9742200800000005,
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "distribution": {
+                                        "b:evergreen_forest": {
+                                            "cell_count": 6,
+                                            "tp": 0,
+                                            "tn": 0,
+                                            "runoff": 0,
+                                            "et": 0.207,
+                                            "inf": 0.7772520000000002,
+                                            "bod": 0,
+                                            "tss": 0
+                                        }
+                                    },
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 2.94145140669438,
+                            "tss": 45.83200768468663
+                        },
+                        "pc_unmodified": {
+                            "BMPs": null,
+                            "inf": 1.9650996795809825,
+                            "cell_count": 1110,
+                            "tp": 0.023234766028064686,
+                            "tn": 0.19078388699546597,
+                            "runoff": 0.007945684743342011,
+                            "et": 0.5269547156756755,
+                            "distribution": {
+                                "c:deciduous_forest": {
+                                    "cell_count": 570,
+                                    "tp": 0.013642150147106619,
+                                    "tn": 0.11018659734201498,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.05246980825810238,
+                                    "tss": 4.722282743229214
+                                },
+                                "c:developed_open": {
+                                    "cell_count": 12,
+                                    "tp": 0.0002872031609917182,
+                                    "tn": 0.002319717838779263,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.0011046275422758394,
+                                    "tss": 0.09941647880482556
+                                },
+                                "c:grassland": {
+                                    "cell_count": 18,
+                                    "tp": 0.001311591405696853,
+                                    "tn": 0.013712091968648917,
+                                    "runoff": 0.016730522556513895,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9154271574434862,
+                                    "bod": 0.0029808895584019384,
+                                    "tss": 0.2909348209000292
+                                },
+                                "b:developed_open": {
+                                    "cell_count": 3,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000005,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:developed_low": {
+                                    "cell_count": 2,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:evergreen_forest": {
+                                    "cell_count": 190,
+                                    "tp": 0.004547383382368874,
+                                    "tn": 0.03672886578067167,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.01748993608603413,
+                                    "tss": 1.5740942477430715
+                                },
+                                "b:deciduous_forest": {
+                                    "cell_count": 50,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "b:grassland": {
+                                    "cell_count": 13,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5678424000000001,
+                                    "inf": 1.9321576800000002,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:developed_low": {
+                                    "cell_count": 1,
+                                    "tp": 2.3933596749309858e-05,
+                                    "tn": 0.0001933098198982719,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 9.20522951896533e-05,
+                                    "tss": 0.008284706567068797
+                                },
+                                "c:mixed_forest": {
+                                    "cell_count": 7,
+                                    "tp": 0.00016753517724516902,
+                                    "tn": 0.0013531687392879035,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.0006443660663275732,
+                                    "tss": 0.05799294596948158
+                                },
+                                "b:pasture": {
+                                    "cell_count": 102,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.5257799999999999,
+                                    "inf": 1.9742200800000003,
+                                    "bod": 0,
+                                    "tss": 0
+                                },
+                                "c:pasture": {
+                                    "cell_count": 136,
+                                    "tp": 0.003254969157906141,
+                                    "tn": 0.026290135506164988,
+                                    "runoff": 0.009299738710799543,
+                                    "et": 0.52578,
+                                    "inf": 1.9649203412892005,
+                                    "bod": 0.01251911214579285,
+                                    "tss": 1.1267200931213563
+                                },
+                                "b:evergreen_forest": {
+                                    "cell_count": 6,
+                                    "tp": 0,
+                                    "tn": 0,
+                                    "runoff": 0,
+                                    "et": 0.52578,
+                                    "inf": 1.9742200800000005,
+                                    "bod": 0,
+                                    "tss": 0
+                                }
+                            },
+                            "bod": 0.08730079195212437,
+                            "tss": 7.879726036335047
+                        }
                     },
-                    {
-                        "load": 0.19570118698081884,
-                        "measure": "Total Phosphorus"
+                    "quality": {
+                        "pc_modified": [
+                            {
+                                "load": 3.5741806922732864,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.08653804487004742,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.010539103992201917,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Phosphorus"
+                            }
+                        ],
+                        "unmodified": [
+                            {
+                                "load": 20.789032029712377,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.6286171899662994,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.071023967373079,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Phosphorus"
+                            }
+                        ],
+                        "modified": [
+                            {
+                                "load": 20.789032029712377,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.6286171899662994,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.07102396737307899,
+                                "runoff": 0.02118010386829332,
+                                "measure": "Total Phosphorus"
+                            }
+                        ],
+                        "pc_unmodified": [
+                            {
+                                "load": 3.5741806922732864,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Suspended Solids"
+                            },
+                            {
+                                "load": 0.0865380448700474,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Nitrogen"
+                            },
+                            {
+                                "load": 0.010539103992201917,
+                                "runoff": 0.007945684743342011,
+                                "measure": "Total Phosphorus"
+                            }
+                        ]
                     }
-                ]
+                },
+                "polling": false,
+                "active": false
             }
         ],
+        "name": "New Scenario",
+        "is_current_conditions": false,
+        "inputmod_hash": "18ab2ee3dca78bfa88ce0e5e9cac73ecd751713988987e9331980363e24189ce",
+        "modification_hash": "d751713988987e9331980363e24189ce",
+        "created_at": "2017-10-02T21:05:58.984931Z",
+        "modified_at": "2017-10-02T21:05:58.984958Z",
+        "project": 440,
+        "user_id": 5,
+        "active": false,
+        "job_id": null,
+        "poll_error": null,
+        "allow_save": true,
+        "options_menu_is_open": false,
         "taskModel": {
-            "error": "",
-            "finished": "2015-07-14T21:46:02.069Z",
-            "job": "8aef636e-2079-4f87-98dc-471d090141ad",
-            "job_uuid": "8aef636e-2079-4f87-98dc-471d090141ad",
-            "pollInterval": 500,
-            "result": "{\"runoff\": {\"unmodified\": {\"modification_hash\": \"87c42548da30fe1615eb6e6f5a3b0371\", \"cell_count\": 100, \"distribution\": {\"c:developed_high\": {\"cell_count\": 70, \"tp\": 0.2209517292775736, \"tn\": 1.3962921780735555, \"runoff\": 3.9137633532340064, \"et\": 0.012419999999999999, \"inf\": 0.6738166467659927, \"bod\": 190.26398910013282, \"tss\": 38.804647454373864}, \"a:deciduous_forest\": {\"cell_count\": 30, \"tp\": 0.0, \"tn\": 0.0, \"runoff\": 0.0, \"et\": 0.14489999999999997, \"inf\": 4.4551, \"bod\": 0.0, \"tss\": 0.0}}, \"tp\": 0.2209517292775736, \"tn\": 1.3962921780735555, \"runoff\": 2.7396343472638045, \"et\": 0.052163999999999995, \"inf\": 1.8082016527361946, \"bod\": 190.26398910013282, \"tss\": 38.804647454373864}, \"modified\": {\"modification_hash\": \"87c42548da30fe1615eb6e6f5a3b0371\", \"cell_count\": 100, \"distribution\": {\"c:developed_high\": {\"cell_count\": 70, \"distribution\": {\"a:shrub\": {\"cell_count\": 8, \"tp\": 1.0839063964757685e-06, \"tn\": 3.4323702555066e-05, \"runoff\": 0.04031885882106137, \"et\": 0.207, \"inf\": 4.352681141178938, \"bod\": 0.01101971503083698, \"tss\": 0.007045391577092494}, \"c:developed_high\": {\"cell_count\": 62, \"tp\": 0.19570010307442237, \"tn\": 1.2367159291508636, \"runoff\": 3.913763353234007, \"et\": 0.012419999999999999, \"inf\": 0.6738166467659927, \"bod\": 168.5195332029748, \"tss\": 34.36983060244543}}, \"tp\": 0.19570118698081884, \"tn\": 1.2367502528534187, \"runoff\": 3.4710839824439557, \"et\": 0.034657714285714285, \"inf\": 1.0942583032703295, \"bod\": 168.53055291800564, \"tss\": 34.37687599402253}, \"a:deciduous_forest\": {\"cell_count\": 30, \"tp\": 0.0, \"tn\": 0.0, \"runoff\": 0.0, \"et\": 0.14489999999999997, \"inf\": 4.4551, \"bod\": 0.0, \"tss\": 0.0}}, \"tp\": 0.19570118698081884, \"tn\": 1.2367502528534187, \"runoff\": 2.429758787710769, \"et\": 0.0677304, \"inf\": 2.1025108122892306, \"bod\": 168.53055291800564, \"tss\": 34.37687599402253}}, \"census\": {\"cell_count\": 100, \"distribution\": {\"c:developed_high\": {\"cell_count\": 70}, \"a:deciduous_forest\": {\"cell_count\": 30}}, \"modification_hash\": \"87c42548da30fe1615eb6e6f5a3b0371\", \"modifications\": [{\"cell_count\": 8, \"distribution\": {\"c:developed_high\": {\"cell_count\": 8}}, \"reclassification\": \"a:shrub\"}]}, \"quality\": [{\"load\": 168.53055291800564, \"measure\": \"Biochemical Oxygen Demand\"}, {\"load\": 34.37687599402253, \"measure\": \"Total Suspended Solids\"}, {\"load\": 1.2367502528534187, \"measure\": \"Total Nitrogen\"}, {\"load\": 0.19570118698081884, \"measure\": \"Total Phosphorus\"}]}",
-            "started": "2015-07-14T21:46:01.997Z",
-            "status": "complete",
             "taskName": "tr55",
             "taskType": "mmw/modeling",
-            "timeout": 5000
-        },
-        "user_id": 1
-    }
-};
+            "pollInterval": 1000,
+            "timeout": 45000
+        }
+}};
 
 var polygons = {
     greaterThanOneAcre: {

From e85aa1bf1eafdd361c0c8df3195b192ed53f4ec4 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Mon, 9 Oct 2017 14:38:57 -0400
Subject: [PATCH 32/34] Compare: Use proper tr55 key for each scenario's chart
 value

* Previously we were displaying the `modified` key of
  the results for each scenario. The precolumbian value
  is, however, stored in the `pc_unmodified` key, so
  the precolumbian scenario's chart values were always
  identical to current conditions

* Use the key that corresponds to each scenarios results

* Add tests to check that the proper keys are being used
  for each type of scenario
---
 src/mmw/js/src/compare/models.js |  31 ++--
 src/mmw/js/src/compare/tests.js  | 238 +++++++++++++++++++++++++++++++
 src/mmw/js/src/compare/views.js  |   3 +-
 3 files changed, 255 insertions(+), 17 deletions(-)
 create mode 100644 src/mmw/js/src/compare/tests.js

diff --git a/src/mmw/js/src/compare/models.js b/src/mmw/js/src/compare/models.js
index a83f23d62..8e22188e4 100644
--- a/src/mmw/js/src/compare/models.js
+++ b/src/mmw/js/src/compare/models.js
@@ -43,6 +43,16 @@ var ChartRowsCollection = Backbone.Collection.extend({
         this.scenarios.forEach(function(scenario) {
             scenario.get('results').on('change', update);
         });
+    },
+
+    getScenarioResults: function(typeKey) {
+        return this.scenarios.map(function(scenario) {
+            var resultKey = coreUtils.getTR55ResultKey(scenario),
+                result = scenario.get('results')
+                                 .findWhere({ name: typeKey })
+                                 .get('result');
+            return result[typeKey][resultKey];
+        });
     }
 });
 
@@ -52,23 +62,17 @@ var Tr55RunoffCharts = ChartRowsCollection.extend({
                                                .get('inputs')
                                                .findWhere({ name: 'precipitation' }),
             precipitation = coreUtils.convertToMetric(precipitationInput.get('value'), 'in'),
-            results = this.scenarios.map(function(scenario) {
-                return scenario.get('results')
-                               .findWhere({ name: 'runoff' })
-                               .get('result');
-            });
+            results = this.getScenarioResults('runoff');
 
         this.forEach(function(chart) {
             var key = chart.get('key'),
                 values = [];
 
             if (key === 'combined') {
-                values = _.map(results, function(result) {
-                    return result.runoff.modified;
-                });
+                values = results;
             } else {
                 values = _.map(results, function(result) {
-                    return result.runoff.modified[key];
+                    return result[key];
                 });
             }
 
@@ -83,17 +87,12 @@ var Tr55RunoffCharts = ChartRowsCollection.extend({
 var Tr55QualityCharts = ChartRowsCollection.extend({
     update: function() {
         var aoivm = this.aoiVolumeModel,
-            results = this.scenarios.map(function(scenario) {
-                return scenario.get('results')
-                               .findWhere({ name: 'quality' })
-                               .get('result');
-            });
+            results = this.getScenarioResults('quality');
 
         this.forEach(function(chart) {
             var name = chart.get('name'),
                 values = _.map(results, function(result) {
-                    var measures = result.quality.modified,
-                        load = _.find(measures, { measure: name }).load;
+                    var load = _.find(result, { measure: name }).load;
 
                     return aoivm.getLoadingRate(load);
                 });
diff --git a/src/mmw/js/src/compare/tests.js b/src/mmw/js/src/compare/tests.js
new file mode 100644
index 000000000..2b21dec77
--- /dev/null
+++ b/src/mmw/js/src/compare/tests.js
@@ -0,0 +1,238 @@
+"use strict";
+
+require('../core/setup');
+
+var _ = require('lodash'),
+    assert = require('chai').assert,
+    mocks = require('../modeling/mocks'),
+    modelingModels = require('../modeling/models'),
+    views = require('./views'),
+    App = require('../app.js'),
+    testUtils = require('../core/testUtils');
+
+describe('Compare', function() {
+    beforeEach(function() {
+        // ScenarioModel.initialize() expects
+        // App.currentProject to be set, and uses it to determine the
+        // taskModel and modelPackage to use.
+        App.currentProject = new modelingModels.ProjectModel();
+
+        var sqKm = {"type":"MultiPolygon","coordinates":[[[[-75.16779683695418,39.93578257350401],[-75.15607096089737,39.93578257350401],[-75.15607096089737,39.94477296727664],[-75.16779683695418,39.94477296727664],[-75.16779683695418,39.93578257350401]]]]};
+
+        // The water quality charts expect an area of
+        // interest for the AoIVolumeModel to use
+        App.currentProject.set('area_of_interest', sqKm);
+    });
+
+    afterEach(function() {
+        testUtils.resetApp(App);
+    });
+
+    describe('Models', function() {
+        describe('Tr55RunoffCharts', function() {
+            beforeEach(function() {
+                this.scenarios = getTestScenarioCollection();
+                this.chartRows = views.getTr55Tabs(this.scenarios)
+                                      .findWhere({ name: 'Runoff' })
+                                      .get('charts');
+            });
+
+            describe('#update', function() {
+                it('uses precolumbian results for 100% forest cover scenario',
+                   function() {
+                       var precolumbianResult =
+                               this.scenarios
+                                   .findWhere({ is_pre_columbian: true })
+                                   .get('results')
+                                   .findWhere({ name: 'runoff' })
+                                   .get('result'),
+                           precolumbianValue =
+                               precolumbianResult.runoff['pc_unmodified'];
+
+                       this.chartRows.update();
+
+                       this.chartRows.forEach(function(chart) {
+                           var forestValue = chart.get('values')[0];
+                           if (chart.get('key') === 'combined') {
+                               assert.equal(forestValue, precolumbianValue);
+                           } else {
+                               assert.equal(forestValue,
+                                            precolumbianValue[chart.get('key')]);
+                           }
+                       });
+                   });
+
+                it('uses unmodified results for current conditions scenario',
+                   function() {
+                       var unmodifiedResult =
+                               this.scenarios
+                                   .findWhere({ is_current_conditions: true })
+                                   .get('results')
+                                   .findWhere({ name: 'runoff' })
+                                   .get('result'),
+                           unmodifiedValue = unmodifiedResult.runoff['unmodified'];
+
+                       this.chartRows.update();
+
+                       this.chartRows.forEach(function(chart) {
+                           var currentConditionsValue = chart.get('values')[1];
+                           if (chart.get('key') === 'combined') {
+                               assert.equal(currentConditionsValue,
+                                            unmodifiedValue);
+                           } else {
+                               assert.equal(currentConditionsValue,
+                                            unmodifiedValue[chart.get('key')]);
+                           }
+                       });
+                   });
+
+                it('uses modified results for user-created scenario',
+                   function() {
+                       var isUserCreated = function(scenario) {
+                           return !scenario.get('is_current_conditions') &&
+                                  !scenario.get('is_pre_columbian');
+                       },
+
+                           modifiedResult = this.scenarios
+                                                .find(isUserCreated)
+                                                .get('results')
+                                                .findWhere({ name: 'runoff' })
+                                                .get('result'),
+                           modifiedValue = modifiedResult.runoff['modified'];
+
+                       this.chartRows.update();
+
+                       this.chartRows.forEach(function(chart) {
+                           var value = chart.get('values')[2];
+                           if (chart.get('key') === 'combined') {
+                               assert.equal(value,
+                                            modifiedValue);
+                           } else {
+                               assert.equal(value,
+                                            modifiedValue[chart.get('key')]);
+                           }
+                       });
+                   });
+            });
+        });
+
+        describe('Tr55QualityCharts', function() {
+            beforeEach(function() {
+                this.scenarios = getTestScenarioCollection();
+                this.chartRows = views.getTr55Tabs(this.scenarios)
+                                      .findWhere({ name: 'Water Quality' })
+                                      .get('charts');
+            });
+
+            describe('#update', function() {
+                it('uses precolumbian results for 100% forest cover scenario',
+                   function() {
+                       var precolumbianResult =
+                               this.scenarios
+                                   .findWhere({ is_pre_columbian: true })
+                                   .get('results')
+                                   .findWhere({ name: 'quality' })
+                                   .get('result'),
+                           precolumbianValue =
+                               precolumbianResult.quality['pc_unmodified'],
+                           aoivm = this.chartRows.aoiVolumeModel;
+
+                       this.chartRows.update();
+
+                       this.chartRows.forEach(function(chart) {
+                           var name = chart.get('name'),
+                               load = _.find(precolumbianValue,
+                                             { measure: name }).load,
+                               loadingRate = aoivm.getLoadingRate(load);
+
+                           assert.equal(chart.get('values')[0],
+                                        loadingRate);
+                       });
+                   });
+
+                it('uses unmodified results for current conditions scenario',
+                   function() {
+                       var unmodifiedResult =
+                               this.scenarios
+                                   .findWhere({ is_current_conditions: true })
+                                   .get('results')
+                                   .findWhere({ name: 'quality' })
+                                   .get('result'),
+                           unmodifiedValue = unmodifiedResult.quality['unmodified'],
+                           aoivm = this.chartRows.aoiVolumeModel;
+
+                       this.chartRows.update();
+
+                       this.chartRows.forEach(function(chart) {
+                           var name = chart.get('name'),
+                               load = _.find(unmodifiedValue,
+                                             { measure: name }).load,
+                               loadingRate = aoivm.getLoadingRate(load);
+
+                           assert.equal(chart.get('values')[1],
+                                        loadingRate);
+
+                       });
+                   });
+
+                it('uses modified results for user-created scenario',
+                   function() {
+                       var isUserCreated = function(scenario) {
+                           return !scenario.get('is_current_conditions') &&
+                                  !scenario.get('is_pre_columbian');
+                       },
+
+                           modifiedResult = this.scenarios
+                                                .find(isUserCreated)
+                                                .get('results')
+                                                .findWhere({ name: 'quality' })
+                                                .get('result'),
+                           modifiedValue = modifiedResult.quality['modified'],
+                           aoivm = this.chartRows.aoiVolumeModel;
+
+                       this.chartRows.update();
+
+                       this.chartRows.forEach(function(chart) {
+                           var name = chart.get('name'),
+                               load = _.find(modifiedValue,
+                                             { measure: name }).load,
+                               loadingRate = aoivm.getLoadingRate(load);
+
+                           assert.equal(chart.get('values')[2],
+                                        loadingRate);
+                       });
+                   });
+            });
+        });
+    });
+});
+
+function getTestScenarioCollection() {
+    var userScenario = new modelingModels.ScenarioModel(mocks.scenarios.sample),
+        currentConditions = new modelingModels.ScenarioModel(mocks.scenarios.sample),
+        forestCover = new modelingModels.ScenarioModel(mocks.scenarios.sample);
+
+    userScenario.set('active', true);
+
+    currentConditions.set({
+        name: 'Current Conditions',
+        id: 1,
+        is_current_conditions: true,
+    });
+
+    forestCover.set({
+        name: '100% Forest Cover',
+        id: 2,
+        is_pre_columbian: true,
+        is_current_conditions: false,
+    });
+
+    // Tests assume [0] == 100% forest cover
+    //              [1] == current conditions
+    //              [2] == user's scenario
+    return new modelingModels.ScenariosCollection([
+        forestCover,
+        currentConditions,
+        userScenario
+    ]);
+}
diff --git a/src/mmw/js/src/compare/views.js b/src/mmw/js/src/compare/views.js
index ea4cd9dcc..aea560b1b 100644
--- a/src/mmw/js/src/compare/views.js
+++ b/src/mmw/js/src/compare/views.js
@@ -959,5 +959,6 @@ function showCompare() {
 module.exports = {
     showCompare: showCompare,
     CompareWindow2: CompareWindow2,
-    CompareWindow: CompareWindow
+    CompareWindow: CompareWindow,
+    getTr55Tabs: getTr55Tabs
 };

From 0ddac172fe503aedfb51895d4489fc5a72f811ec Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <ttuhinanshu@azavea.com>
Date: Wed, 11 Oct 2017 11:50:58 -0400
Subject: [PATCH 33/34] Update default Scenario names, titles in Compare

 * "100% Forest Cover" -> "Predominantly Forested"
 * Replace Lorem Ipsum with real copy for Predominantly Forested
   and Current Conditions scenarios
---
 src/mmw/js/src/compare/controllers.js                     | 4 ++--
 .../src/compare/templates/compareDescriptionPopover.html  | 6 +++---
 src/mmw/js/src/compare/tests.js                           | 8 ++++----
 src/mmw/js/src/compare/views.js                           | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mmw/js/src/compare/controllers.js b/src/mmw/js/src/compare/controllers.js
index 19fbf00e2..849b78a8d 100644
--- a/src/mmw/js/src/compare/controllers.js
+++ b/src/mmw/js/src/compare/controllers.js
@@ -116,14 +116,14 @@ function copyProject(project, aoi_census) {
     });
 }
 
-// Adds special 100% Forest Cover Scenario for the Compare View
+// Adds special Predominantly Forested Scenario for the Compare View
 function addForestCoverScenario(aoi_census) {
     var project = App.currentProject,
         forestCoverScenario = new modelingModels.ScenarioModel({}),
         currentConditions = project.get('scenarios').findWhere({ is_current_conditions: true });
 
     forestCoverScenario.set({
-        name: '100% Forest Cover',
+        name: 'Predominantly Forested',
         is_current_conditions: false,
         is_pre_columbian: true,
         modifications: currentConditions.get('modifications'),
diff --git a/src/mmw/js/src/compare/templates/compareDescriptionPopover.html b/src/mmw/js/src/compare/templates/compareDescriptionPopover.html
index 46216a919..a585b709e 100644
--- a/src/mmw/js/src/compare/templates/compareDescriptionPopover.html
+++ b/src/mmw/js/src/compare/templates/compareDescriptionPopover.html
@@ -1,16 +1,16 @@
 {% if is_pre_columbian %}
     <h3 class="compare-no-mod-title">{{name}}</h3>
     <p>
-        Lorem ipsum this scenario shows the tr55 model results under pre columbian conditions...
+        Model simulation of a pre-development landscape, where forest replaces all agricultural and urban landcover.
     </p>
 {% elif is_current_conditions %}
     <h3 class="compare-no-mod-title">{{name}}</h3>
     <p>
-        Lorem ipsum this is the model run under current conditions
+        Model results based on 2011 NLCD land and 2016 gSSURGO soil datasets.
     </p>
 {% else %}
     <h3 class="compare-no-mod-title">No modifications</h3>
     <p>
-        To add modifications, close this modal and select "Land cover" or "Conservation practices" lorem ipsum dolor sit
+        To add modifications, close this modal and select "Land cover" or "Conservation practices".
     </p>
 {% endif %}
diff --git a/src/mmw/js/src/compare/tests.js b/src/mmw/js/src/compare/tests.js
index 2b21dec77..4b9686f66 100644
--- a/src/mmw/js/src/compare/tests.js
+++ b/src/mmw/js/src/compare/tests.js
@@ -38,7 +38,7 @@ describe('Compare', function() {
             });
 
             describe('#update', function() {
-                it('uses precolumbian results for 100% forest cover scenario',
+                it('uses precolumbian results for Predominantly Forested scenario',
                    function() {
                        var precolumbianResult =
                                this.scenarios
@@ -125,7 +125,7 @@ describe('Compare', function() {
             });
 
             describe('#update', function() {
-                it('uses precolumbian results for 100% forest cover scenario',
+                it('uses precolumbian results for Predominantly Forested scenario',
                    function() {
                        var precolumbianResult =
                                this.scenarios
@@ -221,13 +221,13 @@ function getTestScenarioCollection() {
     });
 
     forestCover.set({
-        name: '100% Forest Cover',
+        name: 'Predominantly Forested',
         id: 2,
         is_pre_columbian: true,
         is_current_conditions: false,
     });
 
-    // Tests assume [0] == 100% forest cover
+    // Tests assume [0] == Predominantly Forested
     //              [1] == current conditions
     //              [2] == user's scenario
     return new modelingModels.ScenariosCollection([
diff --git a/src/mmw/js/src/compare/views.js b/src/mmw/js/src/compare/views.js
index aea560b1b..2a2a7be98 100644
--- a/src/mmw/js/src/compare/views.js
+++ b/src/mmw/js/src/compare/views.js
@@ -911,11 +911,11 @@ function getCompareScenarios(isTr55) {
         aoi_census = ccScenario.get('aoi_census');
 
     if (isTr55) {
-        // Add 100% Forest Cover scenario
+        // Add Predominantly Forested scenario
         var forestScenario = copyScenario(ccScenario, aoi_census);
 
         forestScenario.set({
-            name: '100% Forest Cover',
+            name: 'Predominantly Forested',
             is_current_conditions: false,
             is_pre_columbian: true,
         });

From 0f6e28f08a9a44d3cead33f536ed614a9f12e5e6 Mon Sep 17 00:00:00 2001
From: Alice Rottersman <arottersman@azavea.com>
Date: Wed, 11 Oct 2017 18:22:13 -0400
Subject: [PATCH 34/34] Fix analyze water quality catchment popup

* We were failing to display the water quality catchment
  popup when you clicked a row in the analyze water quality
  table

* We were still treating the water quality geom as string,
  but it now comes as a regular json object and doesn't
  need to be parsed
---
 src/mmw/js/src/analyze/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mmw/js/src/analyze/views.js b/src/mmw/js/src/analyze/views.js
index 091054f9b..d042053b2 100644
--- a/src/mmw/js/src/analyze/views.js
+++ b/src/mmw/js/src/analyze/views.js
@@ -924,7 +924,7 @@ var CatchmentWaterQualityTableView = Marionette.CompositeView.extend({
                     'nord', data.nord);
         this.catchmentPolygon.addTo(map);
         map.panInsideBounds(this.catchmentPolygon.getBounds());
-        var popUpLocationGeoJSON = utils.findCenterOfShapeIntersection(JSON.parse(geom), App.map.get('areaOfInterest'));
+        var popUpLocationGeoJSON = utils.findCenterOfShapeIntersection(geom, App.map.get('areaOfInterest'));
         this.catchmentPolygon.openPopup(L.GeoJSON.coordsToLatLng(popUpLocationGeoJSON.geometry.coordinates));
     },