【Feature】GeoJSON新增supportForeignMembers参数，ture时iserver对象转GeoJSON是非GeoJSON参数以ForeignMembers形式体现，false的情况下以properties体现

Author: songyumeng

examples/mapboxgl/videoLayer.html

@@ -37,7 +37,7 @@
         "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
         " with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
         " Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
-      var dataUrl = 'http://172.16.13.234:8090/iserver/services/data-test0104/rest/data';
+      var dataUrl = host + '/iserver/services/data-test0104/rest/data';
       var datasourceName = 'NewDatasource';
       var datasetName = 'aaa';
       var map = new mapboxgl.Map({
@@ -77,15 +77,15 @@
           datasetNames: [datasourceName + ':' + datasetName]
         });
 
-        new mapboxgl.supermap.FeatureService(dataUrl).getFeaturesBySQL(boundsParam).then(function (serviceResult) {
+        new mapboxgl.supermap.FeatureService(dataUrl).getFeaturesBySQL(sqlParam).then(function (serviceResult) {
           let coordinates = [];
           turf.featureEach(serviceResult.result.features, function (currentFeature, featureIndex) {
             currentFeature.geometry.coordinates[0][0].forEach((coord) => {
               const res = proj4('EPSG:3857', 'EPSG:4326', coord);
               coordinates.push(res);
             });
           });
-          let address = serviceResult.result.features.features[0].properties.address;
+          let address = serviceResult.result.features.features[0].address;
           videoLayer = new mapboxgl.supermap.VideoLayer({
             url: address,
             extent: [coordinates[3], coordinates[2], coordinates[1], coordinates[0]]

src/common/format/GeoJSON.js

@@ -226,11 +226,15 @@ export class GeoJSON extends JSONFormat {
              */
             'feature': function (feature) {
                 var geom = this.extract.geometry.apply(this, [feature.geometry]);
+                const { attr , foreignMembers } = this.createAttributes(feature)
                 var json = {
                     "type": "Feature",
-                    "properties": this.createAttributes(feature),
+                    "properties": attr,
                     "geometry": geom
                 };
+                for (const key in foreignMembers) {
+                  json[key] = foreignMembers[key];
+                }
 
                 if (feature.geometry && feature.geometry.type === 'TEXT') {
                     json.properties.texts = feature.geometry.texts;
@@ -714,26 +718,32 @@ export class GeoJSON extends JSONFormat {
             return null;
         }
         var attr = {};
+        var foreignMembers = {};
         processFieldsAttributes(feature, attr);
         var exceptKeys = ["fieldNames", "fieldValues", "geometry", "stringID", "ID"];
         for (var key in feature) {
             if (exceptKeys.indexOf(key) > -1) {
                 continue;
             }
-            attr[key] = feature[key];
+            if(GeoJSON.supportForeignMembers){
+              foreignMembers[key] = feature[key];
+            }else{
+              attr[key] = feature[key];
+            }            
         }
 
         function processFieldsAttributes(feature, attributes) {
-            if (!(feature.hasOwnProperty("fieldNames") && feature.hasOwnProperty("fieldValues"))) {
-                return;
-            }
-            var names = feature.fieldNames,
-                values = feature.fieldValues;
-            for (var i in names) {
-                attributes[names[i]] = values[i];
-            }
+          if (!(feature.hasOwnProperty('fieldNames') && feature.hasOwnProperty('fieldValues'))) {
+            return;
+          }
+          var names = feature.fieldNames,
+            values = feature.fieldValues;
+          for (var i in names) {
+            attributes[names[i]] = values[i];
+          }
         }
 
-        return attr;
+        return {attr,foreignMembers};
     }
 }
+GeoJSON.supportForeignMembers = true;

src/common/iServer/EditFeaturesParameters.js

@@ -13,7 +13,7 @@ import {ServerGeometry} from './ServerGeometry';
  * @param {Object} options - 参数。
  * @param {string} options.dataSourceName - 当前需要创建或者是修改的要素的数据源。
  * @param {string} options.datasetName - 当前需要创建或者是修改的要素的数据集。
- * @param {Array.<FeatureVector|GeoJSONObject|ol.Feature>} options.features - 当前需要创建或者是修改的要素集。
+ * @param {Array.<GeoJSONObject|ol.Feature|FeatureVector>} options.features - 当前需要创建或者是修改的要素集。
  * @param {boolean} [options.returnContent=false] - 是否返回要素内容。如果为 true 则返回创建要素的 ID 数组，为 false 则返回 featureResult 资源的 URI。
  * @param {EditType} [options.editType=EditType.ADD] - POST 动作类型 (ADD、UPDATE、DELETE)。
  * @param {Array.<string|number>} [options.IDs] - 删除要素时的要素的 ID 数组。

test/common/format/GeoJSONSpec.js

@@ -757,4 +757,30 @@ describe('GeoJSON', () => {
     var result = new GeoJSON().read(feature, feature.type);
     expect(result.geometry.id).toBe(3);
   });
+  it('geometry foreignMembers', () => {
+    var obj = {
+      test: 'test',
+      ID: null,
+      fieldValues: ['127', '利伯维尔'],
+      fieldNames: ['SMID', 'CAPITAL'],
+      geometry: {
+        id: 1,
+        parts: [1],
+        points: [
+          {
+            y: -4377.027184298267,
+            x: 4020.0045221720466
+          }
+        ],
+        type: GeometryType.POINT
+      }
+    };
+
+    var geo = new GeoJSON().toGeoJSON(obj);
+    expect(geo.test).toEqual('test');
+    GeoJSON.supportForeignMembers = false;
+    geo = new GeoJSON().toGeoJSON(obj);
+    expect(geo.properties.test).toEqual('test');
+    GeoJSON.supportForeignMembers = true;
+  });
 });