@vtx/cs-map 1.0.82 → 1.0.84

package/lib/map/index.js

@@ -24,6 +24,8 @@ var _lodash = require("lodash");
 var _createFeatureCollection = require("../feature-layer/createFeatureCollection");
 var _getBBoxFromGeojson = _interopRequireDefault(require("../_util/getBBoxFromGeojson.js"));
 var _heightAndZoom = require("../_util/heightAndZoom.js");
+var _TdtImageryProvider = require("./base/imagery/tdt/TdtImageryProvider");
+var _IRSImageryProvider = require("./base/imagery/irs/IRSImageryProvider");
 var _excluded = ["center", "fitViewHeight", "dark", "zoom", "createdMap"],
   _excluded2 = ["geoJson", "geometryInfo", "data", "entity", "lng", "lat", "height", "options"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -122,25 +124,18 @@ function Map(props) {
       };
     }
   }, []);
-  var addImageryProvider = function addImageryProvider() {
-    var TDT_CIA_W = "https://{s}.tianditu.gov.cn/cia_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=cia&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default.jpg&tk=".concat(tk);
-    var cia = new _cesium.WebMapTileServiceImageryProvider({
+  var addLabelImageryProvider = function addLabelImageryProvider() {
+    if (!baseMapStyle.hideLabel) {
       // 调用影响中文注记服务
-      url: TDT_CIA_W,
-      layer: 'cia_w',
-      style: 'default',
-      format: 'tiles',
-      tileMatrixSetID: 'GoogleMapsCompatible',
-      subdomains: ['t0', 't1', 't2', 't3', 't4', 't5', 't6', 't7'],
-      // 天地图8个服务器
-      minimumLevel: 0,
-      maximumLevel: 18
-    });
-    mapRef.current.imageryLayers.addImageryProvider(cia); // 添加到cesium图层上
-  };
-  (0, _react.useEffect)(function () {
-    if (baseMapStyle.imageryProvider === 'TdtImageryProvider' && !baseMapStyle.hideLabel) {
-      addImageryProvider();
+      if (baseMapStyle.imageryProvider === 'TdtImageryProvider') {
+        var cia = new _TdtImageryProvider.TdtLabelImageryProvider({
+          tk: tk
+        });
+        mapRef.current.imageryLayers.addImageryProvider(cia); // 添加到cesium图层上
+      } else if (baseMapStyle.imageryProvider === 'IRSImageryProvider') {
+        var _cia = new _IRSImageryProvider.IRSLabelImageryProvider(baseMapStyle);
+        mapRef.current.imageryLayers.addImageryProvider(_cia); // 添加到cesium图层上
+      }
     } else {
       if (mapRef.current) {
         var layers = mapRef.current.imageryLayers._layers || [];
@@ -153,7 +148,7 @@ function Map(props) {
         }
       }
     }
-  }, [baseMapStyle.imageryProvider, baseMapStyle.hideLabel]);
+  };
   var initMap = function initMap() {
     var center = props.center,
       fitViewHeight = props.fitViewHeight,
@@ -176,12 +171,12 @@ function Map(props) {
       maxZoom: maxZoom && Number(maxZoom) || 20
     };
     _cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhZjc0ZDQ1ZS0wNWNhLTRhMDQtODJmYy03NTcyNDcxYzgzMDUiLCJpZCI6NzE4MTQsImlhdCI6MTYzNTQ3NzgyNX0.4TrdZWPWc9_6jLeGe90bRmBPB14XptwinSewVMu1iCE';
-    var imageryProvider = new _base.Imagery[baseMapStyle.imageryProvider]({
+    var imageryProvider = new _base.Imagery[baseMapStyle.imageryProvider](_objectSpread({
       style: baseMapStyle.style,
       url: baseMapUrl,
       crs: 'WGS84',
       dark: dark
-    });
+    }, baseMapStyle));
     var map = new _cesium.Viewer(mapDomRef.current, _objectSpread({
       shouldAnimate: true,
       animation: false,
@@ -215,6 +210,10 @@ function Map(props) {
       //设置背景透明
       imageryProvider: imageryProvider
     }, options));
+    if (dark) {
+      // 设置地球颜色
+      map.scene.globe.baseColor = _cesium.Color.fromCssColorString('#152937');
+    }
 
     // 事件订阅
     map.eventEmitter = new _EventEmitter["default"]();
@@ -420,13 +419,16 @@ function Map(props) {
 
     // 获取 3DTiles feature 属性
     map.get3DTileFeatureProperties = function (feature) {
-      var _feature$getPropertyN;
       var properties = {};
-      var propertyIds = (feature === null || feature === void 0 || (_feature$getPropertyN = feature.getPropertyNames) === null || _feature$getPropertyN === void 0 ? void 0 : _feature$getPropertyN.call(feature)) || [];
-      var length = propertyIds.length;
-      for (var i = 0; i < length; ++i) {
-        var propertyId = propertyIds[i];
-        properties[propertyId] = feature.getProperty(propertyId);
+      if (feature && feature.getPropertyNames) {
+        var propertyIds = feature.getPropertyNames() || [];
+        if (propertyIds !== null && propertyIds !== void 0 && propertyIds.length) {
+          var length = propertyIds.length;
+          for (var i = 0; i < length; ++i) {
+            var propertyId = propertyIds[i];
+            properties[propertyId] = feature.getProperty(propertyId);
+          }
+        }
       }
       return properties;
     };
@@ -652,19 +654,21 @@ function Map(props) {
     // 注册图层组件事件
     function registerEvent(feature, event) {
       if (feature) {
-        var _feature$event;
-        var properties = map.getProperties(feature) || {};
-        if (feature instanceof _cesium.ImageryLayerFeatureInfo && feature !== null && feature !== void 0 && feature.data) {
-          properties = _objectSpread(_objectSpread({}, properties), {}, {
-            data: feature === null || feature === void 0 ? void 0 : feature.data
-          });
-        }
-
-        // 触发自身事件
-        (_feature$event = feature[event]) === null || _feature$event === void 0 || _feature$event.call(feature, properties);
         var layer = map.getLayerByFeature(feature);
-        if (layer !== null && layer !== void 0 && layer[event]) {
-          layer[event](properties);
+        if (layer !== null && layer !== void 0 && layer[event] || feature[event]) {
+          var _feature$event;
+          var properties = map.getProperties(feature) || {};
+          if (feature instanceof _cesium.ImageryLayerFeatureInfo && feature !== null && feature !== void 0 && feature.data) {
+            properties = _objectSpread(_objectSpread({}, properties), {}, {
+              data: feature === null || feature === void 0 ? void 0 : feature.data
+            });
+          }
+
+          // 触发自身事件
+          (_feature$event = feature[event]) === null || _feature$event === void 0 || _feature$event.call(feature, properties);
+          if (layer !== null && layer !== void 0 && layer[event]) {
+            layer[event](properties);
+          }
         }
       }
     }
@@ -676,7 +680,7 @@ function Map(props) {
       // 无法单独设置group内的图层
       // 暂时为了取消行政区划影像图层的点击效果
       if (layer) {
-        unclickable = layer.unclickable;
+        unclickable = layer.viewOnly || layer.unclickable;
       }
       return unclickable;
     }
@@ -692,10 +696,16 @@ function Map(props) {
       if (!map.cancelBubble) {
         var pick = map.scene.pick(event.position);
         if (pick instanceof _cesium.Cesium3DTileFeature) {
-          if (checkClickable(pick)) {
-            map.onClickTemplateAfter && map.onClickTemplateAfter(pick);
+          var layer = map.getLayerByFeature(pick);
+          if (layer) {
+            if (layer.unclickable) {
+              return;
+            }
             registerEvent(pick, 'onClick');
-            map.showTemplate(pick);
+            if (layer.template) {
+              map.onClickTemplateAfter && map.onClickTemplateAfter(pick);
+              map.showTemplate(pick);
+            }
           }
         } else {
           var entity = map.pickDataSourcesFeature(event);
@@ -925,6 +935,7 @@ function Map(props) {
       // 延时触发回调事件
       setTimeout(function () {
         createdMap && createdMap(map);
+        addLabelImageryProvider();
         onEvents.createdMap && onEvents.createdMap(map);
         setMapLoaded(true);
       }, (duration + 0.5) * 1000);
@@ -941,6 +952,7 @@ function Map(props) {
       // 延时触发回调事件
       setTimeout(function () {
         createdMap && createdMap(map);
+        addLabelImageryProvider();
         onEvents.createdMap && onEvents.createdMap(map);
         setMapLoaded(true);
       }, 500);