From 0ddac172fe503aedfb51895d4489fc5a72f811ec Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 11 Oct 2017 11:50:58 -0400 Subject: [PATCH] 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 %}

{{name}}

- 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.

{% elif is_current_conditions %}

{{name}}

- Lorem ipsum this is the model run under current conditions + Model results based on 2011 NLCD land and 2016 gSSURGO soil datasets.

{% else %}

No modifications

- 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".

{% 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, });