Merging master to c125_annotations

.travis.yml

@@ -12,4 +12,5 @@ before_install:
 branches:
   only:
     - master
+    - /^[cC]\d{3}[\w-]*/
     - /^\d{4}\.\d{2}.\d{2}$/

package.json

@@ -123,7 +123,7 @@
     "leaflet.locatecontrol": "0.62.0",
     "leaflet.nontiledlayer": "1.0.7",
     "lodash": "4.16.6",
-    "moment": "2.13.0",
+    "moment": "2.21.0",
     "node-geo-distance": "1.2.0",
     "object-assign": "4.1.1",
     "ogc-schemas": "2.6.1",

project/custom/templates/web/src/main/resources/sample_categories.xml

@@ -6,4 +6,7 @@
     <Category>
         <name>THUMBNAIL</name>
     </Category>
+    <Category>
+        <name>DETAILS</name>
+    </Category>
 </CategoryList>

project/standard/templates/web/src/main/resources/sample_categories.xml

@@ -6,4 +6,7 @@
     <Category>
         <name>THUMBNAIL</name>
     </Category>
+    <Category>
+        <name>DETAILS</name>
+    </Category>
 </CategoryList>

web/client/api/GeoStoreDAO.js

@@ -162,28 +162,31 @@ const Api = {
                 }
             }, options)));
     },
-    updateResourcePermissions: function(resourceId, securityRules) {
-        let payload = "<SecurityRuleList>";
-        for (let rule of securityRules.SecurityRuleList.SecurityRule) {
+    writeSecurityRules: function(SecurityRuleList = {}) {
+        return "<SecurityRuleList>" +
+        (_.castArray(SecurityRuleList.SecurityRule) || []).map( rule => {
             if (rule.canRead || rule.canWrite) {
                 if (rule.user) {
-                    payload = payload + "<SecurityRule>";
-                    payload = payload + "<canRead>" + boolToString(rule.canRead || rule.canWrite) + "</canRead>";
-                    payload = payload + "<canWrite>" + boolToString(rule.canWrite) + "</canWrite>";
-                    payload = payload + "<user><id>" + (rule.user.id || "") + "</id><name>" + (rule.user.name || "") + "</name></user>";
-                    payload = payload + "</SecurityRule>";
+                    return "<SecurityRule>"
+                        + "<canRead>" + boolToString(rule.canRead || rule.canWrite) + "</canRead>"
+                        + "<canWrite>" + boolToString(rule.canWrite) + "</canWrite>"
+                        + "<user><id>" + (rule.user.id || "") + "</id><name>" + (rule.user.name || "") + "</name></user>"
+                        + "</SecurityRule>";
                 } else if (rule.group) {
-                    payload = payload + "<SecurityRule>";
-                    payload = payload + "<canRead>" + boolToString(rule.canRead || rule.canWrite) + "</canRead>";
-                    payload = payload + "<canWrite>" + boolToString(rule.canWrite) + "</canWrite>";
-                    payload = payload + "<group><id>" + (rule.group.id || "") + "</id><groupName>" + (rule.group.groupName || "") + "</groupName></group>";
-                    payload = payload + "</SecurityRule>";
+                    return "<SecurityRule>"
+                        + "<canRead>" + boolToString(rule.canRead || rule.canWrite) + "</canRead>"
+                        + "<canWrite>" + boolToString(rule.canWrite) + "</canWrite>"
+                        + "<group><id>" + (rule.group.id || "") + "</id><groupName>" + (rule.group.groupName || "") + "</groupName></group>"
+                        + "</SecurityRule>";
                 }
+                return "";
                 // NOTE: if rule has no group or user, it is skipped
                 // NOTE: if rule is "no read and no write", it is skipped
             }
-        }
-        payload = payload + "</SecurityRuleList>";
+        }).join('') + "</SecurityRuleList>";
+    },
+    updateResourcePermissions: function(resourceId, securityRules) {
+        const payload = Api.writeSecurityRules(securityRules.SecurityRuleList);
         return axios.post(
             "resources/resource/" + resourceId + "/permissions",
             payload,

web/client/api/__tests__/GeoStoreDAO-test.jsx

@@ -8,6 +8,62 @@
 
 const expect = require('expect');
 const API = require('../GeoStoreDAO');
+const SAMPLE_RULES = {
+   "SecurityRuleList": {
+      "SecurityRule": [
+         {
+            "canRead": true,
+            "canWrite": true,
+            "user": {
+               "id": 3,
+               "name": "admin"
+            }
+         },
+         {
+            "canRead": true,
+            "canWrite": true,
+            "group": {
+               "groupName": "geosolutions",
+               "id": 524
+            }
+         },
+         {
+            "canRead": true,
+            "canWrite": false,
+            "group": {
+               "groupName": "testers",
+               "id": 3956
+            }
+         }
+      ]
+   }
+};
+const SAMPLE_XML_RULES = "<SecurityRuleList>"
+    + "<SecurityRule>"
+        + "<canRead>true</canRead>"
+        + "<canWrite>true</canWrite>"
+        + "<user>"
+            + "<id>3</id>"
+            + "<name>admin</name>"
+        + "</user>"
+    + "</SecurityRule>"
+    + "<SecurityRule>"
+        + "<canRead>true</canRead>"
+        + "<canWrite>true</canWrite>"
+        + "<group>"
+            + "<id>524</id>"
+            + "<groupName>geosolutions</groupName>"
+        + "</group>"
+    + "</SecurityRule>"
+    + "<SecurityRule>"
+        + "<canRead>true</canRead>"
+        + "<canWrite>false</canWrite>"
+        + "<group>"
+            + "<id>3956</id>"
+            + "<groupName>testers</groupName>"
+        + "</group>"
+    + "</SecurityRule>"
++ "</SecurityRuleList>";
 
 describe('Test correctness of the GeoStore APIs', () => {
 
@@ -34,7 +90,6 @@ describe('Test correctness of the GeoStore APIs', () => {
         const user2 = API.utils.initUser(originalUser2);
         expect(user2.attribute.length).toBe(2);
     });
-
     it('test error parser', () => {
         expect(API.errorParser.mapsError({status: 409})).toEqual({
             title: 'map.mapError.errorTitle',
@@ -45,4 +100,8 @@ describe('Test correctness of the GeoStore APIs', () => {
             message: 'map.mapError.errorDefault'
         });
     });
+    it('test security rules utils (writeSecurityRules)', () => {
+        const payload = API.writeSecurityRules(SAMPLE_RULES.SecurityRuleList);
+        expect(payload).toBe(SAMPLE_XML_RULES);
+    });
 });

web/client/components/TOC/fragments/settings/FeatureInfoEditor.jsx

@@ -11,6 +11,13 @@ const ReactQuill = require('react-quill');
 const ResizableModal = require('../../../misc/ResizableModal');
 const Portal = require('../../../misc/Portal');
 const Message = require('../../../I18N/Message');
+const {Quill} = ReactQuill;
+const {ResizeModule, IFrame, toolbarConfig} = require('../../../misc/quillmodules/ResizeModule')(Quill);
+
+Quill.register({
+    'formats/video': IFrame,
+    'modules/resizeModule': ResizeModule
+});
 
 /**
  * Component for rendering FeatureInfoEditor a modal editor to modify format template
@@ -21,9 +28,10 @@ const Message = require('../../../I18N/Message');
  * @prop {bool} showEditor show/hide modal
  * @prop {funciotn} onShowEditor called when click on close buttons
  * @prop {function} onChange called when text in editor has been changed
+ * @prop {bool} enableIFrameModule enable iframe in editor, default true
  */
 
-module.exports = ({onShowEditor = () => {}, showEditor, element = {}, onChange = () => {}}) =>(
+module.exports = ({onShowEditor = () => {}, showEditor, element = {}, onChange = () => {}, enableIFrameModule = true}) =>(
     <Portal>
         <ResizableModal
             fade
@@ -43,6 +51,10 @@ module.exports = ({onShowEditor = () => {}, showEditor, element = {}, onChange =
             <div id="ms-template-editor" className="ms-editor">
                 <ReactQuill
                     bounds="#ms-template-editor"
+                    modules={enableIFrameModule ? {
+                        resizeModule: {},
+                        toolbar: toolbarConfig
+                    } : {}}
                     defaultValue={element.featureInfo && element.featureInfo.template || ' '}
                     onChange={template => {
                         onChange('featureInfo', {

web/client/components/data/query/GeometryDetails.jsx

@@ -16,14 +16,16 @@ const assign = require('object-assign');
 
 const CoordinatesUtils = require("../../../utils/CoordinatesUtils");
 
+
 class GeometryDetails extends React.Component {
     static propTypes = {
         useMapProjection: PropTypes.bool,
         geometry: PropTypes.object,
         type: PropTypes.string,
         onShowPanel: PropTypes.func,
         onChangeDrawingStatus: PropTypes.func,
-        onEndDrawing: PropTypes.func
+        onEndDrawing: PropTypes.func,
+        zoom: PropTypes.number
     };
 
     static defaultProps = {
@@ -101,7 +103,6 @@ class GeometryDetails extends React.Component {
 
     onModifyGeometry = () => {
         let geometry;
-
         // Update the geometry
         if (this.props.type === "BBOX") {
             this.extent = this.tempExtent;
@@ -168,28 +169,27 @@ class GeometryDetails extends React.Component {
     };
 
     onClosePanel = () => {
-        if (this.props.type === "BBOX") {
-            this.resetBBOX();
-        } else if (this.props.type === "Circle") {
-            this.resetCircle();
-        }
-
+        this.resetGeom();
         this.props.onShowPanel(false);
     };
-
+    getStep = (zoom = 1) => Math.min(1 / Math.pow(10, Math.ceil(Math.min(zoom, 21) / 3) - 2), 1);
+    getStepCircle = (zoom, name) => {
+        const step = this.getStep(zoom);
+        return name === 'radius' && step * 10000 || step;
+    };
     getBBOXDimensions = (geometry) => {
         const extent = geometry.projection !== 'EPSG:4326' && !this.props.useMapProjection ?
             CoordinatesUtils.reprojectBbox(geometry.extent, geometry.projection, 'EPSG:4326') : geometry.extent;
 
         return {
             // minx
-            west: Math.round(extent[0] * 100) / 100,
+            west: extent[0],
             // miny
-            sud: Math.round(extent[1] * 100) / 100,
+            sud: extent[1],
             // maxx
-            est: Math.round(extent[2] * 100) / 100,
+            est: extent[2],
             // maxy
-            north: Math.round(extent[3] * 100) / 100
+            north: extent[3]
         };
     };
     getCircleDimensions = (geometry) => {
@@ -201,9 +201,9 @@ class GeometryDetails extends React.Component {
         center = (center.x === undefined) ? {x: center[0], y: center[1]} : center;
 
         return {
-            x: Math.round(center.x * 100) / 100,
-            y: Math.round(center.y * 100) / 100,
-            radius: Math.round(geometry.radius * 100) / 100
+            x: center.x,
+            y: center.y,
+            radius: geometry.radius
         };
     };
     renderCoordinateField = (value, name) => {
@@ -214,18 +214,19 @@ class GeometryDetails extends React.Component {
                     style={{minWidth: '105px', margin: 'auto'}}
                     type="number"
                     id={"queryform_bbox_" + name}
-                    defaultValue={value}
+                    step={!this.isWGS84() ? 1 : this.getStep(this.props.zoom)}
+                    defaultValue={this.roundValue(value, !this.isWGS84() ? 100 : 1000000)}
                     onChange={(evt) => this.onUpdateBBOX(evt.target.value, name)}/>
             </div>
         );
     };
-
     renderCircleField = (value, name) => {
         return (
             <FormControl
                 type="number"
                 id={"queryform_circle_" + name}
-                defaultValue={value}
+                defaultValue={this.roundValue(value, !this.isWGS84() || name === 'radius' ? 100 : 1000000)}
+                step={!this.isWGS84() ? 1 : this.getStepCircle(this.props.zoom, name)}
                 onChange={(evt) => this.onUpdateCircle(evt.target.value, name)}/>
         );
     };
@@ -352,7 +353,7 @@ class GeometryDetails extends React.Component {
                 key: 'reset',
                 tooltipId: 'queryform.reset',
                 glyph: 'clear-filter',
-                onClick: () => this.resetBBOX()
+                onClick: () => this.resetGeom()
             }, {
                 key: 'close',
                 glyph: '1-close',
@@ -362,29 +363,37 @@ class GeometryDetails extends React.Component {
             </SwitchPanel>
         );
     }
-
+    isWGS84 = () => (this.props.geometry || {}).projection === 'EPSG:4326' || !this.props.useMapProjection;
+    roundValue = (val, prec = 1000000) => Math.round(val * prec) / prec;
+    resetGeom = () => {
+        if (this.props.type === "BBOX") {
+            this.resetBBOX();
+        } else if (this.props.type === "Circle") {
+            this.resetCircle();
+        }
+    };
     resetBBOX = () => {
         for (let prop in this.extent) {
             if (prop) {
                 let coordinateInput = document.getElementById("queryform_bbox_" + prop);
-                coordinateInput.value = this.extent[prop];
-                this.onUpdateBBOX(coordinateInput.value, prop);
+                coordinateInput.value = this.roundValue(this.extent[prop], !this.isWGS84() ? 100 : 1000000);
+                this.onUpdateBBOX(this.extent[prop], prop);
             }
         }
     };
 
     resetCircle = () => {
         let radiusInput = document.getElementById("queryform_circle_radius");
-        radiusInput.value = this.circle.radius;
-        this.onUpdateCircle(radiusInput.value, "radius");
+        radiusInput.value = this.roundValue(this.circle.radius, 100);
+        this.onUpdateCircle(this.circle.radius, "radius");
 
         let coordinateXInput = document.getElementById("queryform_circle_x");
-        coordinateXInput.value = this.circle.x;
-        this.onUpdateCircle(coordinateXInput.value, "x");
+        coordinateXInput.value = this.roundValue(this.circle.x, !this.isWGS84() ? 100 : 1000000);
+        this.onUpdateCircle(this.circle.x, "x");
 
         let coordinateYInput = document.getElementById("queryform_circle_y");
-        coordinateYInput.value = this.circle.y;
-        this.onUpdateCircle(coordinateYInput.value, "y");
+        coordinateYInput.value = this.roundValue(this.circle.y, !this.isWGS84() ? 100 : 1000000);
+        this.onUpdateCircle(this.circle.y, "y");
     };
 }
 

web/client/components/data/query/QueryBuilder.jsx

@@ -62,7 +62,8 @@ class QueryBuilder extends React.Component {
         allowEmptyFilter: PropTypes.bool,
         autocompleteEnabled: PropTypes.bool,
         emptyFilterWarning: PropTypes.bool,
-        header: PropTypes.node
+        header: PropTypes.node,
+        zoom: PropTypes.number
     };
 
     static defaultProps = {
@@ -180,7 +181,8 @@ class QueryBuilder extends React.Component {
                         spatialMethodOptions={this.props.spatialMethodOptions}
                         spatialPanelExpanded={this.props.spatialPanelExpanded}
                         showDetailsPanel={this.props.showDetailsPanel}
-                        actions={this.props.spatialFilterActions}/>
+                        actions={this.props.spatialFilterActions}
+                        zoom={this.props.zoom}/>
                     <CrossLayerFilter
                         spatialOperations={this.props.spatialOperations}
                         crossLayerExpanded={this.props.crossLayerExpanded}