Skip to content

Commit

Permalink
Update default Scenario names, titles in Compare
Browse files Browse the repository at this point in the history
 * "100% Forest Cover" -> "Predominantly Forested"
 * Replace Lorem Ipsum with real copy for Predominantly Forested
   and Current Conditions scenarios
  • Loading branch information
rajadain committed Oct 11, 2017
1 parent 7fc5505 commit 0ddac17
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/mmw/js/src/compare/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
Original file line number Diff line number Diff line change
@@ -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 %}
8 changes: 4 additions & 4 deletions src/mmw/js/src/compare/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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([
Expand Down
4 changes: 2 additions & 2 deletions src/mmw/js/src/compare/views.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down

0 comments on commit 0ddac17

Please sign in to comment.