Merge branch 'lmx' of http://47.103.92.60:3003/skyversation/xujingtown_irflcmp_ui

# Conflicts:
#	public/static/config/config.js

public/static/config/config.js

@@ -4,7 +4,7 @@ var scriptObj = {
         "/static/plugins/skyscenery/plugins/CGCS2000ArcGisMapServerImageryProvider.js",
         "/static/plugins/skyscenery/plugins/Wall/DynamicWallMaterialProperty.js",
         "/static/plugins/skyscenery/plugins/3DTiles/add3DTiles.js"
-    ] 
+    ]
 }
 
 var userLoginConfig = {
@@ -26,5 +26,16 @@ const systemConfig = {
     imageryProviders: ["http://t0.tianditu.com/img_w/wmts"],
     // 天地图token(Map.vue>LoadTheWorldMapImage())
     // tdt_tk: "e90d56e5a09d1767899ad45846b0cefd"
-    tdt_tk: "51a3c33c0ec351619c33a24461c0ba95"
+    tdt_tk: "51a3c33c0ec351619c33a24461c0ba95",
+    data3DTiles: {
+        "盘龙天地": {
+            "地面": "/static/data/3dTiles/pltd_3dt/dm",
+            "建筑": "/static/data/3dTiles/pltd_3dt/jz",
+            "水系": "/static/data/3dTiles/pltd_3dt/sx",
+            "小品": "/static/data/3dTiles/pltd_3dt/xp",
+        },
+        "西虹桥": {
+            "全部": "/static/data/3dTiles/xhq_3dt",
+        }
+    }
 }

public/static/data/3dTiles/pltd_3dt/dm/tileset.json

@@ -0,0 +1 @@
+{"asset":{"generatetool":"cesiumlab3@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":1795.0905396440066,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[2.3283064365386963e-10,0.038732336135581136,11.893352110870183,897.5452698220033,0,0,0,881.5321702903602,0,0,0,19.77482459228486]},"children":[{"boundingVolume":{"box":[-0.2902869486952113,0.4923513179192014,11.060524470539935,897.0791948847273,0,0,0,880.8605980577149,0,0,0,17.76966537498131]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[21.667293499385778,226.9374914200539,15.28232842487008,853.3336356272612,0,0,0,609.3464461475482,0,0,0,16.467372518561923]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":1795.0905396440066,"transform":[-0.8546907033403003,-0.5191375555897136,0.0,0.0,0.2688331127524671,-0.44259784279825864,0.8554740832065851,0.0,-0.4441087244262178,0.7311657458652346,0.5178456265740329,0.0,-2835131.7340601063,4667666.035245035,3283727.7547099786,1.0]}}

public/static/data/3dTiles/pltd_3dt/jz/tileset.json

@@ -0,0 +1 @@
+{"asset":{"generatetool":"cesiumlab3@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":1237.434195522219,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[-4.656612873077393e-10,0.01824060920625925,25.16073114145547,618.7170977611095,0,0,0,357.23421147232875,0,0,0,27.186581592075527]},"children":[{"boundingVolume":{"box":[-8.303637344999515,0.07476436834440392,24.90450153162169,610.3857257861109,0,0,0,357.1137400973139,0,0,0,26.893681031774122]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[1.7602421273586515,-4.490117189578541,25.1837135064562,616.9138509113764,0,0,0,352.34736465962897,0,0,0,27.172893006608632]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":1237.434195522219,"transform":[-0.8547021199485212,-0.5191187592020765,0.0,0.0,0.2688556037816269,-0.4426568110645865,0.8554365037414218,0.0,-0.4440731363984095,0.7311433932291445,0.5179077022661974,0.0,-2834905.193427821,4667524.40693948,3284122.1363483435,1.0]}}

public/static/data/3dTiles/pltd_3dt/sx/scenetree.json

@@ -0,0 +1 @@
+{"scenes":[{"children":[{"id":"6db8535a83c5491896899a72da6676f3","name":"shqpuflsx0001","sphere":[-2834782.6648346623,4667611.631220054,3284104.0702294437,1352.6153339346652],"type":"element"}],"id":"563363b32e5f426284b7e85a549e2380","name":"shui01","sphere":[-2834782.6648346623,4667611.631220054,3284104.0702294437,1352.6153339346652],"type":"node"}]}

public/static/data/3dTiles/pltd_3dt/sx/tileset.json

@@ -0,0 +1 @@
+{"asset":{"generatetool":"cesiumlab3@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":848.0981626864523,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[2.7940245672652964e-09,0.008618615567684174,-0.019956584088504314,424.04908134322613,0,0,0,363.17280227225274,0,0,0,3.2141945194453]},"children":[{"boundingVolume":{"box":[0.24525872359481582,-0.06560058272270908,0.12771233985105468,423.3318734477707,0,0,0,362.68907102923504,0,0,0,3.0653559879075694]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":848.0981626864523,"transform":[-0.8547163796467535,-0.5190952806215319,0.0,0.0,0.26884196735231913,-0.4426617648254412,0.8554382260290689,0.0,-0.44405394599494485,0.7311570635630069,0.5179048575252404,0.0,-2834782.6632987857,4667611.641853208,3284104.073035177,1.0]}}

public/static/data/3dTiles/pltd_3dt/xp/tileset.json

@@ -0,0 +1 @@
+{"asset":{"generatetool":"cesiumlab3@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":1347.2000098596327,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[-2.3283064365386963e-10,0.021597799845039845,7.063343237619847,673.6000049298164,0,0,0,344.8835735791363,0,0,0,7.098141773138195]},"children":[{"boundingVolume":{"box":[0.0032016978202591417,5.915326523593649,7.086392603523869,673.5743160724251,0,0,0,338.9789839532523,0,0,0,7.107325326925498]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[2.233658471486706,24.972204602787315,6.4237991000634445,670.7603081866037,0,0,0,319.2801644871679,0,0,0,6.445085471658121]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[2.365869127337646,0.006494643815130985,6.511120784846447,671.2116486429077,0,0,0,344.8878158330308,0,0,0,6.443650084611413]},"content":{"uri":"NoLod_2.b3dm"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":1347.2000098596327,"transform":[-0.8547055341334723,-0.5191131378819224,0.0,0.0,0.26885394336464763,-0.4426606388830016,0.8554350448286365,0.0,-0.4440675703751565,0.7311450669067507,0.5179101119683109,0.0,-2834869.6822176464,4667535.126976023,3284137.441567915,1.0]}}