Merge pull request #2244 from WikiWatershed/tt/add-wkaoi-to-project-m…

…odel Add WKAoI field to Project Model Connects #1899
WikiWatershed · Sep 12, 2017 · 1f96784 · 1f96784
2 parents 0ff5238 + 2154535
commit 1f96784
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/src/mmw/apps/modeling/migrations/0022_project_wkaoi.py b/src/mmw/apps/modeling/migrations/0022_project_wkaoi.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('modeling', '0021_old_scenarios'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='wkaoi',
+            field=models.CharField(help_text='Well-Known Area of Interest ID for faster geoprocessing', max_length=255, null=True),
+        ),
+    ]
diff --git a/src/mmw/apps/modeling/models.py b/src/mmw/apps/modeling/models.py
@@ -43,6 +43,10 @@ class Project(models.Model):
         null=True,
         help_text='Serialized JSON representation of additional'
                   ' data gathering steps, such as MapShed.')
+    wkaoi = models.CharField(
+        null=True,
+        max_length=255,
+        help_text='Well-Known Area of Interest ID for faster geoprocessing')
 
     def __unicode__(self):
         return self.name

diff --git a/src/mmw/js/src/modeling/controllers.js b/src/mmw/js/src/modeling/controllers.js
@@ -34,7 +34,8 @@ var ModelingController = {
 
                     App.map.set({
                         'areaOfInterest': project.get('area_of_interest'),
-                        'areaOfInterestName': project.get('area_of_interest_name')
+                        'areaOfInterestName': project.get('area_of_interest_name'),
+                        'wellKnownAreaOfInterest': project.get('wkaoi'),
                     });
                     initScenarioEvents(project);
                     initViews(project, lock);
@@ -168,7 +169,8 @@ var ModelingController = {
             .done(function() {
                 App.map.set({
                     'areaOfInterest': project.get('area_of_interest'),
-                    'areaOfInterestName': project.get('area_of_interest_name')
+                    'areaOfInterestName': project.get('area_of_interest_name'),
+                    'wellKnownAreaOfInterest': project.get('wkaoi'),
                 });
                 if (project.get('scenarios').isEmpty()) {
                     // No scenarios available. Set the `needs_reset` flag so
@@ -197,6 +199,7 @@ function itsiResetProject(project) {
         'user_id': App.user.get('id'),
         'area_of_interest': App.map.get('areaOfInterest'),
         'area_of_interest_name': App.map.get('areaOfInterestName'),
+        'wkaoi': App.map.get('wellKnownAreaOfInterest'),
         'needs_reset': false
     });
 
@@ -276,6 +279,7 @@ function projectCleanUp() {
     App.rootView.subHeaderRegion.empty();
     App.rootView.sidebarRegion.empty();
     App.rootView.compareRegion.empty();
+    App.clearAnalyzeCollection();
 }
 
 function projectErrorState() {
@@ -347,7 +351,8 @@ function reinstateProject(number, lock) {
         .done(function() {
             App.map.set({
                 'areaOfInterest': project.get('area_of_interest'),
-                'areaOfInterestName': project.get('area_of_interest_name')
+                'areaOfInterestName': project.get('area_of_interest_name'),
+                'wellKnownAreaOfInterest': project.get('wkaoi'),
             });
             setPageTitle();
             lock.resolve();

diff --git a/src/mmw/js/src/modeling/views.js b/src/mmw/js/src/modeling/views.js
@@ -227,7 +227,8 @@ var ProjectMenuView = Marionette.ItemView.extend({
                 App.projectNumber = undefined;
                 App.map.set({
                     'areaOfInterest': null,
-                    'areaOfInterestName': null
+                    'areaOfInterestName': null,
+                    'wellKnownAreaOfInterest': null,
                 });
 
                 router.navigate('projects/', { trigger: true });

diff --git a/src/mmw/js/src/projects/views.js b/src/mmw/js/src/projects/views.js
@@ -48,7 +48,8 @@ var ProjectsView = Marionette.LayoutView.extend({
         App.projectNumber = undefined;
         App.map.set({
             'areaOfInterest': null,
-            'areaOfInterestName': null
+            'areaOfInterestName': null,
+            'wellKnownAreaOfInterest': null,
         });
 
         router.navigate('', { trigger: true });
@@ -170,7 +171,8 @@ var ProjectRowView = Marionette.ItemView.extend({
         App.clearAnalyzeCollection();
         App.map.set({
             'areaOfInterest': null,
-            'areaOfInterestName': ''
+            'areaOfInterestName': '',
+            'wellKnownAreaOfInterest': null,
         });
         router.navigate('/project/' + this.model.id, { trigger: true });
     }