Skip to content

Commit 184e995

Browse files
muyao1987muyao1987
committed
同步代码
1 parent 99a3f20 commit 184e995

File tree

63 files changed

+20107
-20061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+20107
-20061
lines changed

‎public/config/config.json

Lines changed: 19 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,11 +1264,7 @@
12641264
"data": [
12651265
{
12661266
"type": "modelP",
1267-
"position": [
1268-
117.219071,
1269-
31.828783,
1270-
39.87
1271-
],
1267+
"position": [117.219071, 31.828783, 39.87],
12721268
"style": {
12731269
"url": "//data.mars3d.cn/gltf/mars/fengche.gltf",
12741270
"scale": 50,
@@ -1292,11 +1288,7 @@
12921288
"data": [
12931289
{
12941290
"type": "modelP",
1295-
"position": [
1296-
117.217458,
1297-
31.815349,
1298-
35.03
1299-
],
1291+
"position": [117.217458, 31.815349, 35.03],
13001292
"style": {
13011293
"url": "//data.mars3d.cn/gltf/mars/jingche/jingche.gltf",
13021294
"scale": 2,
@@ -1329,12 +1321,7 @@
13291321
"maxMemory": 1024,
13301322
"style": {
13311323
"color": {
1332-
"conditions": [
1333-
[
1334-
"true",
1335-
"color('rgba(42, 160, 224, 1)')"
1336-
]
1337-
]
1324+
"conditions": [["true", "color('rgba(42, 160, 224, 1)')"]]
13381325
}
13391326
},
13401327
"marsJzwStyle": true,
@@ -1411,34 +1398,13 @@
14111398
"style": {
14121399
"color": {
14131400
"conditions": [
1414-
[
1415-
"${floor} >= 200",
1416-
"rgba(45, 0, 75, 0.5)"
1417-
],
1418-
[
1419-
"${floor} >= 100",
1420-
"rgb(170, 162, 204)"
1421-
],
1422-
[
1423-
"${floor} >= 50",
1424-
"rgb(224, 226, 238)"
1425-
],
1426-
[
1427-
"${floor} >= 25",
1428-
"rgb(252, 230, 200)"
1429-
],
1430-
[
1431-
"${floor} >= 10",
1432-
"rgb(248, 176, 87)"
1433-
],
1434-
[
1435-
"${floor} >= 5",
1436-
"rgb(198, 106, 11)"
1437-
],
1438-
[
1439-
"true",
1440-
"rgb(127, 59, 8)"
1441-
]
1401+
["${floor} >= 200", "rgba(45, 0, 75, 0.5)"],
1402+
["${floor} >= 100", "rgb(170, 162, 204)"],
1403+
["${floor} >= 50", "rgb(224, 226, 238)"],
1404+
["${floor} >= 25", "rgb(252, 230, 200)"],
1405+
["${floor} >= 10", "rgb(248, 176, 87)"],
1406+
["${floor} >= 5", "rgb(198, 106, 11)"],
1407+
["true", "rgb(127, 59, 8)"]
14421408
]
14431409
}
14441410
},
@@ -1483,34 +1449,13 @@
14831449
"style": {
14841450
"color": {
14851451
"conditions": [
1486-
[
1487-
"(${Classification} >= 4) && (${Classification} < 5) ",
1488-
"color('#DC143C')"
1489-
],
1490-
[
1491-
"(${Classification} >= 7) && (${Classification} < 8) ",
1492-
"color('#7B68EE')"
1493-
],
1494-
[
1495-
"(${Classification} >= 16) && (${Classification} < 17) ",
1496-
"color('#00CED1')"
1497-
],
1498-
[
1499-
"(${Classification} >= 17) && (${Classification} < 18) ",
1500-
"color('#3CB371')"
1501-
],
1502-
[
1503-
"(${Classification} >= 18) && (${Classification} < 19) ",
1504-
"color('#FFFF00')"
1505-
],
1506-
[
1507-
"(${Classification} >= 19) && (${Classification} < 20) ",
1508-
"color('#FFA500')"
1509-
],
1510-
[
1511-
"(${Classification} >= 20) && (${Classification} < 21) ",
1512-
"color('#FF6347')"
1513-
]
1452+
["(${Classification} >= 4) && (${Classification} < 5) ", "color('#DC143C')"],
1453+
["(${Classification} >= 7) && (${Classification} < 8) ", "color('#7B68EE')"],
1454+
["(${Classification} >= 16) && (${Classification} < 17) ", "color('#00CED1')"],
1455+
["(${Classification} >= 17) && (${Classification} < 18) ", "color('#3CB371')"],
1456+
["(${Classification} >= 18) && (${Classification} < 19) ", "color('#FFFF00')"],
1457+
["(${Classification} >= 19) && (${Classification} < 20) ", "color('#FFA500')"],
1458+
["(${Classification} >= 20) && (${Classification} < 21) ", "color('#FF6347')"]
15141459
]
15151460
}
15161461
},
@@ -1686,6 +1631,7 @@
16861631
"pid": 2020,
16871632
"name": "水利闸门",
16881633
"type": "group",
1634+
"open": false,
16891635
"center": {
16901636
"lat": 29.794301,
16911637
"lng": 121.47998,
@@ -1701,11 +1647,7 @@
17011647
"data": [
17021648
{
17031649
"type": "modelP",
1704-
"position": [
1705-
121.479813,
1706-
29.791278,
1707-
16
1708-
],
1650+
"position": [121.479813, 29.791278, 16],
17091651
"style": {
17101652
"url": "//data.mars3d.cn/gltf/mars/zhamen.glb",
17111653
"heading": 105

‎public/lib/Cesium/Cesium.js

Lines changed: 6205 additions & 6180 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/lib/Cesium/Workers/combineGeometry.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @license
33
* Cesium - https://github.com/CesiumGS/cesium
4-
* Version 1.121.2
4+
* Version 1.122
55
*
66
* Copyright 2011-2022 Cesium Contributors
77
*
@@ -23,4 +23,4 @@
2323
* See https://github.com/CesiumGS/cesium/blob/main/LICENSE.md for full licensing details.
2424
*/
2525

26-
import{a as e}from"./chunk-E5ZEVCLK.js";import{a as r}from"./chunk-T7RJP5X5.js";import"./chunk-26DKVJFV.js";import"./chunk-74H2KQDK.js";import"./chunk-44RVUZAM.js";import"./chunk-TSLAMYJY.js";import"./chunk-3RKDFH2K.js";import"./chunk-FHNS6QMW.js";import"./chunk-CTR74FRX.js";import"./chunk-LATIBMTL.js";import"./chunk-FMYWHDT5.js";import"./chunk-BQKZ6XJY.js";import"./chunk-EOY6Q53K.js";import"./chunk-UVIO3UB6.js";import"./chunk-AQ3OPC2R.js";import"./chunk-QA6HHOCU.js";import"./chunk-6YUBO45T.js";import"./chunk-4J67FZA7.js";import"./chunk-ZYCN52A2.js";import"./chunk-BRSJA3YQ.js";import"./chunk-J4LU4BFP.js";function n(o,t){let m=e.unpackCombineGeometryParameters(o),i=e.combineGeometry(m);return e.packCombineGeometryResults(i,t)}var c=r(n);export{c as default};
26+
import{a as e}from"./chunk-DELT5W27.js";import{a as r}from"./chunk-JQWRUZSV.js";import"./chunk-ZPNGL6DU.js";import"./chunk-PFE76RUV.js";import"./chunk-S5WIMI2N.js";import"./chunk-QTX6TFJQ.js";import"./chunk-P75RMBWR.js";import"./chunk-UKRRGB4P.js";import"./chunk-UGB43LJM.js";import"./chunk-WFZLZ2P5.js";import"./chunk-CTEHZS7O.js";import"./chunk-4TXI27XR.js";import"./chunk-GFUBU5RD.js";import"./chunk-27UWHT4D.js";import"./chunk-RFPX772U.js";import"./chunk-RAYRECQS.js";import"./chunk-2NAI7YQ3.js";import"./chunk-QE3ZUOZY.js";import"./chunk-6KLVDWWE.js";import"./chunk-6P5KAIBX.js";import"./chunk-4FSVUTPL.js";function n(o,t){let m=e.unpackCombineGeometryParameters(o),i=e.combineGeometry(m);return e.packCombineGeometryResults(i,t)}var c=r(n);export{c as default};

‎public/lib/Cesium/Workers/createBoxGeometry.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @license
33
* Cesium - https://github.com/CesiumGS/cesium
4-
* Version 1.121.2
4+
* Version 1.122
55
*
66
* Copyright 2011-2022 Cesium Contributors
77
*
@@ -23,4 +23,4 @@
2323
* See https://github.com/CesiumGS/cesium/blob/main/LICENSE.md for full licensing details.
2424
*/
2525

26-
import{a as r}from"./chunk-GLS4R7PI.js";import"./chunk-EF5GLXSV.js";import"./chunk-U2CN5G4B.js";import"./chunk-LATIBMTL.js";import"./chunk-FMYWHDT5.js";import"./chunk-BQKZ6XJY.js";import"./chunk-EOY6Q53K.js";import"./chunk-UVIO3UB6.js";import"./chunk-AQ3OPC2R.js";import"./chunk-QA6HHOCU.js";import"./chunk-6YUBO45T.js";import"./chunk-4J67FZA7.js";import"./chunk-ZYCN52A2.js";import"./chunk-BRSJA3YQ.js";import{e as o}from"./chunk-J4LU4BFP.js";function i(e,t){return o(t)&&(e=r.unpack(e,t)),r.createGeometry(e)}var a=i;export{a as default};
26+
import{a as r}from"./chunk-YEGGJGFV.js";import"./chunk-IFAARW2T.js";import"./chunk-6YAFAZVV.js";import"./chunk-WFZLZ2P5.js";import"./chunk-CTEHZS7O.js";import"./chunk-4TXI27XR.js";import"./chunk-GFUBU5RD.js";import"./chunk-27UWHT4D.js";import"./chunk-RFPX772U.js";import"./chunk-RAYRECQS.js";import"./chunk-2NAI7YQ3.js";import"./chunk-QE3ZUOZY.js";import"./chunk-6KLVDWWE.js";import"./chunk-6P5KAIBX.js";import{e as o}from"./chunk-4FSVUTPL.js";function i(e,t){return o(t)&&(e=r.unpack(e,t)),r.createGeometry(e)}var a=i;export{a as default};

‎public/lib/Cesium/Workers/createBoxOutlineGeometry.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)