ICL-1580 修复编辑要素时feature不添加geometry无法更新成功 review by luox

chenxianhuii · chenxianhuii · commit 49ca74ec96cb · 2025-05-21T17:53:14.000+08:00
diff --git a/src/mapboxgl/core/Util.js b/src/mapboxgl/core/Util.js
@@ -46,7 +46,7 @@ export const Util = {
         if (geoJSON && geoJSON.type) {
             var format = new GeoJSONFormat();
             var result = format.read(geoJSON, "FeatureCollection");
-            return result[0].geometry;
+            return result && result[0].geometry;
         }
     },
 
diff --git a/src/maplibregl/core/Util.js b/src/maplibregl/core/Util.js
@@ -46,7 +46,7 @@ export const Util = {
         if (geoJSON && geoJSON.type) {
             var format = new GeoJSONFormat();
             var result = format.read(geoJSON, "FeatureCollection");
-            return result[0].geometry;
+            return result && result[0].geometry;
         }
     },
 
diff --git a/src/openlayers/core/Util.js b/src/openlayers/core/Util.js
@@ -74,7 +74,7 @@
        return null;
      }
      const result = new GeoJSONFormat().read(geoJSON, 'FeatureCollection');
-     return result[0].geometry;
+     return result && result[0].geometry;
    },
 
    /**
diff --git a/test/mapboxgl/core/UtilSpec.js b/test/mapboxgl/core/UtilSpec.js
@@ -39,4 +39,65 @@ describe('Util', () => {
     expect(Util.isMatchAdministrativeName('北京', '北京市')).toBeTruthy();
     expect(Util.isMatchAdministrativeName('北京', null)).toBeFalsy();
   });
+  it('toSuperMapGeometry', () => {
+      var geoJSON = {
+          type: 'FeatureCollection',
+          features: [
+              {
+                  type: 'Feature',
+                  properties: {
+                      attributes: {
+                          SmArea: '1.6060069623493825E15',
+                          SmGeoPosition: '65536',
+                          SmID: '1',
+                          SmPerimeter: '1.6030006674231339E8'
+                      },
+                      id: 1,
+                      layerName: 'World@China',
+                      searchValues: '',
+                      type: 'REGION'
+                  },
+                  geometry: {
+                      type: 'MultiPolygon',
+                      coordinates: [
+                          [
+                              [
+                                  [-2, 258],
+                                  [258, 258],
+                                  [-2, 258],
+                                  [-2, 258]
+                              ]
+                          ]
+                      ]
+                  }
+              }
+          ]
+      };
+      var result = Util.toSuperMapGeometry(geoJSON);
+      expect(result).not.toBeNull();
+      
+      var geoJSON2 = {
+        type: 'FeatureCollection',
+        features: [
+            {
+                type: 'Feature',
+                properties: {
+                    attributes: {
+                        SmArea: '1.6060069623493825E15',
+                        SmGeoPosition: '65536',
+                        SmID: '1',
+                        SmPerimeter: '1.6030006674231339E8'
+                    },
+                    id: 1,
+                    layerName: 'World@China',
+                    searchValues: '',
+                    type: 'REGION'
+                },
+                geometry: null
+            }
+        ]
+      };
+      var result2 = Util.toSuperMapGeometry(geoJSON2);
+      expect(result2).toBeNull();
+  });
 });
diff --git a/test/maplibregl/core/UtilSpec.js b/test/maplibregl/core/UtilSpec.js
@@ -39,4 +39,65 @@ describe('Util', () => {
     expect(Util.isMatchAdministrativeName('北京', '北京市')).toBeTruthy();
     expect(Util.isMatchAdministrativeName('北京', null)).toBeFalsy();
   });
+  it('toSuperMapGeometry', () => {
+      var geoJSON = {
+          type: 'FeatureCollection',
+          features: [
+              {
+                  type: 'Feature',
+                  properties: {
+                      attributes: {
+                          SmArea: '1.6060069623493825E15',
+                          SmGeoPosition: '65536',
+                          SmID: '1',
+                          SmPerimeter: '1.6030006674231339E8'
+                      },
+                      id: 1,
+                      layerName: 'World@China',
+                      searchValues: '',
+                      type: 'REGION'
+                  },
+                  geometry: {
+                      type: 'MultiPolygon',
+                      coordinates: [
+                          [
+                              [
+                                  [-2, 258],
+                                  [258, 258],
+                                  [-2, 258],
+                                  [-2, 258]
+                              ]
+                          ]
+                      ]
+                  }
+              }
+          ]
+      };
+      var result = Util.toSuperMapGeometry(geoJSON);
+      expect(result).not.toBeNull();
+      
+      var geoJSON2 = {
+        type: 'FeatureCollection',
+        features: [
+            {
+                type: 'Feature',
+                properties: {
+                    attributes: {
+                        SmArea: '1.6060069623493825E15',
+                        SmGeoPosition: '65536',
+                        SmID: '1',
+                        SmPerimeter: '1.6030006674231339E8'
+                    },
+                    id: 1,
+                    layerName: 'World@China',
+                    searchValues: '',
+                    type: 'REGION'
+                },
+                geometry: null
+            }
+        ]
+      };
+      var result2 = Util.toSuperMapGeometry(geoJSON2);
+      expect(result2).toBeNull();
+  });
 });
diff --git a/test/openlayers/core/UtilSpec.js b/test/openlayers/core/UtilSpec.js
@@ -121,6 +121,29 @@ describe('openlayers_Util', () => {
         expect(point instanceof Point).toBeTruthy();
         expect(point.x).toBe(-2);
         expect(point.y).toBe(258);
+        var geoJSON2 = {
+          type: 'FeatureCollection',
+          features: [
+              {
+                  type: 'Feature',
+                  properties: {
+                      attributes: {
+                          SmArea: '1.6060069623493825E15',
+                          SmGeoPosition: '65536',
+                          SmID: '1',
+                          SmPerimeter: '1.6030006674231339E8'
+                      },
+                      id: 1,
+                      layerName: 'World@China',
+                      searchValues: '',
+                      type: 'REGION'
+                  },
+                  geometry: null
+              }
+          ]
+        };
+        var result2 = Util.toSuperMapGeometry(geoJSON2);
+        expect(result2).toBeNull();
     });
 
     it('resolutionToScale', () => {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export const Util = {`
`46`	`46`	`if (geoJSON && geoJSON.type) {`
`47`	`47`	`var format = new GeoJSONFormat();`
`48`	`48`	`var result = format.read(geoJSON, "FeatureCollection");`
`49`		`- return result[0].geometry;`
	`49`	`+ return result && result[0].geometry;`
`50`	`50`	`}`
`51`	`51`	`},`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@`
`74`	`74`	`return null;`
`75`	`75`	`}`
`76`	`76`	`const result = new GeoJSONFormat().read(geoJSON, 'FeatureCollection');`
`77`		`- return result[0].geometry;`
	`77`	`+ return result && result[0].geometry;`
`78`	`78`	`},`
`79`	`79`
`80`	`80`	`/**`