Merge branch 'dev' of https://github.com/MapGIS/WebClient-JavaScript into dev

Author: 潘卓然ParnDeedlit

src/service/Igserver/MRFS/Feature.js

@@ -183,7 +183,7 @@ class VFeature {
       featureSet = featureSet.concat(feature);
     }
     let geojson = {
-      type: "feature",
+      type: "FeatureCollection",
       features: featureSet
     };
     return geojson;
@@ -198,13 +198,16 @@ class VFeature {
       feature = {};
       //处理数据coordinates
       if (geomArr[i].type === "Polygon") {
-        geomArr[i].coordinates = geomArr[i].coordinates.concat(
-          geomArr[i].exterior,
-          geomArr[i].interior
-        );
+        geomArr[i].coordinates = [
+          geomArr[i].coordinates.concat(
+              geomArr[i].exterior,
+              geomArr[i].interior
+          )
+        ];
       }
       feature.geometry = geomArr[i];
       feature.properties = properties;
+      feature.type = "Feature";
       features.push(feature);
     }
     return features;

src/service/Igserver/MRFS/FeatureService.js

@@ -22,21 +22,21 @@ import {
 } from "../../common";
 
 class FeatureService {
-    static get(url, fn, error) {
+    static get(url, fn, error, option) {
         // XMLHttpRequest对象用于在后台与服务器交换数据
         let xhr = new XMLHttpRequest();
         xhr.open("GET", url, true);
         xhr.onreadystatechange = function() {
             // readyState == 4说明请求已完成
             if ((xhr.readyState == 4 && xhr.status == 200) || xhr.status == 304) {
                 // 从服务器获得数据
-                fn.call(this, xhr.responseText);
+                fn.call(this, xhr.responseText, option);
             } else if (
                 xhr.readyState === 4 &&
                 xhr.status !== 200 &&
                 xhr.status !== 304
             ) {
-                error.call(this, xhr.responseText);
+                error.call(this, xhr.responseText, option);
             }
         };
         xhr.send();