fix: reloadFeature

src/components/EditFeatureDrawer/EditFeatureFullForm/index.tsx

@@ -19,10 +19,6 @@ import {
 
 import moment from 'moment';
 
-import {
-  equalTo
-} from 'ol/format/filter';
-
 import { ValidateErrorEntity } from 'rc-field-form/es/interface';
 
 import {
@@ -87,10 +83,18 @@ export const EditFeatureFullForm: React.FC<EditFeatureFullFormProps> = ({
       return;
     }
 
+    const root = document.implementation.createDocument(null, 'root');
+    const filter = root.createElement('Filter');
+    const resourceId = root.createElement('ResourceId');
+    resourceId.setAttribute('rid', id);
+    filter.appendChild(resourceId);
+    root.documentElement.appendChild(filter);
+
     const updatedFeatures = await executeGetFeature({
       layer: layer,
-      filter: equalTo('id', id)
-    });
+      filter: filter
+    },
+    '2.0.0');
 
     if (
       updatedFeatures?.features[0]
@@ -230,9 +234,14 @@ export const EditFeatureFullForm: React.FC<EditFeatureFullFormProps> = ({
     // get feature id from response
     const featureId = xmlDoc.getElementsByTagName('ogc:FeatureId');
     const idString = featureId.item(0)?.getAttribute('fid');
-    const id = idString?.split('.')[1];
-    if (id) {
-      reloadFeature(id);
+    if (idString === 'none') {
+      const featId = feature.id;
+      if (!featId) {
+        return;
+      }
+      reloadFeature((featId as string));
+    } else if (idString) {
+      reloadFeature(idString);
     }
   };
 

src/hooks/useExecuteGetFeature.ts

@@ -26,15 +26,15 @@ import useSHOGunAPIClient from './useSHOGunAPIClient';
 
 export type GetFeatureOpts = {
   layer: WmsLayer;
-  filter?: OlFormatFilter;
+  filter?: OlFormatFilter | Element;
 };
 
 export const useExecuteGetFeature = () => {
   const client = useSHOGunAPIClient();
   const map = useMap();
   const executeWfsDescribeFeatureType = useExecuteWfsDescribeFeatureType();
 
-  const executeGetFeature = useCallback(async (opts: GetFeatureOpts) => {
+  const executeGetFeature = useCallback(async (opts: GetFeatureOpts, version = '1.1.0') => {
     if (!map) {
       return;
     }
@@ -64,15 +64,19 @@ export const useExecuteGetFeature = () => {
       url = url.slice(0, -1);
     }
 
-    const featureRequest = new OlFormatWFS().writeGetFeature({
+    const featureRequest = new OlFormatWFS({version: version}).writeGetFeature({
       srsName: map.getView().getProjection().getCode(),
       featureNS: describeFeatureType.targetNamespace,
       featurePrefix: describeFeatureType.targetPrefix,
       featureTypes: [source?.getParams().LAYERS],
       outputFormat: 'application/json',
-      filter: opts.filter
+      filter: opts.filter instanceof OlFormatFilter ? opts.filter : undefined
     });
 
+    if (featureRequest instanceof Element && opts.filter instanceof Element) {
+      featureRequest.getElementsByTagName('Query')[0].appendChild(opts.filter);
+    }
+
     const defaultHeaders = {
       'Content-Type': 'application/json'
     };