Remove newly drawn geometry IDs from save data if empty

Author: tkleinke

src/server/sendDataToGeoserver.js

@@ -456,8 +456,10 @@ async function handleNewlyDrawnGeometries(object, tagGroups) {
     for (let fieldConfiguration of wfsConfiguration.geometry_fields) {
         for (let fieldValue of await getFieldValues(object[object._objecttype], fieldConfiguration.field_path.split('.'))) {
             const newlyDrawnGeometryIds = fieldValue.newly_drawn_geometry_ids;
-            delete fieldValue.newly_drawn_geometry_ids;
-            changed = true;
+            if (newlyDrawnGeometryIds) {
+                delete fieldValue.newly_drawn_geometry_ids;
+                changed = true;
+            }
             if (!newlyDrawnGeometryIds?.length) continue;
 
             if (wfsTemporaryGeometryFieldName) {

src/webfrontend/js/customDataType/contentLoader.js

@@ -114,7 +114,7 @@ function renderEditorButtons(contentElement, cdata, settings, wfsData, selectedG
             buttons.push(createDeleteGeometryButton(contentElement, cdata, settings, selectedGeometryId));
         }
 
-        const buttonBarElement = new CUI.Buttonbar({ buttons: buttons });
+        const buttonBarElement = new CUI.Buttonbar({ buttons });
 
         CUI.dom.append(contentElement, buttonBarElement);
     }

src/webfrontend/js/customDataType/main.js

@@ -94,10 +94,9 @@ CustomDataTypeNFISGeometry = (function(superClass) {
     Plugin.getSaveData = function(data, save_data, opts = {}) {
         const cdata = data[this.name()];
         if (this.__isValidData(cdata)) {
-            save_data[this.name()] = {
-                geometry_ids: cdata.geometry_ids,
-                newly_drawn_geometry_ids: cdata.newly_drawn_geometry_ids
-            };
+            const saveData = { geometry_ids: cdata.geometry_ids };
+            if (cdata.newly_drawn_geometry_ids?.length) saveData.newly_drawn_geometry_ids = cdata.newly_drawn_geometry_ids;
+            save_data[this.name()] = saveData;
         } else {
             save_data[this.name()] = null;
         }