同步代码

Author: muyao1987

package.json

@@ -24,7 +24,7 @@
     "echarts": "^5.6.0",
     "lodash": "^4.17.21",
     "mars3d": "~3.9.0",
-    "mars3d-cesium": "^1.125.0",
+    "mars3d-cesium": "^1.127.0",
     "moment": "^2.30.1",
     "monaco-editor": "^0.44.0",
     "nprogress": "^0.2.0",

public/config/config.json

@@ -173,7 +173,7 @@
       "pid": 10,
       "name": "百度影像",
       "type": "group",
-      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bd-img.png",
+      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bd_img.png",
       "layers": [
         {
           "name": "底图",
@@ -190,7 +190,7 @@
     {
       "pid": 10,
       "name": "百度电子",
-      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bd-vec.png",
+      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bd_vec.png",
       "type": "baidu",
       "layer": "vec"
     },
@@ -219,26 +219,11 @@
       "type": "tencent",
       "layer": "vec"
     },
-    {
-      "pid": 10,
-      "name": "ArcGIS影像",
-      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/esriWorldImagery.png",
-      "type": "xyz",
-      "url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
-      "enablePickFeatures": false
-    },
-    {
-      "pid": 10,
-      "name": "微软影像",
-      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bingAerial.png",
-      "type": "bing",
-      "layer": "Aerial"
-    },
     {
       "id": 2017,
       "pid": 10,
       "name": "蓝色底图",
-      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bd-c-midnight.png",
+      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/my_blue.png",
       "type": "gaode",
       "layer": "vec",
       "chinaCRS": "GCJ02",
@@ -250,10 +235,25 @@
       "hue": 1,
       "saturation": 0
     },
+    {
+      "pid": 10,
+      "name": "绿色底图",
+      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/my_green.png",
+      "type": "gaode",
+      "layer": "vec",
+      "chinaCRS": "GCJ02",
+      "invertColor": true,
+      "filterColor": "rgba(12, 238, 230)",
+      "brightness": 1,
+      "contrast": 1.0,
+      "gamma": 0.2,
+      "hue": 1,
+      "saturation": 0
+    },
     {
       "pid": 10,
       "name": "黑色底图",
-      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bd-c-dark.png",
+      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/my_dark.png",
       "type": "gaode",
       "layer": "vec",
       "chinaCRS": "GCJ02",
@@ -265,6 +265,22 @@
       "hue": 1,
       "saturation": 0
     },
+
+    {
+      "pid": 10,
+      "name": "ArcGIS影像",
+      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/arcgis_img.png",
+      "type": "xyz",
+      "url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+      "enablePickFeatures": false
+    },
+    {
+      "pid": 10,
+      "name": "微软影像",
+      "icon": "https://data.mars3d.cn/img/thumbnail/basemap/bing_img.png",
+      "type": "bing",
+      "layer": "Aerial"
+    },
     {
       "pid": 10,
       "name": "离线影像地图 (供参考)",
@@ -276,7 +292,7 @@
     },
     {
       "pid": 10,
-      "name": "单张图片 (本地离线)",
+      "name": "单张图片",
       "icon": "https://data.mars3d.cn/img/thumbnail/basemap/offline.png",
       "type": "image",
       "url": "https://data.mars3d.cn/img/map/world/world.jpg"

public/config/tileset.json

@@ -9,6 +9,7 @@
       "url": "https://data.mars3d.cn/3dtiles/jzw-hefei/tileset.json",
       "maximumScreenSpaceError": 1,
       "maxMemory": 1024,
+      "enableCollision":true,
       "style": {
         "color": {
           "conditions": [["true", "color('rgba(42, 160, 224, 1)')"]]