From 79720c1da9c840c5349ffd9be51d935bbc3c6ce8 Mon Sep 17 00:00:00 2001
From: Paul <paul.vangenuchten@geocat.net>
Date: Mon, 1 Feb 2021 12:32:40 +0100
Subject: [PATCH] capability to store point as boundingpolygon

---
 .../layout/layout-custom-fields.xsl           |   2 +-
 .../plugin/iso19115-3.2018/loc/eng/labels.xml |   2 +-
 .../iso19115-3.2018/update-fixed-info.xsl     |   1 +
 .../src/main/plugin/iso19139/extract-gml.xsl  |   4 +-
 .../iso19139/layout/layout-custom-fields.xsl  |   4 +-
 .../main/plugin/iso19139/loc/eng/labels.xml   |   2 +-
 .../main/plugin/iso19139/loc/nor/labels.xml   |   2 +-
 .../main/plugin/iso19139/loc/tur/labels.xml   |   2 +-
 .../plugin/iso19139/update-fixed-info.xsl     |   4 +-
 .../edit/bounding/BoundingDirective.js        | 122 +++++++++++-------
 .../bounding/partials/boundingpolygon.html    |  69 +++++-----
 .../viewer/geometry/GeometryService.js        |  28 ++--
 12 files changed, 140 insertions(+), 102 deletions(-)

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl
index 72e1c5d69a1..f4aaeb38eb4 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl
@@ -276,7 +276,7 @@
       <xsl:with-param name="subTreeSnippet">
 
         <xsl:variable name="geometry">
-          <xsl:apply-templates select="gex:polygon/gml:MultiSurface|gex:polygon/gml:LineString"
+          <xsl:apply-templates select="gex:polygon/gml:MultiSurface|gex:polygon/gml:LineString|gex:polygon/gml:Point"
                                mode="gn-element-cleaner"/>
         </xsl:variable>
 
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml
index e2f2c32871c..409136478a8 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml
@@ -1614,7 +1614,7 @@
     </description>
   </element>
   <element name="gex:EX_BoundingPolygon" id="341.0">
-    <label>Bounding Polygon</label>
+    <label>Bounding geometry</label>
     <description>Boundary enclosing the dataset, expressed as the closed set of
       (x,y)
       coordinates of the polygon (last point replicates first point)
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl
index c5987937493..6db5cb3d8df 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl
@@ -285,6 +285,7 @@
   <!-- Add required gml attributes if missing -->
   <xsl:template match="gml:Polygon[not(@gml:id) and not(@srsName)]|
                        gml:MultiSurface[not(@gml:id) and not(@srsName)]|
+                       gml:Point[not(@gml:id) and not(@srsName)]|
                        gml:LineString[not(@gml:id) and not(@srsName)]">
     <xsl:copy>
       <xsl:attribute name="gml:id">
diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl
index d6333ae782b..228e384315a 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl
@@ -52,8 +52,8 @@
           -->
     <xsl:for-each select="gmd:polygon/(gml:*|gml320:*)[
                             local-name() != 'MultiCurve' and
-                            count(*) > 0 and
-                            .//(gml:posList|gml320:posList) != '']">
+                            count(*) > 0 and (
+                            .//(gml:posList|gml320:posList) != '' or .//(gml:pos|gml320:pos) != '')]">
       <xsl:copy-of copy-namespaces="no" select="."/>
     </xsl:for-each>
   </xsl:template>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl
index 02d78c944bd..1c7e0230aa2 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl
@@ -285,8 +285,8 @@
       <xsl:with-param name="subTreeSnippet">
 
         <xsl:variable name="geometry">
-          <xsl:apply-templates select="gmd:polygon/gml:MultiSurface|gmd:polygon/gml:LineString|
-                                       gmd:polygon/gml320:MultiSurface|gmd:polygon/gml320:LineString"
+          <xsl:apply-templates select="gmd:polygon/gml:MultiSurface|gmd:polygon/gml:LineString|gmd:polygon/gml:Point|
+                                       gmd:polygon/gml320:MultiSurface|gmd:polygon/gml320:LineString|gmd:polygon/gml320:Point"
                                mode="gn-element-cleaner"/>
         </xsl:variable>
 
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml
index 76ad1a63e89..e3105725df7 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml
@@ -258,7 +258,7 @@
     </description>
   </element>
   <element name="gmd:EX_BoundingPolygon" id="341.0">
-    <label>Bounding Polygon</label>
+    <label>Bounding geometry</label>
     <description>Boundary enclosing the dataset, expressed as the closed set of (x,y)
       coordinates of the polygon (last point replicates first point)
     </description>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml
index 738f1e97248..4cf852ba87b 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml
@@ -263,7 +263,7 @@
     </description>
   </element>
   <element name="gmd:EX_BoundingPolygon" id="341.0">
-    <label>Bounding Polygon</label>
+    <label>Bounding geometry</label>
     <description>Boundary enclosing the dataset, expressed as the closed
       set of (x,y)
       coordinates of the polygon (last point replicates first point)
diff --git a/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml b/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml
index fa5944a9cf0..a1d7ca8356e 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml
@@ -237,7 +237,7 @@
     </description>
   </element>
   <element name="gmd:EX_BoundingPolygon" id="341.0">
-    <label>Bounding Polygon</label>
+    <label>Bounding geometry</label>
     <description>Boundary enclosing the dataset, expressed as the closed set of (x,y)
       coordinates of the polygon (last point replicates first point)
     </description>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl b/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl
index 81bc921c521..b58dc03dde6 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl
@@ -296,9 +296,11 @@
   <xsl:template match="gml:Polygon[not(@gml:id) or not(@srsName)]|
                        gml:MultiSurface[not(@gml:id) or not(@srsName)]|
                        gml:LineString[not(@gml:id) or not(@srsName)]|
+                       gml:Point[not(@gml:id) or not(@srsName)]|
                        gml320:Polygon[not(@gml320:id) or not(@srsName)]|
                        gml320:MultiSurface[not(@gml:id) or not(@srsName)]|
-                       gml320:LineString[not(@gml:id) or not(@srsName)]">
+                       gml320:LineString[not(@gml:id) or not(@srsName)]|
+                       gml320:Point[not(@gml320:id) or not(@srsName)]">
     <xsl:element name="gml:{local-name()}"
                  namespace="{if($isUsing2005Schema)
                              then 'http://www.opengis.net/gml'
diff --git a/web-ui/src/main/resources/catalog/components/edit/bounding/BoundingDirective.js b/web-ui/src/main/resources/catalog/components/edit/bounding/BoundingDirective.js
index 3ccbcd077a9..1310cc4ba00 100644
--- a/web-ui/src/main/resources/catalog/components/edit/bounding/BoundingDirective.js
+++ b/web-ui/src/main/resources/catalog/components/edit/bounding/BoundingDirective.js
@@ -62,16 +62,14 @@
           '$http',
           'gnMap',
           'gnMapsManager',
-          'olDecorateInteraction',
           'gnGeometryService',
           function BoundingPolygonController(
-              $scope,
-              $attrs,
-              $http,
-              gnMap,
-              gnMapsManager,
-              olDecorateInteraction,
-              gnGeometryService) {
+            $scope,
+            $attrs,
+            $http,
+            gnMap,
+            gnMapsManager,
+            gnGeometryService) {
             var ctrl = this;
 
             // set read only
@@ -83,21 +81,13 @@
               ctrl.initValue();
             });
 
-            // interactions with map
+            // Get interaction layer
             var layer = gnGeometryService.getCommonLayer(ctrl.map);
             var source = layer.getSource();
 
-            ctrl.drawInteraction = new ol.interaction.Draw({
-              type: 'MultiPolygon',
-              source: source
-            });
-            ctrl.drawLineInteraction = new ol.interaction.Draw({
-              type: 'LineString',
-              source: source
-            });
-            ctrl.modifyInteraction = new ol.interaction.Modify({
-              features: source.getFeaturesCollection()
-            });
+            // Draw interaction variables
+            var activeDrawInteraction;
+            ctrl.activeDrawType = null;
 
             // this is used to deactivate zoom on draw end
             ctrl.zoomInteraction = null;
@@ -107,26 +97,12 @@
               }
             });
 
-            // add our layer&interactions to the map
-            olDecorateInteraction(ctrl.drawInteraction);
-            olDecorateInteraction(ctrl.drawLineInteraction);
-            olDecorateInteraction(ctrl.modifyInteraction);
-            ctrl.drawInteraction.active = false;
-            ctrl.drawLineInteraction.active = false;
-            ctrl.modifyInteraction.active = false;
-
-            // add interactions to map
-            ctrl.map.addInteraction(ctrl.drawInteraction);
-            ctrl.map.addInteraction(ctrl.drawLineInteraction);
-            ctrl.map.addInteraction(ctrl.modifyInteraction);
-
-            // clear existing features on draw end & save feature
+            // Clear existing features on draw end & save feature
             function handleDrawEnd(event) {
+              clearActiveDrawInteraction();
               ctrl.fromTextInput = false;
               source.clear(event.feature);
               ctrl.updateOutput(event.feature);
-              ctrl.drawInteraction.active = false;
-              ctrl.drawLineInteraction.active = false;
               $scope.$digest();
 
               // prevent interference by zoom interaction
@@ -138,15 +114,45 @@
                 }, 251);
               }
             }
-            ctrl.drawInteraction.on('drawend', handleDrawEnd);
-            ctrl.drawLineInteraction.on('drawend', handleDrawEnd);
 
-            // update output on modify end
-            ctrl.modifyInteraction.on('modifyend', function(event) {
+            // Update text field when geometry has modified
+            function handleModifyEnd(event) {
               ctrl.fromTextInput = false;
               ctrl.updateOutput(event.features.item(0));
               $scope.$digest();
-            });
+            }
+
+            // Removes event handler from current draw interaction and
+            // removes interaction from map. Clears interaction variables.
+            function clearActiveDrawInteraction() {
+              if (!activeDrawInteraction) return;
+              activeDrawInteraction.un('drawend', handleDrawEnd);
+              ctrl.map.removeInteraction(activeDrawInteraction);
+              activeDrawInteraction = null;
+              ctrl.activeDrawType = null;
+            }
+
+            // Add new draw interaction based on given geometry type name.
+            // Also add event handler that fires when drawing ends.
+            ctrl.setActiveDrawInteraction = function(geometryType) {
+              clearActiveDrawInteraction();
+              activeDrawInteraction = new ol.interaction.Draw({
+                source: source,
+                type: geometryType
+              });
+              activeDrawInteraction.on('drawend', handleDrawEnd);
+              ctrl.map.addInteraction(activeDrawInteraction);
+              ctrl.activeDrawType = geometryType;
+            }
+
+            // Add modify interaction (always active when not readOnly)
+            if (!ctrl.readOnly) {
+              var modifyInteraction = new ol.interaction.Modify({
+                features: source.getFeaturesCollection()
+              });
+              modifyInteraction.on('modifyend', handleModifyEnd);
+              ctrl.map.addInteraction(modifyInteraction);
+            }
 
             // output for editor (equals input by default)
             ctrl.outputPolygonXml = surroundGmlWithGmdPolygon(ctrl.polygonXml);
@@ -157,8 +163,6 @@
             ctrl.dataProjection = 'EPSG:4326';
 
             // available input formats
-            // GML is not available as it cannot be parsed
-            // without namespace info
             ctrl.formats = ['WKT', 'GeoJSON', 'GML'];
             ctrl.currentFormat = ctrl.formats[0];
 
@@ -169,13 +173,37 @@
                 }
               }
               return false;
-            };
+            }
 
+            /**
+             * Calculates an enlarged extent for the given feature.
+             * For polygons and lines, the extent will be twice the size of its smallest dimension.
+             * For point features, the extent will be 1 square decimal degree, centered around the point.
+             * If needed, the LL point extent will be reprojected to fit the map projection.
+             *
+             * @param {ol.feature} feature  Input feature for which to return an enlarged extent
+             * @returns {Array.<number>}    Enlarged extent
+             */
             function getEnlargedExtent(feature) {
+
               var extent = feature.getGeometry().getExtent();
-              var buffer = Math.min.apply(ol.extent.getSize(extent)) * 0.1;
-              return ol.extent.buffer(extent, buffer);
-            };
+
+              // Get buffer distance of 50% of the smallest extent dimension (width or height)
+              var buffer = Math.min.apply(null, ol.extent.getSize(extent)) * 0.5;
+
+              if (buffer > 0) {
+                // Feature has a size: apply calculated buffer
+                return ol.extent.buffer(extent, buffer);
+              } else {
+                // Feature probably is a point, causing the extent to have 0 width and height:
+                // Get the extent center (= point), reproject to LL, buffer by 0.5 dd,
+                // reproject new extent back to map projection and return it
+                var mapProj = ctrl.map.getView().getProjection();
+                var center = ol.proj.toLonLat(ol.extent.getCenter(extent), mapProj);
+                extent = ol.extent.buffer(ol.extent.boundingExtent([center, center]), 0.5);
+                return ol.proj.transformExtent(extent, 'EPSG:4326', mapProj, 8);
+              }
+            }
 
             // parse initial input coordinates to display shape
             ctrl.initValue = function() {
diff --git a/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html b/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html
index d95d7c52d9c..78fba45c2eb 100644
--- a/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html
+++ b/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html
@@ -8,27 +8,26 @@
 <!-- draw tool & select boxes -->
 <div class="row">
   <div class="col-xs-12 col-sm-6 col-sm-push-6" ng-if="!ctrl.readOnly">
-    <label class="text-muted control-label" translate>drawOnMap</label>
-    <br />
-    <div gi-btn-group>
-      <div class="btn-group">
-        <div class="btn-group">
-          <button class="btn btn-default btn-warning"
-            gi-btn="active" ng-model="ctrl.drawInteraction.active">
-            <span class="fa fa-pencil"></span>&nbsp;
-            <span translate>Polygon</span>
-          </button>
-          <button class="btn btn-default btn-warning"
-            gi-btn="active" ng-model="ctrl.drawLineInteraction.active">
-            <span class="fa fa-pencil"></span>&nbsp;
-            <span translate>Line</span>
-          </button>
-        </div>
-      </div>
-      <button class="btn btn-default btn-warning"
-        gi-btn="active" ng-model="ctrl.modifyInteraction.active">
+    <div class="pull-right">
+      <label class="text-muted control-label" translate>drawOnMap</label>
+      <br />
+      <button class="btn btn-default btn-warning pull-left gn-margin-right"
+              ng-click="ctrl.setActiveDrawInteraction('MultiPolygon')"
+              ng-class="{'active': ctrl.activeDrawType === 'MultiPolygon'}">
+        <span class="fa fa-pencil"></span>&nbsp;
+        <span translate>Polygon</span>
+      </button>
+      <button class="btn btn-default btn-warning pull-left gn-margin-right"
+              ng-click="ctrl.setActiveDrawInteraction('LineString')"
+              ng-class="{'active': ctrl.activeDrawType === 'LineString'}">
+        <span class="fa fa-pencil"></span>&nbsp;
+        <span translate>Line</span>
+      </button>
+      <button class="btn btn-default btn-warning pull-left"
+              ng-click="ctrl.setActiveDrawInteraction('Point')"
+              ng-class="{'active': ctrl.activeDrawType === 'Point'}">
         <span class="fa fa-pencil"></span>&nbsp;
-        <span translate>modifyGeometry</span>
+        <span translate>Point</span>
       </button>
     </div>
   </div>
@@ -39,15 +38,15 @@
     <div class="flex-row width-100">
       <div class="flex-nogrow">
         <select ng-model="ctrl.currentFormat"
-          ng-options="format for format in ctrl.formats"
-          ng-change="ctrl.handleInputOptionsChange()">
+                ng-options="format for format in ctrl.formats"
+                ng-change="ctrl.handleInputOptionsChange()">
         </select>
       </div>
       <div class="flex-spacer"></div>
       <div class="flex-shrink">
         <select ng-model="ctrl.currentProjection"
-          ng-options="proj.code as proj.label for proj in ctrl.projections"
-          ng-change="ctrl.handleInputOptionsChange()">
+                ng-options="proj.code as proj.label for proj in ctrl.projections"
+                ng-change="ctrl.handleInputOptionsChange()">
         </select>
       </div>
     </div>
@@ -56,7 +55,7 @@
 
 <div class="spacer" />
 
-<div ng-if="ctrl.dataOlProjection == null" class="alert alert-danger"
+<div ng-if="ctrl.polygonXml && ctrl.dataOlProjection == null" class="alert alert-danger"
      data-translate=""
      data-translate-values="{srsName:'{{ctrl.dataProjection}}'}">
   badGmlProjectionCode
@@ -66,24 +65,24 @@
 <div class="row">
   <div class="col-md-12">
     <div class="has-feedback"
-      ng-class="{ 'has-success': ctrl.fromTextInput && !ctrl.parseError, 'has-error': ctrl.parseError }">
+         ng-class="{ 'has-success': ctrl.fromTextInput && !ctrl.parseError, 'has-error': ctrl.parseError }">
       <label class="text-muted control-label" translate>inputGeometryText</label>
       <textarea class="form-control" rows="4" ng-model="ctrl.inputGeometry"
-        ng-model-options="{ debounce: 300 }"
-        placeholder="{{'inputGeometryText' | translate}}"
-        ng-change="ctrl.handleInputChange()"
-        ng-readonly="ctrl.readOnly"/>
+                ng-model-options="{ debounce: 300 }"
+                placeholder="{{'inputGeometryText' | translate}}"
+                ng-change="ctrl.handleInputChange()"
+                ng-readonly="ctrl.readOnly"/>
       <small class="text-danger"
-        ng-show="ctrl.fromTextInput && ctrl.parseError">
+             ng-show="ctrl.fromTextInput && ctrl.parseError">
         {{ 'inputGeometryIsInvalid' | translate}} {{ctrl.parseError}}</small>
       <small class="text-success"
-        ng-show="ctrl.fromTextInput && !ctrl.parseError" translate>
+             ng-show="ctrl.fromTextInput && !ctrl.parseError" translate>
         inputGeometryIsValid</small>
       <small class="text-muted"
-        ng-show="!ctrl.fromTextInput && !ctrl.readOnly" translate>
+             ng-show="!ctrl.fromTextInput && !ctrl.readOnly" translate>
         inputGeometryHint</small>
       <small class="text-muted"
-        ng-show="ctrl.readOnly" translate>
+             ng-show="ctrl.readOnly" translate>
         inputGeometryReadOnlyHint</small>
     </div>
   </div>
@@ -91,4 +90,4 @@
 
 <!-- final output in GML -->
 <input name="{{ctrl.identifier}}"
-  type="hidden" value="{{ctrl.outputPolygonXml}}"/>
+       type="hidden" value="{{ctrl.outputPolygonXml}}"/>
diff --git a/web-ui/src/main/resources/catalog/components/viewer/geometry/GeometryService.js b/web-ui/src/main/resources/catalog/components/viewer/geometry/GeometryService.js
index 2062881fec4..d8eaf252cc5 100644
--- a/web-ui/src/main/resources/catalog/components/viewer/geometry/GeometryService.js
+++ b/web-ui/src/main/resources/catalog/components/viewer/geometry/GeometryService.js
@@ -176,11 +176,17 @@
           format: 'gml'
         }, options);
 
+        var outputValue = '';
+        var inputGeom = feature.getGeometry();
+        if (!inputGeom) {
+          return outputValue;
+        }
+
         // clone & transform geom
-        var outputGeom = feature.getGeometry().clone().transform(
-            map.getView().getProjection(),
-            options.crs || LONLAT_WGS84
-            );
+        var outputGeom = inputGeom.clone().transform(
+          map.getView().getProjection(),
+          options.crs || LONLAT_WGS84
+        );
         var outputFeature = new ol.Feature({
           geometry: outputGeom
         });
@@ -190,7 +196,6 @@
 
         var formatLabel = options.format.toLowerCase();
         var format;
-        var outputValue;
         switch (formatLabel) {
           case 'json':
           case 'geojson':
@@ -359,11 +364,14 @@
         // Get dimensions from GML
         var dim = gmlString.match(new RegExp('srsDimension=\"([^"]*)\"'));
         // If srsDimension > 2 OR geometry is already 2D, return unmodified geometry
-        if ((dim && dim.length === 2 && dim[1] >= 3) || 
-            (geom.layout === 'XY' && geom.stride === 2)) 
-              return geom;            
-        // Drop Z (and M)
-        geom.setCoordinates(geom.getCoordinates(), 'XY');
+        if ((dim && dim.length === 2 && dim[1] >= 3) ||
+          (geom.layout === 'XY' && geom.stride === 2))
+          return geom;
+        var coords = geom.getCoordinates();
+        // Drop Z (and M):
+        // For polygons and lines, the stride setting 'XY' takes care of dropping the Z and M.
+        // For point features, this does not work (OL bug?), so we slice the coordinate array explicitly!
+        geom.setCoordinates(geom.getType() === 'Point' ? coords.slice(0, 2) : coords, 'XY');
         return geom;
       }