Merge remote-tracking branch 'origin/actual' into origin/crop
MP-363: marco -> mp profile
MP-363 #comment Bring in MARCO's scenarios app
MP-363: #comment ignore upload folder
MP-363: #comment add scenarios to settings
MP-368, MP-363: #comment Add additional parameter.
MP-363 #comment Refactor, make form rendering driven by the form definition
MP-363 #comment Swap depth for bathy, update form
MP-429: Refactor
Checking if a filter is in the dict isn't necessary since relational operations on 'undefined' always return false.
Don't continue checking if we've already found a block.
MP-429: Now, loop over a list of filter names in a list.
MP-429: Continue checking if we've already found a block - we're doing an AND not an OR
MP-363 #comment Rename parameter
MP-363 #comment Refactor self.filters into map of param -> [ min, max ].
Remove temporary manual filters.
MP-363 #comment Remove manual negation to correct data (it doesn't match the geojson)
Instead, negated the data directly. New data will also have to be negated from now on.
MP-363 #comment Fix up the form. Almost everything is passed through by the form definition now.
MP-434 #comment Rename fields to match shape file
Comment old functions
MP-434 #comment Trim
MP-434 #comment Use OpenLayers' filters for everything so we don't have to maintain duplicate filtering code.
MP-434 #comment Update form, set some guesses at reasonable values.
MP-434 #comment Rename fields to match shape file