【fix】revert 误提交

Author: songyumeng

examples/mapboxgl/config.js

@@ -568,7 +568,7 @@ var exampleConfig = {
         version: '9.1.2',
         content: {
             ip_map: {
-                name: '地图',
+                name: '地图(WebMap2.0)',
                 name_en: 'iPortal Web map',
                 version: '9.1.2',
                 content: [
@@ -606,10 +606,17 @@ var exampleConfig = {
                         version: '9.1.2',
                         thumbnail: 'iPortalWebmap_unicode.png',
                         fileName: 'iPortalWebmap_unicode'
-                    },
+                    }
+                ]
+            },
+            ip_map_3: {
+                name: '地图(WebMap3.0)',
+                name_en: 'iPortal Web map',
+                version: '11.2.0',
+                content: [
                     {
-                        name: 'WebMap 3.0',
-                        name_en: 'WebMap 3.0',
+                        name: '白膜',
+                        name_en: 'Fill Extrusion',
                         version: '11.2.0',
                         thumbnail: 'iPortalWebmap_mapstudio.png',
                         fileName: 'iPortalWebmap_mapstudio'

examples/mapboxgl/videoLayer.html

@@ -77,15 +77,15 @@
           datasetNames: [datasourceName + ':' + datasetName]
         });
 
-        new mapboxgl.supermap.FeatureService(dataUrl).getFeaturesBySQL(sqlParam).then(function (serviceResult) {
+        new mapboxgl.supermap.FeatureService(dataUrl).getFeaturesBySQL(boundsParam).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].address;
+          let address = serviceResult.result.features.features[0].properties.address;
           videoLayer = new mapboxgl.supermap.VideoLayer({
             url: address,
             extent: [coordinates[3], coordinates[2], coordinates[1], coordinates[0]]

src/common/format/GeoJSON.js

@@ -226,15 +226,11 @@ 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": attr,
+                    "properties": this.createAttributes(feature),
                     "geometry": geom
                 };
-                for (const key in foreignMembers) {
-                  json[key] = foreignMembers[key];
-                }
 
                 if (feature.geometry && feature.geometry.type === 'TEXT') {
                     json.properties.texts = feature.geometry.texts;
@@ -718,32 +714,26 @@ 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;
             }
-            if(GeoJSON.supportForeignMembers){
-              foreignMembers[key] = feature[key];
-            }else{
-              attr[key] = feature[key];
-            }            
+            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,foreignMembers};
+        return attr;
     }
 }
-GeoJSON.supportForeignMembers = true;

test/common/format/GeoJSONSpec.js

@@ -757,30 +757,4 @@ 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;
-  });
 });