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

xilanhuaweidapao · xilanhuaweidapao · commit ebde5237eb58 · 2021-09-13T19:38:00.000+08:00
diff --git a/examples/mapboxgl/deckglLayer_pathLayer.html b/examples/mapboxgl/deckglLayer_pathLayer.html
@@ -77,12 +77,12 @@
           data: features,
           props: {
             widthScale: 20, //线宽比例
-            widthMinPixels: 2 //线宽最小像素值
+            widthMinPixels: 2, //线宽最小像素值
+            fp64:true // 以高精度64位模式呈现图层
             //该类型可配置的其他参数有：
             //widthMaxPixels  线宽最大像素值，默认为 Number.MAX_SAFE_INTEGER；
             //rounded  节点是否绘制为弧形，可选参数，默认为 false；
             //miterLimit  节点相对于线宽的最大范围，默认为 4，仅在 rounded 为 false 时有效；
-            //fp64  否应以高精度64位模式呈现图层，默认为 false；
             //dashJustified 是否虚线形式显示，默认为 false，仅在 getDashArray() 回调函数被指定时有效；
           },
           callback: {
diff --git a/src/mapboxgl/overlay/DeckglLayer.js b/src/mapboxgl/overlay/DeckglLayer.js
@@ -115,7 +115,10 @@ export class DeckglLayer {
         if (map.getCRS && map.getCRS() !== mapboxgl.CRS.EPSG3857) {
             this.coordinateSystem = 3;
             this.isGeographicCoordinateSystem = true;
-        }
+        } else {
+            this.coordinateSystem = 1;
+            this.isGeographicCoordinateSystem = false;
+        } 
         //创建图层容器
         this._initContainer();
 
@@ -340,6 +343,9 @@ export class DeckglLayer {
         if (map.getCRS && map.getCRS() !== mapboxgl.CRS.EPSG3857) {
             state.coordinateSystem = this.coordinateSystem;
             state.isGeographicCoordinateSystem = this.isGeographicCoordinateSystem;
+        } else {
+            state.coordinateSystem = 1;
+            state.isGeographicCoordinateSystem = false
         }
 
         //更行数据
@@ -397,7 +403,7 @@ export class DeckglLayer {
         var me = this;
         this.props.getPosition = this.callback.getPosition
             ? this.callback.getPosition
-            : function(point) {
+            : function (point) {
                   if (!point) {
                       return [0, 0, 0];
                   }
@@ -407,7 +413,7 @@ export class DeckglLayer {
         if (this.callback.getColor) {
             this.props.getColor = this.callback.getColor
                 ? this.callback.getColor
-                : function(point) {
+                : function (point) {
                       let style = point && point.getStyle();
                       return (style && style.color) || me.props.color;
                   };
@@ -416,7 +422,7 @@ export class DeckglLayer {
         if (this.callback.getRadius) {
             this.props.getRadius = this.callback.getRadius
                 ? this.callback.getRadius
-                : function(point) {
+                : function (point) {
                       let style = point && point.getStyle();
                       return (style && style.radius) || me.props.radius;
                   };
@@ -441,7 +447,7 @@ export class DeckglLayer {
     _createPathLayer() {
         this.props.getPath = this.callback.getPath
             ? this.callback.getPath
-            : function(feature) {
+            : function (feature) {
                   return feature.geometry.coordinates;
               };
         //以下几个函数也可走默认值
@@ -465,7 +471,7 @@ export class DeckglLayer {
     _createPolygonLayer() {
         this.props.getPolygon = this.callback.getPolygon
             ? this.callback.getPolygon
-            : function(feature) {
+            : function (feature) {
                   return feature.geometry.coordinates;
               };
 
@@ -496,7 +502,7 @@ export class DeckglLayer {
         //todo ArcLineLayer geojson coordinates数组中只能有一个线段
         this.props.getSourcePosition = this.callback.getSourcePosition
             ? this.callback.getSourcePosition
-            : function(feature) {
+            : function (feature) {
                   if (!feature) {
                       return [0, 0, 0];
                   }
@@ -505,7 +511,7 @@ export class DeckglLayer {
               };
         this.props.getTargetPosition = this.callback.getTargetPosition
             ? this.callback.getTargetPosition
-            : function(feature) {
+            : function (feature) {
                   if (!feature) {
                       return [0, 0, 0];
                   }
@@ -533,7 +539,7 @@ export class DeckglLayer {
     _createHexagonLayer() {
         this.props.getPosition = this.callback.getPosition
             ? this.callback.getPosition
-            : function(feature) {
+            : function (feature) {
                   if (!feature) {
                       return [0, 0, 0];
                   }
