Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: Yuki-Zhao

src/openlayers/mapping/WebMap.js

@@ -22,6 +22,7 @@ import { DataFlowService } from '../services'
 
 import provincialCenterData from './webmap/config/ProvinceCenter.json';// eslint-disable-line import/extensions
 import municipalCenterData from './webmap/config/MunicipalCenter.json';// eslint-disable-line import/extensions
+import SampleDataInfo from './webmap/config/SampleDataInfo.json';// eslint-disable-line import/extensions
 
 import GeoJSON from 'ol/format/GeoJSON';
 import MVT from 'ol/format/MVT';
@@ -38,6 +39,7 @@ import WMTSTileGrid from 'ol/tilegrid/WMTS';
 import * as olGeometry from 'ol/geom';
 import * as olSource from 'ol/source';
 import Feature from 'ol/Feature';
+import olRenderFeature from 'ol/render/Feature';
 import Style from 'ol/style/Style';
 import FillStyle from 'ol/style/Fill';
 import StrokeStyle from 'ol/style/Stroke';
@@ -198,6 +200,7 @@ export class WebMap extends Observable {
             }
             that.baseProjection = mapInfo.projection;
             that.webMapVersion = mapInfo.version;
+            that.baseLayer = mapInfo.baseLayer;
             that.mapParams = {
                 title: mapInfo.title,
                 description: mapInfo.description
@@ -1413,7 +1416,7 @@ export class WebMap extends Observable {
                             withCredentials: this.withCredentials
                         }).then(function (response) {
                             return response.json()
-                        }).then(function (data) {
+                        }).then(async function (data) {
                             if (data.succeed === false) {
                                 //请求失败
                                 that.layerAdded++;
@@ -1434,7 +1437,7 @@ export class WebMap extends Observable {
                                         let geojson = that.excelData2FeatureByDivision(data.content, divisionType, divisionField);
                                         features = that._parseGeoJsonData2Feature({allDatas:{features:geojson.features},fileCode:layer.projection});
                                     } else {
-                                        features = that.excelData2Feature(data.content, layer);
+                                        features = await that.excelData2Feature(data.content, layer);
                                     }
                                 }
                                 that.addLayer(layer, features, layerIndex);
@@ -1785,7 +1788,7 @@ export class WebMap extends Observable {
      */
     sendMapToUser(layersLen) {
         if (this.layerAdded === layersLen && this.successCallback) {
-            this.successCallback(this.map, this.mapParams, this.layers);
+            this.successCallback(this.map, this.mapParams, this.layers, this.baseLayer);
         }
     }
 
@@ -1797,7 +1800,7 @@ export class WebMap extends Observable {
      * @param {object} layerInfo - 图层信息
      * @returns {Array}  ol.feature的数组集合
      */
-    excelData2Feature(content, layerInfo) {
+    async excelData2Feature(content, layerInfo) {
         let rows = content.rows,
             colTitles = content.colTitles;
         // 解决V2恢复的数据中含有空格
@@ -1807,10 +1810,50 @@ export class WebMap extends Observable {
             }
         }
         let fileCode = layerInfo.projection,
-            xIdx = colTitles.indexOf(Util.trim((layerInfo.xyField && layerInfo.xyField.xField) || (layerInfo.from && layerInfo.from.xField))),
-            yIdx = colTitles.indexOf(Util.trim((layerInfo.xyField && layerInfo.xyField.yField) || (layerInfo.from && layerInfo.from.yField))),
+            dataSource = layerInfo.dataSource,
             baseLayerEpsgCode = this.baseProjection,
-            features = [];
+            features = [],
+            xField = Util.trim((layerInfo.xyField && layerInfo.xyField.xField) || (layerInfo.from && layerInfo.from.xField)),
+            yField = Util.trim((layerInfo.xyField && layerInfo.xyField.yField) || (layerInfo.from && layerInfo.from.yField)),
+            xIdx = colTitles.indexOf(xField),
+            yIdx = colTitles.indexOf(yField);
+
+        // todo 优化 暂时这样处理
+        if (layerInfo.layerType === 'MIGRATION') {
+            try {
+                if (dataSource.type === 'PORTAL_DATA') {
+                    const { dataMetaInfo } = await FetchRequest.get(`${this.server}web/datas/${dataSource.serverId}.json`, null, {
+                        withCredentials: true
+                    }).then(res => res.json());
+                    // eslint-disable-next-line require-atomic-updates
+                    layerInfo.xyField = {
+                        xField: dataMetaInfo.xField,
+                        yField: dataMetaInfo.yField
+                    }
+                    if(!dataMetaInfo.xIndex) {
+                        xIdx = colTitles.indexOf(dataMetaInfo.xField);
+                        yIdx = colTitles.indexOf(dataMetaInfo.yField);
+                    } else {
+                        xIdx = dataMetaInfo.xIndex;
+                        yIdx = dataMetaInfo.yIndex;
+                    } 
+                } else if (dataSource.type === 'SAMPLE_DATA') {
+                    // 示例数据从本地拿xyField
+                    const sampleData = SampleDataInfo.find(item => item.id === dataSource.name) || {};
+                    xField = sampleData.xField;
+                    yField = sampleData.yField
+                    layerInfo.xyField = {
+                        xField,
+                        yField
+                    }
+                    xIdx = colTitles.findIndex(item => item === xField);
+                    yIdx = colTitles.findIndex(item => item === yField);
+                }
+            } catch (error) {
+                console.error(error);
+            }
+        }
+
         for (let i = 0, len = rows.length; i < len; i++) {
             let rowDatas = rows[i],
                 attributes = {},
@@ -1832,7 +1875,7 @@ export class WebMap extends Observable {
                 features.push(feature);
             }
         }
-        return features;
+        return Promise.resolve(features);
     }
     /**
      * @private
@@ -4050,22 +4093,18 @@ export class WebMap extends Observable {
         });
         return new Promise((resolve) => {
             mapboxStyles.on('styleloaded', function () {
-                let styleUrl = layerInfo.url;
-                if (styleUrl.indexOf('/restjsr/') > -1) {
-                    styleUrl = styleUrl + '/style.json'
-                }
                 let visibleScale = layerInfo.visibleScale;
                 let minResolution = visibleScale && that.resolutions[visibleScale.maxScale];
                 let maxResolution = visibleScale && that.resolutions[visibleScale.minScale];
                 let layer = new olLayer.VectorTile({
                     //设置避让参数
                     declutter: true,
                     source: new olSource.VectorTileSuperMapRest({
-                        style: styleUrl,
+                        style: styles,
                         withCredentials,
                         projection: layerInfo.projection,
                         format: new MVT({
-                            featureClass: Feature
+                            featureClass: olRenderFeature
                         }),
                         wrapX: false
                     }),

src/openlayers/mapping/webmap/config/SampleDataInfo.json

@@ -0,0 +1,55 @@
+
+[
+    {
+        "id": "SalesJan2009",
+        "fileName": "SalesJan2009",
+        "xField": "Longitude",
+        "yField": "Latitude",
+        "type": "POINT"
+    },
+    {
+        "id": "Sacramentorealestatetransactions",
+        "fileName": "Ealestate transactions",
+        "xField": "longitude",
+        "yField": "latitude",
+        "type": "POINT"
+    },
+    {
+        "id": "BeijingResidentialDistrict",
+        "fileName": "北京市住宅小区",
+        "xField": "SmX",
+        "yField": "SmY",
+        "type": "POINT"
+    },
+    {
+        "id": "GlobalRecordOfOver7Earthquakes",
+        "fileName": "全球历史7级以上地震记录",
+        "xField": "经度",
+        "yField": "纬度",
+        "type": "POINT"
+    },
+    {
+        "id": "ChinaRecordOfOver6Earthquakes",
+        "fileName": "中国历史6级以上地震记录",
+        "xField": "经度",
+        "yField": "纬度",
+        "type": "POINT"
+    },
+    {
+        "id": "ChinaMeteorologicalObservationStation",
+        "fileName": "中国气象观测站",
+        "xField": "经度",
+        "yField": "纬度",
+        "type": "POINT"
+    },
+    {
+        "id": "BeijingSubwayLine",
+        "fileName": "北京市地铁交通线路",
+        "type": "LINE"
+    },
+    {
+        "id": "ChinaEarthquakeIntensityZone",
+        "fileName": "中国地震烈度区划面",
+        "type": "POLYGON"
+    }
+]