同步最新代码

marsgis · Mar 18, 2022 · 483fb65 · 483fb65
1 parent 09b8d5a
commit 483fb65
Show file tree

Hide file tree

Showing 54 changed files with 4,760 additions and 3,394 deletions.
diff --git a/package.json b/package.json
@@ -22,14 +22,14 @@
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "mars-editor": "^2.5.5",
-    "mars3d": "^3.2.1",
+    "mars3d": "^3.2.4",
     "monaco-editor": "^0.29.1",
     "nprogress": "^0.2.0",
     "serve": "^13.0.2",
     "split.js": "^1.6.4",
     "standard": "^16.0.4",
     "uuid": "^8.3.2",
-    "vue": "^3.2.30",
+    "vue": "^3.2.31",
     "vue-color-kit": "^1.0.5",
     "vuex": "^4.0.2"
   },
@@ -50,7 +50,7 @@
     "standard": "^16.0.4",
     "typescript": "^4.5.5",
     "unplugin-vue-components": "^0.17.13",
-    "vite": "^2.8.0",
+    "vite": "^2.8.6",
     "vite-babel-plugin": "^0.0.2",
     "vite-plugin-eslint": "^1.3.0",
     "vite-plugin-mars3d": "^1.1.1",

diff --git a/public/config/config.json b/public/config/config.json
@@ -70,7 +70,7 @@
         "id": 2021,
         "pid": 10,
         "name": "天地图影像",
-        "icon": "img/basemaps/tdt_img.png",
+        "icon": "http://mars3d.cn/img/basemaps/tdt_img.png",
         "type": "group",
         "layers": [
           { "name": "底图", "type": "tdt", "layer": "img_d", "key": ["9ae78c51a0a28f06444d541148496e36"] },
@@ -81,7 +81,7 @@
       {
         "pid": 10,
         "name": "天地图电子",
-        "icon": "img/basemaps/tdt_vec.png",
+        "icon": "http://mars3d.cn/img/basemaps/tdt_vec.png",
         "type": "group",
         "layers": [
           { "name": "底图", "type": "tdt", "layer": "vec_d", "key": ["9ae78c51a0a28f06444d541148496e36"] },
@@ -92,7 +92,7 @@
         "pid": 10,
         "name": "高德影像",
         "type": "group",
-        "icon": "img/basemaps/gaode_img.png",
+        "icon": "http://mars3d.cn/img/basemaps/gaode_img.png",
         "layers": [
           { "name": "底图", "type": "gaode", "layer": "img_d" },
           { "name": "注记", "type": "gaode", "layer": "img_z" }
@@ -102,14 +102,14 @@
         "pid": 10,
         "name": "高德电子",
         "type": "gaode",
-        "icon": "img/basemaps/gaode_vec.png",
+        "icon": "http://mars3d.cn/img/basemaps/gaode_vec.png",
         "layer": "vec"
       },
       {
         "pid": 10,
         "name": "百度影像",
         "type": "group",
-        "icon": "img/basemaps/bd-img.png",
+        "icon": "http://mars3d.cn/img/basemaps/bd-img.png",
         "layers": [
           { "name": "底图", "type": "baidu", "layer": "img_d" },
           { "name": "注记", "type": "baidu", "layer": "img_z" }
@@ -118,14 +118,14 @@
       {
         "pid": 10,
         "name": "百度电子",
-        "icon": "img/basemaps/bd-vec.png",
+        "icon": "http://mars3d.cn/img/basemaps/bd-vec.png",
         "type": "baidu",
         "layer": "vec"
       },
       {
         "pid": 10,
         "name": "腾讯影像",
-        "icon": "img/basemaps/gaode_img.png",
+        "icon": "http://mars3d.cn/img/basemaps/gaode_img.png",
         "type": "group",
         "layers": [
           { "name": "底图", "type": "tencent", "layer": "img_d" },
@@ -135,22 +135,22 @@
       {
         "pid": 10,
         "name": "腾讯电子",
-        "icon": "img/basemaps/gaode_vec.png",
+        "icon": "http://mars3d.cn/img/basemaps/gaode_vec.png",
         "type": "tencent",
         "layer": "vec"
       },
       {
         "pid": 10,
         "name": "ArcGIS影像",
-        "icon": "img/basemaps/esriWorldImagery.png",
+        "icon": "http://mars3d.cn/img/basemaps/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": "img/basemaps/bingAerial.png",
+        "icon": "http://mars3d.cn/img/basemaps/bingAerial.png",
         "type": "bing",
         "key": "AuKhM0WRkjhX8E4y1OM0TukYycaw_4Vh3eSfXONDf7OARls-WEB3K_Rfx89bWxof",
         "layer": "Aerial"
@@ -159,7 +159,7 @@
         "pid": 10,
         "name": "OSM地图",
         "type": "xyz",
-        "icon": "img/basemaps/osm.png",
+        "icon": "http://mars3d.cn/img/basemaps/osm.png",
         "url": "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
         "subdomains": "abc"
       },
@@ -168,7 +168,7 @@
         "pid": 10,
         "name": "暗色底图",
         "type": "gaode",
-        "icon": "img/basemaps/blackMarble.png",
+        "icon": "http://mars3d.cn/img/basemaps/blackMarble.png",
         "layer": "vec",
         "invertColor": true,
         "filterColor": "#4e70a6",
@@ -181,7 +181,7 @@
       {
         "pid": 10,
         "name": "蓝色底图",
-        "icon": "img/basemaps/bd-c-midnight.png",
+        "icon": "http://mars3d.cn/img/basemaps/bd-c-midnight.png",
         "type": "xyz",
         "url": "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
         "chinaCRS": "GCJ02",
@@ -190,15 +190,15 @@
       {
         "pid": 10,
         "name": "黑色底图",
-        "icon": "img/basemaps/bd-c-dark.png",
+        "icon": "http://mars3d.cn/img/basemaps/bd-c-dark.png",
         "type": "tencent",
         "layer": "custom",
         "style": "4"
       },
       {
         "pid": 10,
         "name": "灰色底图",
-        "icon": "img/basemaps/bd-c-grayscale.png",
+        "icon": "http://mars3d.cn/img/basemaps/bd-c-grayscale.png",
         "type": "mapbox",
         "username": "marsgis",
         "styleId": "cki0a92b123qo1aluk0e5v7sb",
@@ -208,7 +208,7 @@
         "pid": 10,
         "name": "离线地图 (供参考)",
         "type": "group",
-        "icon": "img/basemaps/google_img.png",
+        "icon": "http://mars3d.cn/img/basemaps/google_img.png",
         "layers": [
           {
             "name": "全球",
@@ -240,7 +240,7 @@
       {
         "pid": 10,
         "name": "单张图片 (本地离线)",
-        "icon": "img/basemaps/offline.png",
+        "icon": "http://mars3d.cn/img/basemaps/offline.png",
         "type": "image",
         "url": "//data.mars3d.cn/file/img/world/world.jpg"
       }

diff --git a/public/lib/Cesium/README.md b/public/lib/Cesium/README.md
@@ -1,13 +1,13 @@
-#Cesium  web三维gis地图框架
-
-版本：具体版本号请参考F12浏览器控制台打印值
-
-官方地址：http://cesiumjs.com/
-github地址：https://github.com/CesiumGS/cesium
-
-
-
-介绍：
-	Cesium 是一款面向三维地球和地图的，世界级的JavaScript开源产品。它提供了基于JavaScript语言的开发包，
-	方便用户快速搭建一款零插件的虚拟地球Web应用，并在性能，精度，渲染质量以及多平台，易用性上都有高质量的保证。
+#Cesium  web三维gis地图框架
+
+版本：具体版本号请参考F12浏览器控制台打印值
+
+官方地址：http://cesiumjs.com/
+github地址：https://github.com/CesiumGS/cesium
+
+
+
+介绍：
+	Cesium 是一款面向三维地球和地图的，世界级的JavaScript开源产品。它提供了基于JavaScript语言的开发包，
+	方便用户快速搭建一款零插件的虚拟地球Web应用，并在性能，精度，渲染质量以及多平台，易用性上都有高质量的保证。
 
diff --git a/public/lib/Cesium/Scene/ModelExperimental/CustomShaderGuide/README.md b/public/lib/Cesium/Scene/ModelExperimental/CustomShaderGuide/README.md
@@ -1,4 +1,4 @@
-## :warning: Custom Shaders documentation has moved! :warning
-
-This documentation now lives in
-[`Documentation/CustomShaderGuide`](../../../../Documentation/CustomShaderGuide/README.md)
+## :warning: Custom Shaders documentation has moved! :warning
+
+This documentation now lives in
+[`Documentation/CustomShaderGuide`](../../../../Documentation/CustomShaderGuide/README.md)