Add option to show "Upload geometry" and "Draw geometry" buttons instead of "Create geometry" button

Author: tkleinke

l10n/custom-data-type-nfis-geometry.csv

@@ -5,6 +5,8 @@ custom.data.type.nfis.geometry.multiSelect.no,Keine Mehrfachauswahl,No multi sel
 custom.data.type.nfis.geometry.edit.no_data,Keine Daten vorhanden,No data present
 custom.data.type.nfis.geometry.search.placeholder,Geometrie-ID,Geometry ID
 custom.data.type.nfis.geometry.createNewGeometry,Neue Geometrie anlegen,Create new geometry
+custom.data.type.nfis.geometry.drawNewGeometry,Neue Geometrie zeichnen,Draw new geometry
+custom.data.type.nfis.geometry.uploadNewGeometry,Neue Geometrie hochladen,Upload new geometry
 custom.data.type.nfis.geometry.linkExistingGeometry,Existierende Geometrie verknüpfen,Link existing geometry
 custom.data.type.nfis.geometry.editGeometry,Bearbeiten,Edit
 custom.data.type.nfis.geometry.deleteGeometry,Geometrie löschen,Delete geometry
@@ -33,6 +35,8 @@ server.config.parameter.system.nfisGeoservices.geoserver_read_password.label,Geo
 server.config.parameter.system.nfisGeoservices.geoserver_write_username.label,Geoserver-Account (Schreibrechte): Username,Geoserver account (write permissions): User name
 server.config.parameter.system.nfisGeoservices.geoserver_write_password.label,Geoserver-Account (Schreibrechte): Passwort,Geoserver account (write permissions): Password
 server.config.parameter.system.nfisGeoservices.wfs_geometry_id_field_name.label,Name des Geometrie-ID-Feldes im WFS,Name of the geometry ID field in the WFS
+server.config.parameter.system.nfisGeoservices.show_upload_button.label,Hochladen von Geometrien im Masterportal,Upload geometries in Masterportal
+server.config.parameter.system.nfisGeoservices.show_upload_button.checkbox,Button anzeigen,Show button
 server.config.parameter.system.nfisGeoservices.wfs_configuration.label,Objekttypen,Object types
 server.config.parameter.system.nfisGeoservices.wfs_configuration.object_type.label,Name des Objekttyps,Object type name
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.label,Geometrie-Felder,Geometry fields

manifest.master.yml

@@ -56,6 +56,9 @@ base_config:
       wfs_geometry_id_field_name:
         type: text
         position: 6
+      show_upload_button:
+        type: bool
+        position: 7
       wfs_configuration:
         type: table
         fields:
@@ -139,7 +142,7 @@ base_config:
                     position: 0
                 position: 14
             position: 1
-        position: 7
+        position: 8
       linked_objects:
         type: table
         fields:
@@ -149,7 +152,7 @@ base_config:
           - name: link_field_name
             type: text
             position: 1
-        position: 8
+        position: 9
       masterportal_configurations:
         type: table
         fields:
@@ -162,7 +165,7 @@ base_config:
           - name: file_name
             type: text
             position: 2
-        position: 9
+        position: 10
 
 callbacks:
   db_pre_save:

src/webfrontend/js/customDataType/contentLoader.js

@@ -101,7 +101,12 @@ function renderEditorButtons(contentElement, cdata, settings, wfsData, selectedG
 
         if (!selectedGeometryId) {
             if (isAddingGeometriesAllowed(cdata, settings)) {
-                buttons.push(createCreateGeometryButton(contentElement, cdata, settings, wfsData, extent));
+                if (getBaseConfiguration().show_upload_button) {
+                    buttons.push(createUploadGeometryButton(contentElement, cdata, settings, wfsData, extent));
+                    buttons.push(createCreateGeometryButton(contentElement, cdata, settings, wfsData, extent, true));
+                } else {
+                    buttons.push(createCreateGeometryButton(contentElement, cdata, settings, wfsData, extent));
+                }
                 buttons.push(createLinkExistingGeometryButton(contentElement, cdata, settings));
             }
         } else {
@@ -148,14 +153,24 @@ function createDeleteGeometryButton(contentElement, cdata, settings, uuid) {
     });
 }
 
-function createCreateGeometryButton(contentElement, cdata, settings, wfsData, extent) {
+function createCreateGeometryButton(contentElement, cdata, settings, wfsData, extent, showDrawLabel = false) {
     return new CUI.Button({
-        text: $$('custom.data.type.nfis.geometry.createNewGeometry'),
+        text: showDrawLabel
+            ? $$('custom.data.type.nfis.geometry.drawNewGeometry')
+            : $$('custom.data.type.nfis.geometry.createNewGeometry'),
         icon_left: new CUI.Icon({ class: 'fa-plus' }),
         onClick: () => createGeometry(contentElement, cdata, settings, wfsData, extent)
     });
 }
 
+function createUploadGeometryButton(contentElement, cdata, settings, wfsData, extent) {
+    return new CUI.Button({
+        text: $$('custom.data.type.nfis.geometry.uploadNewGeometry'),
+        icon_left: new CUI.Icon({ class: 'fa-upload' }),
+        onClick: () => createGeometry(contentElement, cdata, settings, wfsData, extent, true)
+    });
+}
+
 function createLinkExistingGeometryButton(contentElement, cdata, settings) {
     const label = $$('custom.data.type.nfis.geometry.linkExistingGeometry');
     return new CUI.Button({
@@ -176,12 +191,12 @@ function editGeometry(contentElement, cdata, settings, wfsData, uuid) {
     openEditGeometryModal(contentElement, cdata, settings, wfsData);
 }
 
-function createGeometry(contentElement, cdata, settings, wfsData, extent) {
+function createGeometry(contentElement, cdata, settings, wfsData, extent, upload = false) {
     const newGeometryId = window.crypto.randomUUID();
     navigator.clipboard.writeText(newGeometryId);
-    window.open(getEditGeometryUrl(settings, wfsData, extent), '_blank');
+    window.open(getEditGeometryUrl(settings, wfsData, extent, upload), '_blank');
     openCreateGeometryModal(contentElement, cdata, settings, newGeometryId);
-};
+}
 
 function openEditGeometryModal(contentElement, cdata, settings) {
     const modalDialog = new CUI.ConfirmationDialog({
@@ -529,13 +544,19 @@ function getViewGeometriesUrl(extent) {
     return url + 'zoomToExtent=' + extent.join(',');
 }
 
-function getEditGeometryUrl(settings, wfsData, extent) {
+function getEditGeometryUrl(settings, wfsData, extent, upload = false) {
     let url = getMasterportalUrl();
     const layerIds = getMasterportalLayerIds(settings.fieldConfiguration, wfsData);
-    if (!url || !layerIds.length) return '';
+    if (!url) return '';
 
     if (extent) url += 'zoomToExtent=' + extent.join(',') + '&';
-    return url + 'isinitopen=wfst&layerids=' + layerIds.join(',');
+    url += upload
+        ? 'menu={%22secondary%22:{%22currentComponent%22:%22wfstUploader%22}}'
+        : 'isinitopen=wfst';
+    
+    if (layerIds?.length) url += '&layerids=' + layerIds.join(',');
+
+    return url;
 }
 
 function getMasterportalLayerIds(fieldConfiguration, wfsData) {