DDF-2644 Add validation to location model

 - Validation is now applied to point radius, line, and bbox drawing.  Point radius lat / lon are validated, as well as the radius value itself.  Line width is now validated.  BBox lat / lon values are validated.
 - Added try catch to usng code to prevent errors for special cases (outside -80 and 84 degrees).  These are still valid outside usng, so we shouldn't be preventing them.  They're also valid in usng technically, we just don't offer support yet.

Author: andrewkfiedler

catalog/ui/catalog-ui-search/src/main/webapp/component/location-old/location-old.hbs

@@ -24,7 +24,7 @@
         <i class="fa fa-circle-o"></i>
         Polygon
     </label>
-    <label id="locationPoint" class="btn location {{#if radius}}active{{/if}}" data-target="#pointradius{{cid}}" data-toggle="tab">
+    <label id="locationPoint" class="btn location {{#if lat}}active{{/if}}" data-target="#pointradius{{cid}}" data-toggle="tab">
         <input type="radio" name="pointRadiusButton">
         <i class="fa fa-circle"></i>
         <i class="fa fa-circle-o"></i>
@@ -83,7 +83,7 @@
         </div>
     </div>
 
-    <div id="pointradius{{cid}}" class="tab-pane {{#if radius}}active{{/if}}">
+    <div id="pointradius{{cid}}" class="tab-pane {{#if lat}}active{{/if}}">
         <input type="hidden" name="radius" value="{{radius}}">
 
         <div class="col-lg-10">

catalog/ui/catalog-ui-search/src/main/webapp/component/location-old/location-old.js

@@ -15,10 +15,58 @@ define([
     'backbone',
     'wellknown',
     'usngs',
-    'js/store'
-], function (_, Backbone, wellknown, usngs, store) {
+    'js/store',
+    'js/Common'
+], function (_, Backbone, wellknown, usngs, store, Common) {
 
     var converter = new usngs.Converter();
+    var minimumDifference = 0.0001;
+    var minimumBuffer = 0.000001;
+
+    function convertToValid(key, model){
+        if (key.mapSouth !== undefined && (key.mapSouth >= key.mapNorth || key.mapSouth >= model.get('mapNorth'))){
+            key.mapSouth = parseFloat((key.mapNorth || model.get('mapNorth'))) - minimumDifference;
+        }
+        if (key.mapEast !== undefined && (key.mapEast <= key.mapWest || key.mapEast <= model.get('mapWest'))){
+            key.mapEast = parseFloat((key.mapWest || model.get('mapWest'))) + minimumDifference;
+        }
+        if (key.mapWest !== undefined && (key.mapWest >= key.mapEast || key.mapWest >= model.get('mapEast'))){
+            key.mapWest = parseFloat((key.mapEast || model.get('mapEast'))) - minimumDifference;
+        }
+        if (key.mapNorth !== undefined && (key.mapNorth <= key.mapSouth || key.mapNorth <= model.get('mapSouth'))){
+            key.mapNorth = parseFloat((key.mapSouth || model.get('mapSouth'))) + minimumDifference;
+        }
+        if (key.mapNorth !== undefined){
+            key.mapNorth = Math.max(-90 + minimumDifference, key.mapNorth);
+            key.mapNorth = Math.min(90, key.mapNorth);
+        }
+        if (key.mapSouth !== undefined){
+            key.mapSouth = Math.max(-90, key.mapSouth);
+            key.mapSouth = Math.min(90 - minimumDifference, key.mapSouth);
+        }
+        if (key.mapWest !== undefined){
+            key.mapWest = Math.max(-180, key.mapWest);
+            key.mapWest = Math.min(180 - minimumDifference, key.mapWest);
+        }
+        if (key.mapEast !== undefined){
+            key.mapEast = Math.max(-180 + minimumDifference, key.mapEast);
+            key.mapEast = Math.min(180, key.mapEast);
+        }
+        if (key.lat !== undefined){
+            key.lat = Math.max(-90, key.lat);
+            key.lat = Math.min(90, key.lat);
+        }
+        if (key.lon !== undefined){
+            key.lon = Math.max(-180, key.lon);
+            key.lon = Math.min(180, key.lon);
+        }
+        if (key.radius !== undefined){
+            key.radius = Math.max(minimumBuffer, key.radius);
+        }
+        if (key.lineWidth !== undefined){
+            key.lineWidth = Math.max(minimumBuffer, key.lineWidth);
+        }
+    }
 
     return Backbone.AssociatedModel.extend({
         defaults: {
@@ -32,7 +80,7 @@ define([
             mapWest: undefined,
             mapSouth: undefined,
             radiusUnits: 'meters',
-            radius: 0,
+            radius: 1,
             locationType: 'latlon',
             lat: undefined,
             lon: undefined,
@@ -44,6 +92,19 @@ define([
             lineWidth: 1,
             lineUnits: 'meters'
         },
+        set: function(key, value, options){
+            if (!_.isObject(key)){
+                var keyObject = {};
+                keyObject[key] = value;
+                key = keyObject;
+                value = options;
+            }
+            convertToValid(key, this);
+            Backbone.AssociatedModel.prototype.set.call(this, key, value, options);
+            Common.queueExecution(function(){
+                this.trigger('change', Object.keys(key));
+            }.bind(this));
+        },
         initialize: function(){
             this.listenTo(this, 'change:north change:south change:east change:west', this.setBBox);
             this.listenTo(this, 'change:locationType', this.handleLocationType);
@@ -110,11 +171,15 @@ define([
                 west = this.get('west'),
                 east = this.get('east');
             if (north && south && east && west) {
-                var usngsStr = converter.LLBboxtoUSNG(north, south, east, west);
+                try {
+                    var usngsStr = converter.LLBboxtoUSNG(north, south, east, west);
+
+                    this.set('usngbb', usngsStr, {silent: this.get('locationType') !== 'usng'});
+                    if (this.get('locationType') === 'usng' && this.drawing) {
+                        this.repositionLatLon();
+                    }
+                } catch(err){
 
-                this.set('usngbb', usngsStr, {silent: this.get('locationType') !== 'usng'});
-                if (this.get('locationType') === 'usng' && this.drawing) {
-                    this.repositionLatLon();
                 }
             }
         },
@@ -123,8 +188,12 @@ define([
             var lat = this.get('lat'),
                 lon = this.get('lon');
             if (lat && lon) {
-                var usngsStr = converter.LLtoUSNG(lat, lon, 5);
-                this.set('usng', usngsStr, {silent: true});
+                try {
+                    var usngsStr = converter.LLtoUSNG(lat, lon, 5);
+                    this.set('usng', usngsStr, {silent: true});
+                } catch(err){
+
+                }
             }
         },
 

catalog/ui/catalog-ui-search/src/main/webapp/component/location-old/location-old.view.js

@@ -28,6 +28,10 @@ define([
 ], function ($, Backbone, Marionette, _, properties, MetaCard, wreqr, template, maptype,
              store, CustomElements, LocationOldModel, CQLUtils) {
 
+    var minimumDifference = 0.0001;
+    var minimumBuffer = 0.000001;
+    var deltaThreshold = 0.0000001;
+
     return Marionette.ItemView.extend({
         template: template,
         tagName: CustomElements.register('location-old'),
@@ -40,8 +44,8 @@ define([
             'click #usng': 'swapLocationTypeUsng',
             'change #radiusUnits': 'onRadiusUnitsChanged',
             'change #lineUnits': 'onLineUnitsChanged',
-            'keydown input[id=radiusValue]': 'filterNonPositiveNumericValues',
-            'keydown input[id=lineWidthValue]': 'filterNonPositiveNumericValues'
+           // 'keydown input[id=radiusValue]': 'filterNonPositiveNumericValues',
+            //'keydown input[id=lineWidthValue]': 'filterNonPositiveNumericValues'
         },
         initialize: function (options) {
             this.propertyModel = this.model;
@@ -53,6 +57,17 @@ define([
         },
         setupListeners: function () {
             this.listenTo(this.propertyModel.get('property'), 'change:isEditing', this.handleEdit);
+            this.listenTo(this.model, 'change:mapNorth change:mapSouth change:mapEast change:mapWest', this.updateMaxAndMin);
+            this.listenTo(this.model, 'change', function(attrs){
+                this.modelBinder.copyModelAttributesToView(attrs);
+            }.bind(this));
+        },
+        updateMaxAndMin: function(){
+            this.$el.find('#mapWest').attr('max', parseFloat(this.model.get('mapEast')) - minimumDifference);
+            this.$el.find('#mapEast').attr('min', parseFloat(this.model.get('mapWest')) + minimumDifference);
+            this.$el.find('#mapNorth').attr('min', parseFloat(this.model.get('mapSouth')) + minimumDifference);
+            this.$el.find('#mapSouth').attr('max', parseFloat(this.model.get('mapNorth')) - minimumDifference);
+            this.model.setLatLon();
         },
         handleEdit: function () {
             if (this.propertyModel.get('property').get('isEditing')) {
@@ -144,7 +159,7 @@ define([
                 south: undefined,
                 lat: undefined,
                 lon: undefined,
-                radius: 0,
+                radius: 1,
                 bbox: undefined,
                 polygon: undefined,
                 usng: undefined,
@@ -210,10 +225,9 @@ define([
                     case 'ModelToView':
                         var distanceFromMeters = view.getDistanceFromMeters(view.model.get('radius'), radiusUnitVal);
                         var currentValue = this.boundEls[0].value;
-                        var deltaThreshold = 0.0000001;
                         // same used in cesium.bbox.js
-                        // only update the view's value if it's significantly different from the model's value
-                        return Math.abs(currentValue - distanceFromMeters) > deltaThreshold ? distanceFromMeters : currentValue;
+                        // only update the view's value if it's significantly different from the model's value or is <= minimumBuffer (min for cql)
+                        return (Math.abs((currentValue - distanceFromMeters)) > deltaThreshold) || currentValue <= minimumBuffer ? distanceFromMeters : currentValue;
                 }
             }, lineWidthConverter = function (direction, value) {
                 var lineUnitVal = view.model.get('lineUnits');
@@ -227,10 +241,9 @@ define([
                     case 'ModelToView':
                         var distanceFromMeters = view.getDistanceFromMeters(view.model.get('lineWidth'), lineUnitVal);
                         var currentValue = this.boundEls[0].value;
-                        var deltaThreshold = 0.0000001;
                         // same used in cesium.bbox.js
-                        // only update the view's value if it's significantly different from the model's value
-                        return Math.abs(currentValue - distanceFromMeters) > deltaThreshold ? distanceFromMeters : currentValue;
+                        // only update the view's value if it's significantly different from the model's value or is <= minimumBuffer (min for cql)
+                        return (Math.abs((currentValue - distanceFromMeters)) > deltaThreshold) || currentValue <= minimumBuffer ? distanceFromMeters : currentValue;
                 }
             }, polygonConverter = function (direction, value) {
                 if (value && direction === 'ViewToModel') {
@@ -362,8 +375,8 @@ define([
 
             return _.extend(modelJSON, {
                 type: type,
-                lineWidth: Math.max(modelJSON.lineWidth, 0.000001),
-                radius: Math.max(modelJSON.radius, 0.000001)
+                lineWidth: Math.max(modelJSON.lineWidth, minimumBuffer),
+                radius: Math.max(modelJSON.radius, minimumBuffer)
             });
         },
         onDestroy: function () {

catalog/ui/catalog-ui-search/src/main/webapp/component/login-form/login-form.hbs

@@ -13,7 +13,7 @@
  --}}
 <div class="login-container">
     {{#if user.isGuest}}
-        <form class="login-form">
+        <form class="login-form" novalidate>
             <div align="center" id="loginError" class="alert alert-error" style="display: none;">Credentials are invalid.</div>
 
             <input placeholder="Username" type="text" id="username" name="username" />

catalog/ui/catalog-ui-search/src/main/webapp/component/query-advanced/query-advanced.hbs

@@ -11,7 +11,7 @@
  *
  **/
  --}}
-<form target="autocomplete" action="about:blank">
+<form target="autocomplete" action="about:blank" novalidate>
     <div class="editor-properties">
         <div class="query-advanced-label">
             CQL

catalog/ui/catalog-ui-search/src/main/webapp/component/query-basic/query-basic.hbs

@@ -11,7 +11,7 @@
  *
  **/
  --}}
-<form target="autocomplete" action="about:blank">
+<form target="autocomplete" action="about:blank" novalidate>
     <div class="editor-properties">
         <div class="basic-text" data-help="Search by free text using the
     grammar of the underlying source.