@kq_npm/client3d_webgl_vue 3.4.2-beta → 3.4.4-beta

package/scenceview/index.js

@@ -230,7 +230,8 @@ class AddDataViewModel {
                 serverType: "datasource",
                 lsType: "ls",
                 url: res,
-                addType: "geojson"
+                addType: "geojson",
+                shapeType: that._layerManager.getShapeType(ds)
               };
 
               that._layerManager.addTempLayerNode(layer);
@@ -272,7 +273,8 @@ class AddDataViewModel {
                 serverType: "datasource",
                 lsType: "ls",
                 url: res,
-                addType: "geojson"
+                addType: "geojson",
+                shapeType: that._layerManager.getShapeType(ds)
               };
 
               that._layerManager.addTempLayerNode(layer);
@@ -335,7 +337,8 @@ class AddDataViewModel {
                   serverType: "datasource",
                   lsType: "ls",
                   url: ret,
-                  addType: "geojson"
+                  addType: "geojson",
+                  shapeType: that._layerManager.getShapeType(ds)
                 };
 
                 that._layerManager.addTempLayerNode(layer);
@@ -727,7 +730,9 @@ class AddDataViewModel {
           lsType: "ls",
           url: url,
           addType: type,
-          layerName: name
+          layerName: name,
+          type: "Image" // 图层树显示图标使用
+
         };
 
         this._layerManager.addTempLayerNode(node);
@@ -834,7 +839,9 @@ class AddDataViewModel {
           serverType: "imagerylayer",
           lsType: "ls",
           url: url,
-          addType: type
+          addType: type,
+          renderType: "vectortile" // 图层树显示图标使用
+
         };
 
         this._layerManager.addTempLayerNode(node);
@@ -848,7 +855,9 @@ class AddDataViewModel {
             guid: group.guid,
             name: name || "wms",
             children: [],
-            lsType: "ls"
+            lsType: "ls",
+            serverType: 'ogcwms' //图层树显示图标使用
+
           };
           var layers = group._addedLayers || group._layers;
 
@@ -880,12 +889,20 @@ class AddDataViewModel {
       case "wmts":
       case "kqgistileserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
+          var defaultName = 'wmts';
+          if (type === "kqgistileserver") defaultName = 'tile';
           node = {
             guid: group.guid,
-            name: name || "wmts",
+            name: name || defaultName,
             children: [],
             lsType: "ls"
           };
+
+          if (type === "wmts") {
+            //图层树显示图标使用
+            node.serverType = "ogcwmts";
+          }
+
           var layers = group._addedLayers || group._layers;
 
           if (layers) {
@@ -971,7 +988,8 @@ class AddDataViewModel {
             serverType: "datasource",
             lsType: "ls",
             url: url,
-            addType: type
+            addType: type,
+            shapeType: this._layerManager.getShapeType(ds)
           };
 
           this._layerManager.addTempLayerNode(node);
@@ -26545,9 +26563,14 @@ class LayerManager {
       });
       this._promises = [];
       Promise.all(sourcePromises).then(() => {
-        layer.layerTreeData.forEach(data => {
-          this.setLayerInfo(data, layer.sources);
-        }, this);
+        // layer.layerTreeData.forEach(data => {
+        //   this.setLayerInfo(data, layer.sources);
+        // }, this);
+        //倒序加载图层
+        for (let i = layer.layerTreeData.length - 1; i >= 0; i--) {
+          this.setLayerInfo(layer.layerTreeData[i], layer.sources);
+        }
+
         Promise.all(this._promises).then(() => {
           this._layerTreeData = layer.layerTreeData;
 
@@ -26573,10 +26596,14 @@ class LayerManager {
 
   setLayerInfo(layerData, sources) {
     if (layerData.children) {
-      layerData.guid = Cesium.createGuid();
-      layerData.children.forEach(child => {
-        this.setLayerInfo(child, sources);
-      }, this);
+      layerData.guid = Cesium.createGuid(); // layerData.children.forEach(child => {
+      //   this.setLayerInfo(child, sources);
+      // }, this);
+      //倒序加载子图层
+
+      for (let i = layerData.children.length - 1; i >= 0; i--) {
+        this.setLayerInfo(layerData.children[i], sources);
+      }
     } else {
       if (layerData.sourceName) {
         var source = sources.find(item => {
@@ -26614,18 +26641,20 @@ class LayerManager {
             type = "kqgisimageserver";
           } else if (layerData.sourceType === "kq3dserver") {
             type = "kqgis3dserver";
+          } else if (layerData.sourceType === "mvt") {
+            type = "mvt";
           }
 
           layerData.addType = type;
 
-          this._layerListData.push(layerData);
+          this._layerListData.push(layerData); //是否添加图层
 
-          if (!this._scenceShowLayers || this._scenceShowLayers.indexOf(layerData.name) > -1) {
-            var promise = this.addLayerData(layerData);
 
-            if (promise) {
-              this._promises.push(promise);
-            }
+          let isAdd = !this._scenceShowLayers || this._scenceShowLayers.indexOf(layerData.name) > -1;
+          var promise = this.addLayerData(layerData, isAdd);
+
+          if (promise) {
+            this._promises.push(promise);
           }
         }
       }
@@ -26633,7 +26662,7 @@ class LayerManager {
   } //添加图层数据
 
 
-  addLayerData(layerData) {
+  addLayerData(layerData, isAdd = true) {
     var type = layerData.addType;
     let url = layerData.url;
     type = type || "";
@@ -26658,6 +26687,10 @@ class LayerManager {
           }
         }
       }
+    } else {
+      if (!name || name === "") {
+        name = layerData.layerType;
+      }
     }
 
     layerData.name = name;
@@ -26667,65 +26700,80 @@ class LayerManager {
     switch (type) {
       case 'kq3dimageryfile':
         //影像瓦片文件
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dFileImageryProvider({
-          name: name,
-          url: url,
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dFileImageryProvider({
+            name: name,
+            url: url,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case 'obterrain':
         //ob地形瓦片文件
-        layer = new Cesium.Kq3dFileTerrainProvider({
-          name: name,
-          url: url,
-          ...params
-        });
-        layer.guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "terrainprovider";
-        this._viewer.terrainProvider = layer;
 
-        this._terrainProviders.push(layer);
+        if (isAdd) {
+          layer = new Cesium.Kq3dFileTerrainProvider({
+            name: name,
+            url: url,
+            ...params
+          });
+          layer.guid = layerData.guid;
+          this._viewer.terrainProvider = layer;
+
+          this._terrainProviders.push(layer);
+        }
 
         break;
 
       case 'stkterrain':
         //stk地形瓦片文件
-        layer = new Cesium.CesiumTerrainProvider({
-          name: name,
-          url: url,
-          requestVertexNormals: true,
-          requestWaterMask: false,
-          ...params
-        });
-        layer.guid = layerData.guid;
-        this._viewer.terrainProvider = layer;
+        layerData.visible = isAdd;
+        layerData.serverType = "terrainprovider";
 
-        this._terrainProviders.push(layer);
+        if (isAdd) {
+          layer = new Cesium.CesiumTerrainProvider({
+            name: name,
+            url: url,
+            requestVertexNormals: true,
+            requestWaterMask: false,
+            ...params
+          });
+          layer.guid = layerData.guid;
+          this._viewer.terrainProvider = layer;
+
+          this._terrainProviders.push(layer);
+        }
 
-        layerData.visible = true;
-        layerData.serverType = "terrainprovider";
         break;
 
       case "3dtiles":
-        layer = this._viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
-          name: name,
-          url: url,
-          ...params
-        }));
-        if (layerData.style && layer) layer.style = layerData.style;
-        if (layerData.shader && layer) layer.kq3dCustomShader = layerData.shader;
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "3dtiles";
+
+        if (isAdd) {
+          layer = this._viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
+            name: name,
+            url: url,
+            ...params
+          }));
+          if (layerData.style && layer) layer.style = layerData.style;
+          if (layerData.shader && layer) layer.kq3dCustomShader = layerData.shader;
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case "kqgis3dserver":
         var that = this;
+        layerData.visible = isAdd;
         promise = this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
           var layers = group._addedLayers || group._layers;
 
@@ -26735,34 +26783,48 @@ class LayerManager {
 
             if (layer instanceof Cesium.Cesium3DTileset) {
               serverType = "3dtiles";
+              layer.show = isAdd;
             } else if (layer instanceof Cesium.ImageryLayer) {
               serverType = "imagerylayer";
+              layer.show = isAdd;
             } else if (layer instanceof Cesium.Kq3dFileTerrainProvider || layer instanceof Cesium.CesiumTerrainProvider) {
               serverType = "terrainprovider";
               layer.guid = layerData.guid;
 
               that._terrainProviders.push(layer);
+
+              if (!isAdd) {
+                layer.readyPromise.then(() => {
+                  that._viewer.terrainProvider = that._emptyTerrainProvider;
+                });
+              }
             } else if (layer instanceof Cesium.Kq3dGeoJsonDataSource) {
               serverType = "datasource";
+              layer.show = isAdd;
+              layerData.shapeType = that.getShapeType(layer);
             }
 
             layer._guid = layerData.guid;
-            layerData.visible = true;
             layerData.serverType = serverType;
           }
         });
         break;
 
       case "kqgisimageserver":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISServerImageryProviderExt({
-          name: name,
-          url: url,
-          layerName: layerData.layerName,
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+        layerData.type = "Image"; // 图层树显示图标使用
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISServerImageryProviderExt({
+            name: name,
+            url: url,
+            layerName: layerData.layerName,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case "kqgismapserver":
@@ -26780,125 +26842,145 @@ class LayerManager {
           }
         }
 
-        layerData.visible = true;
-        var imageryProvider = new Cesium.Kq3dKQGISMapServerImageryProviderExt({
-          url: url,
-          ua_token: layerData.token,
-          layers: layerData.id + "",
-          ...params
-        });
-        layer = new Cesium.ImageryLayer(imageryProvider);
+        layerData.visible = isAdd;
+        layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          var imageryProvider = new Cesium.Kq3dKQGISMapServerImageryProviderExt({
+            url: url,
+            ua_token: layerData.token,
+            layers: layerData.id + "",
+            ...params
+          });
+          layer = new Cesium.ImageryLayer(imageryProvider);
 
-        this._viewer.imageryLayers.add(layer);
+          this._viewer.imageryLayers.add(layer);
+
+          layer._guid = layerData.guid;
+        }
 
-        layer._guid = layerData.guid;
-        layerData.serverType = "imagerylayer";
         break;
 
       case "arcgismapserver":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
-          name: name,
-          url: url,
-          layers: layerData.id + "",
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
+            name: name,
+            url: url,
+            layers: layerData.id + "",
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case "mvt":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
-          name: name,
-          url: url,
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+        layerData.renderType = "vectortile"; // 图层树显示图标使用
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+            name: name,
+            style: url,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case "wms":
         //配置id时只能是单个图层
         if (layerData.rect84) {
-          var options = {
-            url: url,
-            layers: layerData.id + "",
-            tilingScheme: layerData.epsg == 3857 ? new Cesium.WebMercatorTilingScheme() : new Cesium.GeographicTilingScheme(),
-            rectangle: Cesium.Rectangle.fromDegrees(layerData.rect84[0], layerData.rect84[1], layerData.rect84[2], layerData.rect84[3]),
-            parameters: {
-              transparent: 'true',
-              format: 'image/png'
-            },
-            ...params
-          };
-          if (layerData.styles) options.parameters.styles = layerData.styles;
-          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider(options));
-          layer._guid = layerData.guid;
-          layerData.visible = true;
+          layerData.visible = isAdd;
           layerData.serverType = "imagerylayer";
-        } else {
-          promise = this._viewer.addWMSLayerGroup(url, {
-            layers: layerData.id + ""
-          }).then(group => {
-            var layers = group._addedLayers || group._layers;
 
-            if (layers && layers.length > 0) {
-              //如果是kqserver类型，记录服务返回的图层信息
-              if (layerData.sourceLayers) {
-                var layerInfo = layerData.sourceLayers.find(item => {
-                  return item.id + "" == layerData.id + "";
-                });
+          if (isAdd) {
+            var options = {
+              url: url,
+              layers: layerData.id + "",
+              tilingScheme: layerData.epsg == 3857 ? new Cesium.WebMercatorTilingScheme() : new Cesium.GeographicTilingScheme(),
+              rectangle: Cesium.Rectangle.fromDegrees(layerData.rect84[0], layerData.rect84[1], layerData.rect84[2], layerData.rect84[3]),
+              parameters: {
+                transparent: 'true',
+                format: 'image/png'
+              },
+              ...params
+            };
+            if (layerData.styles) options.parameters.styles = layerData.styles;
+            layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider(options));
+            layer._guid = layerData.guid;
+          }
+        } else {
+          //如果是kqserver类型，记录服务返回的图层信息
+          if (layerData.sourceLayers) {
+            var layerInfo = layerData.sourceLayers.find(item => {
+              return item.id + "" == layerData.id + "";
+            });
 
-                if (layerInfo) {
-                  for (var key in layerInfo) {
-                    if (!layerData[key]) {
-                      layerData[key] = layerInfo[key];
-                    }
-                  }
+            if (layerInfo) {
+              for (var key in layerInfo) {
+                if (!layerData[key]) {
+                  layerData[key] = layerInfo[key];
                 }
               }
-
-              layers[0]._guid = layerData.guid;
-              layerData.name = name || layers[0].name;
-              layerData.visible = true;
-              layerData.serverType = "imagerylayer";
             }
-          });
+          }
+
+          layerData.visible = isAdd;
+          layerData.serverType = "imagerylayer";
+
+          if (isAdd) {
+            promise = this._viewer.addWMSLayerGroup(url, {
+              layers: layerData.id + ""
+            }).then(group => {
+              var layers = group._addedLayers || group._layers;
+
+              if (layers && layers.length > 0) {
+                layers[0]._guid = layerData.guid;
+              }
+            });
+          }
         }
 
         break;
 
       case "wmts":
       case "kqgistileserver":
-        //配置id时只能是单个图层
-        promise = this._viewer.addWMTSLayerGroup(url, {
-          layers: layerData.id + ""
-        }).then(group => {
-          var layers = group._addedLayers || group._layers;
-
-          if (layers && layers.length > 0) {
-            //如果是kqserver类型，记录服务返回的图层信息
-            if (layerData.sourceLayers) {
-              var layerInfo = layerData.sourceLayers.find(item => {
-                return item.id + "" == layerData.id + "";
-              });
+        //如果是kqserver类型，记录服务返回的图层信息
+        if (layerData.sourceLayers) {
+          var layerInfo = layerData.sourceLayers.find(item => {
+            return item.id + "" == layerData.id + "";
+          });
 
-              if (layerInfo) {
-                for (var key in layerInfo) {
-                  if (!layerData[key]) {
-                    layerData[key] = layerInfo[key];
-                  }
-                }
+          if (layerInfo) {
+            for (var key in layerInfo) {
+              if (!layerData[key]) {
+                layerData[key] = layerInfo[key];
               }
             }
-
-            layers[0]._guid = layerData.guid;
-            layerData.name = name || layers[0].name;
-            layerData.visible = true;
-            layerData.serverType = "imagerylayer";
           }
-        });
+        }
+
+        layerData.visible = isAdd;
+        layerData.serverType = "imagerylayer"; //配置id时只能是单个图层
+
+        if (isAdd) {
+          promise = this._viewer.addWMTSLayerGroup(url, {
+            layers: layerData.id + ""
+          }).then(group => {
+            var layers = group._addedLayers || group._layers;
+
+            if (layers && layers.length > 0) {
+              layers[0]._guid = layerData.guid;
+            }
+          });
+        }
+
         break;
       // case "wfs":
       //   var wfsProvider = new Cesium.Kq3dWebFeatureServiceProvider({
@@ -26919,97 +27001,126 @@ class LayerManager {
       //   break;
 
       case "geojson":
-        var ds = new Cesium.Kq3dGeoJsonDataSource(name);
-        var geojsonStyle = layerData.geojsonStyle || this._geojsonStyle;
-        promise = ds.load(url, geojsonStyle).then(ds => {
-          ds.entities.values.forEach(entity => {
-            if (entity.polygon) {
-              entity.polyline = {
-                positions: entity.polygon.hierarchy._value.positions,
-                width: geojsonStyle.polygon.outlineWidth,
-                material: geojsonStyle.polygon.outlineColor
-              };
-            }
-          }, this);
+        layerData.visible = isAdd;
+        layerData.serverType = "datasource";
 
-          this._viewer.dataSources.add(ds);
+        if (isAdd) {
+          var ds = new Cesium.Kq3dGeoJsonDataSource(name);
+          var geojsonStyle = layerData.geojsonStyle || this._geojsonStyle;
+          promise = ds.load(url, geojsonStyle).then(ds => {
+            ds.entities.values.forEach(entity => {
+              if (entity.polygon) {
+                entity.polyline = {
+                  positions: entity.polygon.hierarchy._value.positions,
+                  width: geojsonStyle.polygon.outlineWidth,
+                  material: geojsonStyle.polygon.outlineColor
+                };
+              }
+            }, this);
+
+            this._viewer.dataSources.add(ds);
+
+            ds.autoAvoid(this._viewer);
+            ds._guid = layerData.guid;
+            layerData.shapeType = this.getShapeType(ds);
+          });
+        }
 
-          ds.autoAvoid(this._viewer);
-          ds._guid = layerData.guid;
-          layerData.visible = true;
-          layerData.serverType = "datasource";
-        });
         break;
 
       case "kml":
-        var ds = new Cesium.KmlDataSource({
-          name: name,
-          camera: this._viewer.camera,
-          canvas: this._viewer.scene.canvas,
-          ...params
-        });
-        promise = ds.load(url).then(ds => {
-          this._viewer.dataSources.add(ds);
+        layerData.visible = isAdd;
+        layerData.serverType = "datasource";
+
+        if (isAdd) {
+          var ds = new Cesium.KmlDataSource({
+            name: name,
+            camera: this._viewer.camera,
+            canvas: this._viewer.scene.canvas,
+            ...params
+          });
+          promise = ds.load(url).then(ds => {
+            this._viewer.dataSources.add(ds);
+
+            ds._guid = layerData.guid;
+          });
+        }
 
-          ds._guid = layerData.guid;
-          layerData.visible = true;
-          layerData.serverType = "datasource";
-        });
         break;
 
       case "czml":
-        var ds = new Cesium.CzmlDataSource(name);
-        promise = ds.load(url).then(ds => {
-          this._viewer.dataSources.add(ds);
+        layerData.visible = isAdd;
+        layerData.serverType = "datasource";
+
+        if (isAdd) {
+          var ds = new Cesium.CzmlDataSource(name);
+          promise = ds.load(url).then(ds => {
+            this._viewer.dataSources.add(ds);
+
+            ds._guid = layerData.guid;
+          });
+        }
 
-          ds._guid = layerData.guid;
-          layerData.visible = true;
-          layerData.serverType = "datasource";
-        });
         break;
 
       case "tianditu":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
-          name: name,
-          mapStyle: layerData.layerType + "_c",
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
+            name: name,
+            mapStyle: layerData.layerType + "_c",
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case "baidu":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
-          name: name,
-          mapStyle: layerData.layerType,
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
+            name: name,
+            mapStyle: layerData.layerType,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case "gaode":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
-          name: name,
-          mapStyle: layerData.layerType,
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
+            name: name,
+            mapStyle: layerData.layerType,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       case "tencent":
-        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
-          name: name,
-          mapStyle: layerData.layerType,
-          ...params
-        }));
-        layer._guid = layerData.guid;
-        layerData.visible = true;
+        layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
+            name: name,
+            mapStyle: layerData.layerType,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
         break;
 
       default:
@@ -27017,6 +27128,25 @@ class LayerManager {
     }
 
     return promise;
+  } // 获取geojson数据类型
+
+
+  getShapeType(ds) {
+    let shapeType = "";
+
+    if (ds.entities.values.length > 0) {
+      let entity = ds.entities.values[0];
+
+      if (entity.polygon) {
+        shapeType = 'polygon';
+      } else if (entity.polyline) {
+        shapeType = 'polyline';
+      } else if (entity.billboard || entity.point) {
+        shapeType = 'point';
+      }
+    }
+
+    return shapeType;
   } //添加服务数据