diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js
index 5465c5839..566be10b9 100644
--- a/src/mmw/js/src/core/views.js
+++ b/src/mmw/js/src/core/views.js
@@ -616,18 +616,11 @@ var MapView = Marionette.ItemView.extend({
if (additionalShapes) {
_.each(additionalShapes.features, function(geoJSONpoint) {
- function createMarkerIcon(iconName) {
- return L.divIcon({
- className: 'marker-rwd marker-rwd-' + iconName,
- iconSize: [16,16]
- });
- }
-
var newLayer = L.geoJson(geoJSONpoint, {
pointToLayer: function(feature, latLngForPoint) {
var customIcon = feature.properties.original ?
- createMarkerIcon('original-point') :
- createMarkerIcon('nearest-stream-point');
+ drawUtils.createRwdMarkerIcon('original-point') :
+ drawUtils.createRwdMarkerIcon('nearest-stream-point');
return L.marker(latLngForPoint, { icon: customIcon });
},
onEachFeature: function(feature, layer) {
@@ -872,13 +865,16 @@ var AreaOfInterestView = Marionette.ItemView.extend({
template: areaOfInterestTmpl,
initialize: function() {
this.map = this.options.App.map;
- this.listenTo(this.map, 'change areaOfInterest', this.syncArea);
+ this.listenTo(this.map, 'change:areaOfInterest', this.syncArea);
},
- modelEvents: { 'change shape': 'render' },
+ modelEvents: { 'change:shape': 'render' },
syncArea: function() {
- this.model.set('shape', this.map.get('areaOfInterest'));
+ this.model.set({
+ 'shape': this.map.get('areaOfInterest'),
+ 'place': this.map.get('areaOfInterestName'),
+ });
}
});
diff --git a/src/mmw/js/src/core/vizerLayers.js b/src/mmw/js/src/core/vizerLayers.js
index eaa067d67..ed4690aeb 100644
--- a/src/mmw/js/src/core/vizerLayers.js
+++ b/src/mmw/js/src/core/vizerLayers.js
@@ -10,13 +10,15 @@ var $ = require('jquery'),
measurementTmpl = require('./templates/measurement.html'),
measurementsTmpl = require('./templates/measurements.html'),
popupTmpl = require('./templates/observationPopup.html'),
- vizerUrls = require('./settings').get('vizer_urls');
+ vizerUrls = require('./settings').get('vizer_urls'),
+ vizerIgnore = require('./settings').get('vizer_ignore'),
+ vizerNames = require('./settings').get('vizer_names');
// These are likely temporary until we develop custom icons for each type
var platformIcons = {
'River Guage': '#F44336',
- 'Weather Station': '#2196F3',
- 'Fixed Shore Platform': '#4CAF50',
+ 'Weather Station': '#4CAF50',
+ 'Fixed Shore Platform': '#2196F3',
'Soil Pit': '#FFEB3B',
'Well': '#795548'
},
@@ -41,7 +43,7 @@ function VizerLayers() {
// A list of all assets (typically sensor devices) and the variables
// they manage, along with various meta data grouped by the data
// provider which acts as the "layer" which can be toggled on/off
- var layerAssets = _.groupBy(assets.result, 'provider');
+ var layerAssets = _.omit(_.groupBy(assets.result, 'provider'), vizerIgnore);
var layers = _.map(layerAssets, function(assets, provider) {
// Create a marker for each asset point in this layer and
@@ -78,7 +80,7 @@ function VizerLayers() {
function makeProviderLabel(provider, assets) {
// Create a label for the layer selector.
- return provider + ' (' + assets.length + ')';
+ return (vizerNames[provider] || provider) + ' (' + assets.length + ')';
}
function attachPopups(featureGroup) {
@@ -182,9 +184,15 @@ var ObservationPopupView = Marionette.LayoutView.extend({
return time;
}
return latestTime;
- });
+ }),
+ provider = this.model.get('provider'),
+ providerName =
+ provider === "NOS/CO-OPS" ?
+ provider :
+ vizerNames[provider];
return {
- lastUpdated: moment(latestTime).fromNow()
+ lastUpdated: moment(latestTime).fromNow(),
+ providerName: providerName,
};
},
diff --git a/src/mmw/js/src/draw/controllers.js b/src/mmw/js/src/draw/controllers.js
index 6ed395cbb..83c4f5529 100644
--- a/src/mmw/js/src/draw/controllers.js
+++ b/src/mmw/js/src/draw/controllers.js
@@ -32,20 +32,21 @@ var DrawController = {
enableSingleProjectModeIfActivity();
- if (App.map.get('areaOfInterest')) {
- var aoiView = new coreViews.AreaOfInterestView({
- id: 'aoi-header-wrapper',
- App: App,
- model: new coreModels.AreaOfInterestModel({
- can_go_back: false,
- next_label: 'Analyze',
- url: 'analyze',
- shape: App.map.get('areaOfInterest'),
- place: App.map.get('areaOfInterestName')
- })
- });
+ var aoiView = new coreViews.AreaOfInterestView({
+ id: 'aoi-header-wrapper',
+ App: App,
+ model: new coreModels.AreaOfInterestModel({
+ can_go_back: false,
+ next_label: 'Analyze',
+ url: 'analyze',
+ shape: App.map.get('areaOfInterest'),
+ place: App.map.get('areaOfInterestName')
+ })
+ });
- App.rootView.footerRegion.show(aoiView);
+ App.rootView.footerRegion.show(aoiView);
+
+ if (App.map.get('areaOfInterest')) {
App.map.setDrawWithBarSize(true);
}
diff --git a/src/mmw/js/src/draw/models.js b/src/mmw/js/src/draw/models.js
index ec6135035..8c6f2d57e 100644
--- a/src/mmw/js/src/draw/models.js
+++ b/src/mmw/js/src/draw/models.js
@@ -20,6 +20,13 @@ var ToolbarModel = Backbone.Model.extend({
disableTools: function() {
this.set('toolsEnabled', false);
+ },
+
+ clearRwdClickedPoint: function(map) {
+ if (map && this.has('rwd-original-point')) {
+ map.removeLayer(this.get('rwd-original-point'));
+ this.unset('rwd-original-point');
+ }
}
});
diff --git a/src/mmw/js/src/draw/templates/delineationOptions.html b/src/mmw/js/src/draw/templates/delineationOptions.html
index b340e3bf8..a2657ec57 100644
--- a/src/mmw/js/src/draw/templates/delineationOptions.html
+++ b/src/mmw/js/src/draw/templates/delineationOptions.html
@@ -19,7 +19,7 @@
- Mid-Atlantic Medium Resolution Continental US Medium Resolution
diff --git a/src/mmw/js/src/draw/tests.js b/src/mmw/js/src/draw/tests.js
index 9e1154ae2..eb17723bd 100644
--- a/src/mmw/js/src/draw/tests.js
+++ b/src/mmw/js/src/draw/tests.js
@@ -16,9 +16,15 @@ var $ = require('jquery'),
var sandboxId = 'sandbox',
sandboxSelector = '#' + sandboxId,
+ // City Hall
TEST_SHAPE = {
'type': 'MultiPolygon',
- 'coordinates': [[[-5e6, -1e6], [-4e6, 1e6], [-3e6, -1e6]]]
+ 'coordinates': [[[
+ [-75.16472339630127, 39.953446247674904],
+ [-75.16255617141724, 39.95311727224624],
+ [-75.16287803649902, 39.95161218948083],
+ [-75.16518473625183, 39.95194939669509],
+ [-75.16472339630127, 39.953446247674904]]]]
};
var SandboxRegion = Marionette.Region.extend({
diff --git a/src/mmw/js/src/draw/utils.js b/src/mmw/js/src/draw/utils.js
index d3488d376..31f4f927c 100644
--- a/src/mmw/js/src/draw/utils.js
+++ b/src/mmw/js/src/draw/utils.js
@@ -2,7 +2,12 @@
var $ = require('jquery'),
L = require('leaflet'),
- _ = require('lodash');
+ _ = require('lodash'),
+ turfArea = require('turf-area'),
+ coreUtils = require('../core/utils');
+
+// Keep in sync with src/api/main.py in rapid-watershed-delineation.
+var MAX_AREA = 112700; // About the size of a large state (in km^2)
var polygonDefaults = {
fillColor: '#E77471',
@@ -67,16 +72,41 @@ function placeMarker(map, drawOpts) {
return defer.promise();
}
+function createRwdMarkerIcon(iconName) {
+ return L.divIcon({
+ className: 'marker-rwd marker-rwd-' + iconName,
+ iconSize: [16,16]
+ });
+}
+
// Cancel any previous draw action in progress.
function cancelDrawing(map) {
map.fire('draw:drawstop');
}
+// Return shape area in km2.
+function shapeArea(shape) {
+ return coreUtils.changeOfAreaUnits(turfArea(shape),
+ 'm
2', 'km
2');
+}
+
+function isValidForAnalysis(shape) {
+ if (shape) {
+ var area = shapeArea(shape);
+ return area > 0 && area <= MAX_AREA;
+ }
+ return false;
+}
+
module.exports = {
drawPolygon: drawPolygon,
placeMarker: placeMarker,
+ createRwdMarkerIcon: createRwdMarkerIcon,
cancelDrawing: cancelDrawing,
polygonDefaults: polygonDefaults,
+ shapeArea: shapeArea,
+ isValidForAnalysis: isValidForAnalysis,
NHD: 'nhd',
DRB: 'drb',
+ MAX_AREA: MAX_AREA
};
diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js
index 052d08c2e..177fcfe0e 100644
--- a/src/mmw/js/src/draw/views.js
+++ b/src/mmw/js/src/draw/views.js
@@ -4,7 +4,6 @@ var $ = require('jquery'),
_ = require('lodash'),
L = require('leaflet'),
Marionette = require('../../shim/backbone.marionette'),
- turfArea = require('turf-area'),
turfBboxPolygon = require('turf-bbox-polygon'),
turfDestination = require('turf-destination'),
turfIntersect = require('turf-intersect'),
@@ -14,6 +13,7 @@ var $ = require('jquery'),
utils = require('./utils'),
models = require('./models'),
coreUtils = require('../core/utils'),
+ drawUtils = require('../draw/utils'),
toolbarTmpl = require('./templates/toolbar.html'),
loadingTmpl = require('./templates/loading.html'),
selectTypeTmpl = require('./templates/selectType.html'),
@@ -24,9 +24,18 @@ var $ = require('jquery'),
modalModels = require('../core/modals/models'),
modalViews = require('../core/modals/views');
-var MAX_AREA = 112700; // About the size of a large state (in km^2)
var codeToLayer = {}; // code to layer mapping
+function displayAlert(message, alertType) {
+ var alertView = new modalViews.AlertView({
+ model: new modalModels.AlertModel({
+ alertMessage: message,
+ alertType: alertType
+ })
+ });
+ alertView.render();
+}
+
function actOnUI(datum, bool) {
var code = datum.code,
$el = $('[data-layer-code="' + code + '"]');
@@ -49,7 +58,8 @@ function validateRwdShape(result) {
var d = new $.Deferred();
if (result.watershed) {
if (result.watershed.features[0].geometry.type === 'MultiPolygon') {
- d.reject('Unable to generate a valid watershed area at this location');
+ d.reject('Unfortunately, the watershed generated at this ' +
+ 'location is not available for analysis');
}
validateShape(result.watershed)
.done(function() {
@@ -64,36 +74,21 @@ function validateRwdShape(result) {
}
function validateShape(polygon) {
- var area = coreUtils.changeOfAreaUnits(turfArea(polygon), 'm
2', 'km
2'),
- d = new $.Deferred();
- var selfIntersectingShape = turfKinks(polygon).features.length > 0;
- var alertView;
+ var d = new $.Deferred(),
+ selfIntersectingShape = turfKinks(polygon).features.length > 0;
if (selfIntersectingShape) {
var errorMsg = 'This watershed shape is invalid because it intersects ' +
'itself. Try drawing the shape again without crossing ' +
'over its own border.';
- alertView = new modalViews.AlertView({
- model: new modalModels.AlertModel({
- alertMessage: errorMsg,
- alertType: modalModels.AlertTypes.warn
- })
- });
-
- alertView.render();
d.reject(errorMsg);
- } else if (area > MAX_AREA) {
- var message = 'Sorry, your Area of Interest is too large.\n\n' +
- Math.floor(area).toLocaleString() + ' km² were selected, ' +
- 'but the maximum supported size is currently ' +
- MAX_AREA.toLocaleString() + ' km².';
- alertView = new modalViews.AlertView({
- model: new modalModels.AlertModel({
- alertMessage: message,
- alertType: modalModels.AlertTypes.warn
- })
- });
- alertView.render();
+ } else if (!utils.isValidForAnalysis(polygon)) {
+ var maxArea = utils.MAX_AREA.toLocaleString(),
+ selectedArea = Math.floor(utils.shapeArea(polygon)).toLocaleString(),
+ message = 'Sorry, the area you have delineated is too large ' +
+ 'to analyze or model. ' + selectedArea + ' km² were ' +
+ 'selected, but the maximum supported size is ' +
+ 'currently ' + maxArea + ' km².';
d.reject(message);
} else {
d.resolve(polygon);
@@ -107,21 +102,21 @@ function validatePointWithinDataSourceBounds(latlng, dataSource) {
perimeter = null,
point_outside_message = null;
- switch (dataSource) {
- case utils.DRB:
- var streamLayers = settings.get('stream_layers');
- perimeter = _.findWhere(streamLayers, {code:'drb_streams_v2'}).perimeter;
- point_outside_message = 'Selected point is outside the Delaware River Basin';
- break;
- case utils.NHD:
- perimeter = settings.get('nhd_perimeter');
- point_outside_message = 'Selected point is outside the NHD Mid-Atlantic Region';
- break;
- default:
- var message = 'Not a valid data source';
- d.reject(message);
- return d.promise();
- }
+ switch (dataSource) {
+ case utils.DRB:
+ var streamLayers = settings.get('stream_layers');
+ perimeter = _.findWhere(streamLayers, {code:'drb_streams_v2'}).perimeter;
+ point_outside_message = 'Selected point is outside the Delaware River Basin';
+ break;
+ case utils.NHD:
+ // Bounds checking disabled until #1656 is complete.
+ d.resolve(latlng);
+ return d.promise();
+ default:
+ var message = 'Not a valid data source';
+ d.reject(message);
+ return d.promise();
+ }
if (turfIntersect(point, perimeter)) {
d.resolve(latlng);
@@ -330,8 +325,9 @@ var DrawView = Marionette.ItemView.extend({
.then(function(shape) {
addLayer(shape);
navigateToAnalyze();
- }).fail(function() {
+ }).fail(function(message) {
revertLayer();
+ displayAlert(message, modalModels.AlertTypes.error);
}).always(function() {
self.model.enableTools();
});
@@ -376,8 +372,9 @@ var DrawView = Marionette.ItemView.extend({
addLayer(box, '1 Square Km');
navigateToAnalyze();
- }).fail(function() {
+ }).fail(function(message) {
revertLayer();
+ displayAlert(message, modalModels.AlertTypes.error);
}).always(function() {
self.model.enableTools();
});
@@ -435,6 +432,16 @@ var WatershedDelineationView = Marionette.ItemView.extend({
.then(function(latlng) {
return validatePointWithinDataSourceBounds(latlng, dataSource);
})
+ .then(function(latlng) {
+ // Set `rwd-original-point` in the model so it can be
+ // removed when the deferred chain completes.
+ var rwdClickedPoint = L.marker(latlng, {
+ icon: drawUtils.createRwdMarkerIcon('original-point')
+ }).bindPopup('Original clicked outlet point');
+ self.model.set('rwd-original-point', rwdClickedPoint);
+ rwdClickedPoint.addTo(map);
+ return latlng;
+ })
.then(function(latlng) {
return self.delineateWatershed(latlng, snappingOn, dataSource);
})
@@ -446,19 +453,11 @@ var WatershedDelineationView = Marionette.ItemView.extend({
navigateToAnalyze();
})
.fail(function(message) {
- clearAoiLayer();
- if (message) {
- var alertView = new modalViews.AlertView({
- model: new modalModels.AlertModel({
- alertMessage: message,
- alertType: modalModels.AlertTypes.error
- })
- });
-
- alertView.render();
- }
+ displayAlert(message, modalModels.AlertTypes.warn);
})
.always(function() {
+ self.model.clearRwdClickedPoint(map);
+
self.model.enableTools();
});
},
@@ -475,9 +474,18 @@ var WatershedDelineationView = Marionette.ItemView.extend({
pollSuccess: function(response) {
self.model.set('polling', false);
- var result = JSON.parse(response.result);
- // Convert watershed to MultiPolygon to pass shape validation.
- result.watershed = coreUtils.toMultiPolygon(result.watershed);
+
+ var result;
+ try {
+ result = JSON.parse(response.result);
+ } catch (ex) {
+ return this.pollFailure();
+ }
+
+ if (result.watershed) {
+ // Convert watershed to MultiPolygon to pass shape validation.
+ result.watershed = coreUtils.toMultiPolygon(result.watershed);
+ }
deferred.resolve(result);
},
@@ -559,6 +567,7 @@ var ResetDrawView = Marionette.ItemView.extend({
},
resetDrawingState: function() {
+ this.model.clearRwdClickedPoint(App.getLeafletMap());
this.rwdTaskModel.reset();
this.model.set({
polling: false,
@@ -643,15 +652,22 @@ function getShapeAndAnalyze(e, model, ofg, grid, layerCode, layerName) {
function clearAoiLayer() {
var projectNumber = App.projectNumber,
- previousShape = App.map.get('areaOfInterest');
+ previousShape = App.map.get('areaOfInterest'),
+ previousShapeName = App.map.get('areaOfInterestName');
- App.map.set('areaOfInterest', null);
+ App.map.set({
+ 'areaOfInterest': null,
+ 'areaOfInterestName': ''
+ });
App.projectNumber = undefined;
App.map.setDrawSize(false);
App.clearAnalyzeCollection();
return function revertLayer() {
- App.map.set('areaOfInterest', previousShape);
+ App.map.set({
+ 'areaOfInterest': previousShape,
+ 'areaOfInterestName': previousShapeName
+ });
App.projectNumber = projectNumber;
};
}
diff --git a/src/mmw/js/src/main.js b/src/mmw/js/src/main.js
index 5bce7c235..b858449f6 100644
--- a/src/mmw/js/src/main.js
+++ b/src/mmw/js/src/main.js
@@ -23,7 +23,7 @@ App.on('start', function() {
// Show login modal only if landing on home page
if (Backbone.history.getFragment() === '') {
- this.getUserOrShowLogin();
+ this.getUserOrShowLoginIfNotItsiEmbed();
} else {
this.user.fetch();
}
diff --git a/src/mmw/js/src/modeling/gwlfe/quality/templates/result.html b/src/mmw/js/src/modeling/gwlfe/quality/templates/result.html
index 06d8a9895..7f1c21e39 100644
--- a/src/mmw/js/src/modeling/gwlfe/quality/templates/result.html
+++ b/src/mmw/js/src/modeling/gwlfe/quality/templates/result.html
@@ -1 +1,6 @@
+
+ Average annual loads
+ from 30-years of daily fluxes
+ simulated by the GWLF-E (MapShed) model.
+
diff --git a/src/mmw/js/src/modeling/gwlfe/runoff/templates/result.html b/src/mmw/js/src/modeling/gwlfe/runoff/templates/result.html
index 233917277..ad0ebb5d6 100644
--- a/src/mmw/js/src/modeling/gwlfe/runoff/templates/result.html
+++ b/src/mmw/js/src/modeling/gwlfe/runoff/templates/result.html
@@ -1,3 +1,8 @@
+
+ Average monthly water fluxes in centimeters
+ from 30-years of daily water balance
+ simulated by the GWLF-E (MapShed) model.
+
diff --git a/src/mmw/js/src/modeling/tests.js b/src/mmw/js/src/modeling/tests.js
index 9837ef573..add0276e0 100644
--- a/src/mmw/js/src/modeling/tests.js
+++ b/src/mmw/js/src/modeling/tests.js
@@ -675,14 +675,14 @@ describe('Modeling', function() {
});
model.updateModificationHash();
- assert.equal(model.get('modification_hash'), '65af065d7205cd998aeb0bf15c41f256');
+ assert.equal(model.get('modification_hash'), '582b6178186440159bd4ea25f0260892');
var mod = new models.ModificationModel(mocks.modifications.sample2);
model.get('modifications').add(mod);
- assert.equal(model.get('modification_hash'), 'ae69e823f926824a2fc22d9a5f1ea62c');
+ assert.equal(model.get('modification_hash'), 'd95d0c983f0e3d0b171aaa0a84540205');
model.get('modifications').remove(mod);
- assert.equal(model.get('modification_hash'), '65af065d7205cd998aeb0bf15c41f256');
+ assert.equal(model.get('modification_hash'), '582b6178186440159bd4ea25f0260892');
});
it('is called when the modifications for a scenario changes', function() {
@@ -963,6 +963,49 @@ describe('Modeling', function() {
assert.isTrue(spyAlert.calledOnce);
assert.equal(collection.at(1).get('name'), 'New Scenario 1');
});
+
+ it('will not show error when trying to save name as is', function() {
+ var collection = getTestScenarioCollection(),
+ view = new views.ScenarioTabPanelsView({ collection: collection });
+
+ view.render();
+ var childViews = _.values(view.children._views);
+
+ childViews[1].ui.rename.trigger('click');
+ childViews[1].ui.nameField.text('New Scenario 1');
+ childViews[1].ui.nameField.trigger('blur');
+
+ assert.isFalse(spyAlert.calledOnce);
+ assert.equal(collection.at(1).get('name'), 'New Scenario 1');
+ });
+
+ it('resets name if set to empty string', function() {
+ var collection = getTestScenarioCollection(),
+ view = new views.ScenarioTabPanelsView({ collection: collection });
+
+ view.render();
+ var childViews = _.values(view.children._views);
+
+ childViews[1].ui.rename.trigger('click');
+ childViews[1].ui.nameField.text('');
+ childViews[1].ui.nameField.trigger('blur');
+
+ assert.equal(collection.at(1).get('name'), 'New Scenario 1');
+ });
+
+ it('resets name if set to just spaces', function() {
+ var collection = getTestScenarioCollection(),
+ view = new views.ScenarioTabPanelsView({ collection: collection });
+
+ view.render();
+ var childViews = _.values(view.children._views);
+
+ childViews[1].ui.rename.trigger('click');
+ childViews[1].ui.nameField.text(' ');
+ childViews[1].ui.nameField.trigger('blur');
+
+ assert.equal(collection.at(1).get('name'), 'New Scenario 1');
+ });
});
describe('#duplicateScenario', function() {
diff --git a/src/mmw/js/src/modeling/tr55/quality/templates/result.html b/src/mmw/js/src/modeling/tr55/quality/templates/result.html
index 1b9351752..72808f68d 100644
--- a/src/mmw/js/src/modeling/tr55/quality/templates/result.html
+++ b/src/mmw/js/src/modeling/tr55/quality/templates/result.html
@@ -1,2 +1,6 @@
+
+ Total loads delivered in a 24-hour hypothetical storm event
+ as simulated by EPA's STEP-L model algorithms.
+
diff --git a/src/mmw/js/src/modeling/tr55/runoff/templates/result.html b/src/mmw/js/src/modeling/tr55/runoff/templates/result.html
index 011f052a6..658e05d86 100644
--- a/src/mmw/js/src/modeling/tr55/runoff/templates/result.html
+++ b/src/mmw/js/src/modeling/tr55/runoff/templates/result.html
@@ -1,2 +1,6 @@
+
+ Results of a 24-hour hypothetical storm event
+ as simulated by SLAMM and TR-55 model algorithms.
+
diff --git a/src/mmw/js/src/modeling/views.js b/src/mmw/js/src/modeling/views.js
index dd0a5cc1b..92bc3aaaf 100644
--- a/src/mmw/js/src/modeling/views.js
+++ b/src/mmw/js/src/modeling/views.js
@@ -196,7 +196,7 @@ var ProjectMenuView = Marionette.ItemView.extend({
.fail(function() {
var alertView = new modalViews.AlertView({
model: new modalModels.AlertModel({
- alertMessage: 'Could not delete this project.',
+ alertMessage: 'Could not delete this project.',
alertType: modalModels.AlertTypes.error
})
});
@@ -399,7 +399,9 @@ var ScenarioTabPanelView = Marionette.ItemView.extend({
return model.get('name').toLowerCase() === newName.toLowerCase();
});
- if (match) {
+ if (model.get('name') === newName || !newName){
+ return false;
+ } else if (match) {
console.log('This name is already in use.');
var alertView = new modalViews.AlertView({
model: new modalModels.AlertModel({
@@ -411,17 +413,27 @@ var ScenarioTabPanelView = Marionette.ItemView.extend({
alertView.render();
return false;
- } else if (model.get('name') !== newName) {
+ } else {
return model.set('name', newName);
}
},
- setScenarioName = function(name) {
- if (!updateScenarioName(self.model, name)) {
- self.render(); // resets view state
- }
- };
+ setScenarioName = function(name) {
+ if (!updateScenarioName(self.model, name)) {
+ self.render(); // resets view state
+ }
+ },
+
+ selectScenarioTabText = function() {
+ // Select scenario name's text
+ var range = document.createRange(),
+ selection = window.getSelection();
+ range.selectNodeContents(self.ui.nameField[0]);
+ selection.removeAllRanges();
+ selection.addRange(range);
+ };
+ selectScenarioTabText();
this.ui.nameField.attr('contenteditable', true).focus();
this.ui.nameField.on('keyup', function(e) {
@@ -441,6 +453,12 @@ var ScenarioTabPanelView = Marionette.ItemView.extend({
}
});
+ this.ui.nameField.on('click', function(e) {
+ // Don't let the outer
swallow clicks and exit rename mode
+ // Allows selecting text on double click
+ e.stopImmediatePropagation();
+ });
+
this.ui.nameField.on('blur', function() {
setScenarioName($(this).text());
});
diff --git a/src/mmw/js/src/user/views.js b/src/mmw/js/src/user/views.js
index 6d6339b9e..8941397f6 100644
--- a/src/mmw/js/src/user/views.js
+++ b/src/mmw/js/src/user/views.js
@@ -246,7 +246,7 @@ var LoginModalView = ModalBaseView.extend({
var loginURL = '/user/itsi/login?next=/' + Backbone.history.getFragment();
if (window.clientSettings.itsi_embed) {
- loginURL = '/?itsi_embed=true&next=/' + Backbone.history.getFragment();
+ loginURL += '&itsi_embed=true';
}
window.location.href = loginURL;
}
diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py
index 7d0095383..3c088e0c6 100644
--- a/src/mmw/mmw/settings/base.py
+++ b/src/mmw/mmw/settings/base.py
@@ -12,7 +12,8 @@
from os.path import abspath, basename, dirname, join, normpath
from sys import path
-from layer_settings import LAYERS, VIZER_URLS, NHD_REGION2_PERIMETER, DRB_PERIMETER # NOQA
+from layer_settings import (LAYERS, VIZER_URLS, VIZER_IGNORE, VIZER_NAMES,
+ NHD_REGION2_PERIMETER, DRB_PERIMETER) # NOQA
from gwlfe_settings import (GWLFE_DEFAULTS, GWLFE_CONFIG, SOIL_GROUP, # NOQA
SOILP, CURVE_NUMBER) # NOQA
diff --git a/src/mmw/mmw/settings/layer_settings.py b/src/mmw/mmw/settings/layer_settings.py
index 7c6b074cb..edb5806c9 100644
--- a/src/mmw/mmw/settings/layer_settings.py
+++ b/src/mmw/mmw/settings/layer_settings.py
@@ -41,6 +41,7 @@
NHD_REGION2_PERIMETER = json.load(nhd_region2_simple_perimeter_file)
+NEW_LINE_AND_TAB = '
'
LAYERS = [
{
@@ -144,7 +145,7 @@
{
'code': 'nhd_streams_v2',
'display': ('Continental US Medium Resolution' +
- '
Stream Network'),
+ NEW_LINE_AND_TAB + 'Stream Network'),
'table_name': 'nhdflowline',
'stream': True,
'overlay': True,
@@ -153,7 +154,7 @@
{
'code': 'drb_streams_v2',
'display': ('Delaware River Basin High Resolution' +
- '
Stream Network'),
+ NEW_LINE_AND_TAB + 'Stream Network'),
'table_name': 'drb_streams_50',
'stream': True,
'overlay': True,
@@ -162,24 +163,27 @@
# overlaps with perimeter polygon.
},
{
- 'code': 'nhd_quality_tp',
- 'display': 'Delaware River Basin TP Concentration',
- 'table_name': 'nhd_quality_tp',
+ 'code': 'nhd_quality_tn',
+ 'display': ('Delaware River Basin TN Concentration' +
+ NEW_LINE_AND_TAB + 'From SRAT'),
+ 'table_name': 'nhd_quality_tn',
'stream': True,
'overlay': True,
'minZoom': 3
},
{
- 'code': 'nhd_quality_tn',
- 'display': 'Delaware River Basin TN Concentration',
- 'table_name': 'nhd_quality_tn',
+ 'code': 'nhd_quality_tp',
+ 'display': ('Delaware River Basin TP Concentration' +
+ NEW_LINE_AND_TAB + 'From SRAT'),
+ 'table_name': 'nhd_quality_tp',
'stream': True,
'overlay': True,
'minZoom': 3
},
{
'code': 'nhd_quality_tss',
- 'display': 'Delaware River Basin TSS Concentration',
+ 'display': ('Delaware River Basin TSS Concentration' +
+ NEW_LINE_AND_TAB + 'From SRAT'),
'table_name': 'nhd_quality_tss',
'stream': True,
'overlay': True,
@@ -199,7 +203,7 @@
'has_opacity_slider': True
},
{
- 'display': 'Hydrologic Soil Groups',
+ 'display': 'Hydrologic Soil Groups From gSSURGO',
'short_display': 'SSURGO',
'helptext': 'Soils are classified by the Natural Resource Conservation '
'Service into four Hydrologic Soil Groups based on the '
@@ -278,7 +282,7 @@
{
'code': 'drb_catchment_water_quality_tn',
'display': ('DRB Catchment Water Quality Data' +
- '
TN Loading Rates'),
+ NEW_LINE_AND_TAB + 'TN Loading Rates from SRAT Catchments'),
'table_name': 'drb_catchment_water_quality_tn',
'raster': True,
'overlay': True,
@@ -290,7 +294,7 @@
{
'code': 'drb_catchment_water_quality_tp',
'display': ('DRB Catchment Water Quality Data' +
- '
TP Loading Rates'),
+ NEW_LINE_AND_TAB + 'TP Loading Rates from SRAT Catchments'),
'table_name': 'drb_catchment_water_quality_tp',
'raster': True,
'overlay': True,
@@ -302,7 +306,7 @@
{
'code': 'drb_catchment_water_quality_tss',
'display': ('DRB Catchment Water Quality Data' +
- '
TSS Loading Rates'),
+ NEW_LINE_AND_TAB + 'TSS Loading Rates from SRAT Catchments'),
'table_name': 'drb_catchment_water_quality_tss',
'raster': True,
'overlay': True,
@@ -327,3 +331,17 @@
'variable': VIZER_ROOT + 'opt=data&asset_id={{asset_id}}&var_id={{var_id}}' + VIZER_TYPE_PARAM, # NOQA
'recent': VIZER_ROOT + 'opt=recent_values&asset_id={{asset_id}}&var_id=all' + VIZER_TYPE_PARAM # NOQA
}
+
+# To hide elements from the UI
+VIZER_IGNORE = [
+ 'CRBCZO',
+ 'SWRC',
+ 'USCRN'
+]
+
+# To give friendly names in the UI
+VIZER_NAMES = {
+ 'DEOS': 'Delaware Environmental Observing System',
+ 'NOS/CO-OPS': 'NOAA Tides and Currents',
+ 'USGS': 'USGS National Water Information System'
+}
diff --git a/src/mmw/sass/pages/_model.scss b/src/mmw/sass/pages/_model.scss
index e88d62127..4a73733b8 100644
--- a/src/mmw/sass/pages/_model.scss
+++ b/src/mmw/sass/pages/_model.scss
@@ -49,6 +49,11 @@
height: 100%;
width: 100%;
+ .result-text {
+ font-size: 0.8rem;
+ margin-bottom: 20px;
+ }
+
.mean-flow {
font-size: 16px;
}
diff --git a/src/mmw/sass/pages/_search-map.scss b/src/mmw/sass/pages/_search-map.scss
index 6a1986d8e..65695a193 100644
--- a/src/mmw/sass/pages/_search-map.scss
+++ b/src/mmw/sass/pages/_search-map.scss
@@ -2,7 +2,6 @@
#search-map {
position: absolute;
top: 0;
- left: 30px;
z-index: 100;
padding: 1rem;
diff --git a/src/tiler/server.js b/src/tiler/server.js
index a5a12676f..ba313ef4a 100644
--- a/src/tiler/server.js
+++ b/src/tiler/server.js
@@ -103,6 +103,8 @@ var interactivity = {
stream_order = 6;
} else if (zoom <= 8) {
stream_order = 5;
+ } else if (zoom <= 9) {
+ stream_order = 4;
}
}
diff --git a/src/tiler/styles.mss b/src/tiler/styles.mss
index 3b55d8a90..4fbd55b51 100644
--- a/src/tiler/styles.mss
+++ b/src/tiler/styles.mss
@@ -155,7 +155,7 @@
}
}
-#drb_streams_50[zoom<=4],
+
#nhdflowline[zoom<=4],
#nhd_quality_tp[zoom<=4],
#nhd_quality_tn[zoom<=4],
@@ -171,7 +171,7 @@
}
}
-#drb_streams_50[zoom>=5][zoom<=6],
+
#nhdflowline[zoom>=5][zoom<=6],
#nhd_quality_tp[zoom>=5][zoom<=6],
#nhd_quality_tn[zoom>=5][zoom<=6],
@@ -187,7 +187,7 @@
}
}
-#drb_streams_50[zoom>=7][zoom<=8],
+
#nhdflowline[zoom>=7][zoom<=8],
#nhd_quality_tp[zoom>=7][zoom<=8],
#nhd_quality_tn[zoom>=7][zoom<=8],
@@ -206,7 +206,7 @@
}
}
-#drb_streams_50[zoom>=9][zoom<=10],
+
#nhdflowline[zoom>=9][zoom<=10],
#nhd_quality_tp[zoom>=9][zoom<=10],
#nhd_quality_tn[zoom>=9][zoom<=10],
@@ -221,11 +221,11 @@
line-width: 5.0 * @zoomBase;
}
[stream_order=3] {
- line-width: 4.0 * @zoomBase;
+ line-width: 3.0 * @zoomBase;
}
}
-#drb_streams_50[zoom>=11][zoom<=12],
+
#nhdflowline[zoom>=11][zoom<=12],
#nhd_quality_tp[zoom>=11][zoom<=12],
#nhd_quality_tn[zoom>=11][zoom<=12],
@@ -251,7 +251,7 @@
}
-#drb_streams_50[zoom>=13],
+
#nhdflowline[zoom>=13],
#nhd_quality_tp[zoom>=13],
#nhd_quality_tn[zoom>=13],
@@ -272,3 +272,98 @@
line-width: 5.0 * @zoomBase;
}
}
+
+#drb_streams_50[zoom<=4]{
+ [stream_order=10] {
+ line-width: 3.0 * @zoomBase;
+ }
+ [stream_order=9] {
+ line-width: 3.0 * @zoomBase;
+ }
+ [stream_order<=8] {
+ line-width: 2.0 * @zoomBase;
+ }
+}
+
+#drb_streams_50[zoom>=5][zoom<=6]{
+ [stream_order=10] {
+ line-width: 4.0 * @zoomBase;
+ }
+ [stream_order=9] {
+ line-width: 3.0 * @zoomBase;
+ }
+ [stream_order<=8] {
+ line-width: 2.0 * @zoomBase;
+ }
+}
+
+#drb_streams_50[zoom>=7][zoom<=8]{
+ [stream_order>=9] {
+ line-width: 7.0 * @zoomBase;
+ }
+ [stream_order<=8][stream_order>=7] {
+ line-width: 4.0 * @zoomBase;
+ }
+ [stream_order<=6] {
+ line-width: 3.0 * @zoomBase;
+ }
+ [stream_order=5] {
+ line-width: 2.0 * @zoomBase;
+ }
+}
+
+#drb_streams_50[zoom>=9][zoom<=10]{
+ [stream_order>=9] {
+ line-width: 10.0 * @zoomBase;
+ }
+ [stream_order<=8][stream_order>=6] {
+ line-width: 5.0 * @zoomBase;
+ }
+ [stream_order<=5][stream_order>=4] {
+ line-width: 3.0 * @zoomBase;
+ }
+ [stream_order=3] {
+ line-width: 2.0 * @zoomBase;
+ }
+}
+
+#drb_streams_50[zoom>=11][zoom<=12] {
+ [stream_order>=9] {
+ line-width: 12.0 * @zoomBase;
+ }
+ [stream_order<=8][stream_order>=6] {
+ line-width: 10.0 * @zoomBase;
+ }
+ [stream_order<=5][stream_order>=4] {
+ line-width: 6.0 * @zoomBase;
+ }
+ [stream_order=3] {
+ line-width: 5.0 * @zoomBase;
+ }
+ [stream_order=2] {
+ line-width: 4.0 * @zoomBase;
+ }
+ [stream_order<=1][stream_order>=0] {
+ line-width: 3.0 * @zoomBase;
+ }
+}
+#drb_streams_50[zoom>=13]{
+ [stream_order>=9] {
+ line-width: 14.0 * @zoomBase;
+ }
+ [stream_order<=8][stream_order>=6] {
+ line-width: 11.0 * @zoomBase;
+ }
+ [stream_order<=5][stream_order>=4] {
+ line-width: 8.0 * @zoomBase;
+ }
+ [stream_order=3] {
+ line-width: 5.0 * @zoomBase;
+ }
+ [stream_order=2] {
+ line-width: 4.0 * @zoomBase;
+ }
+ [stream_order<=1][stream_order>=0] {
+ line-width: 3.0 * @zoomBase;
+ }
+}