Browse Source

map大小

DR/4DAGE 3 years ago
parent
commit
caf6ad8e4e
4 changed files with 50 additions and 19 deletions
  1. 3 1
      Map/Source/DGE.min.js
  2. 19 4
      Map/data.js
  3. 9 4
      Map/index.html
  4. 19 10
      Map/map.js

+ 3 - 1
Map/Source/DGE.min.js

@@ -313628,6 +313628,8 @@ c+=snow(uv,6.);\n\
 	        this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
 	        this._viewer.scene.fxaa = true;
 	        this._viewer.scene.postProcessStages.fxaa.enabled = true;
+
+	        this._viewer._cesiumWidget._creditContainer.style.display = "none";
 	    }
 
 	    /**
@@ -315114,11 +315116,11 @@ c+=snow(uv,6.);\n\
 
 	const VERSION = '1.0.1';
 
-	exports.CesiumNavigation = viewerCesiumNavigationMixin;
 	exports.DynamicModel = DynamicModel;
 	exports.FlyRoute = FlyRoute;
 	exports.FlyStep = FlyStep;
 	exports.Map = Map$1;
+	exports.MapNavigation = viewerCesiumNavigationMixin;
 	exports.P3 = P3;
 	exports.VERSION = VERSION;
 

+ 19 - 4
Map/data.js

@@ -29,7 +29,7 @@ var line=[
             pitch: -0.3893116388246525,
             roll: 0.0025027522595539864,
             waitTime:0,
-            str:"纪念馆大院中央树立着一尊铜像,高238米,重400多公斤,他是由新会籍的广州美术学院林敦厚教授、雕塑家林汉强父子设计。"
+            str:"纪念馆大院中央树立着一尊铜像,高2.38米,重400多公斤,他是由新会籍的广州美术学院林敦厚教授、雕塑家林汉强父子设计。"
         },
         { //梁启超铜像
             name:"梁启超铜像",
@@ -148,10 +148,11 @@ var line=[
             lng: 113.06654067230855,
             pitch: -0.4018670146106973,
             roll: 0.0025030639507974684,
-            waitTime:0,
+            waitTime:2,
             str:"茶坑旧乡府原址为北帝庙及祠堂,因年久失修在台风中倒塌。"
         },
         {
+            name:"茶坑旧乡府",
             alt: 31.67857784105493,
             heading: 1.4268364899954573,
             lat: 22.46290156781897,
@@ -161,6 +162,7 @@ var line=[
             waitTime:2,
             str:"1960年,梁启超长子、著名建筑设计大师梁思成回乡之时,恰逢村内计划修建办公楼,梁思成在大队临时办公室完成了村委(即“旧乡府”)的设计。"
         },
+     
         {  //茶坑旧乡府
             name:"茶坑旧乡府",
             alt: 17.07380420022011,
@@ -172,6 +174,17 @@ var line=[
             waitTime:3,
             str:"设计草图完成后,由三江镇“泥水森”完成建造。1963年旧乡府改为学校,1977-1979年再次作为村委办公地"
         },
+        {  //茶坑旧乡府
+            name:"茶坑旧乡府",
+            alt: 38.616472414120736,
+            heading: 1.798035637617863,
+            lat: 22.463297242465266,
+            lng: 113.06647920960381,
+            pitch: -0.46993093207755576,
+            roll: 0.002584840262850996,
+            waitTime:0,
+            str:"false"
+        },
         {  //远景
             alt: 32.011165994420104,
             heading: 1.4991867819595903,
@@ -189,7 +202,8 @@ var line=[
             lng: 113.06562239960287,
             pitch: -0.2294494889919345,
             roll: 0.001543958614923291,
-            waitTime:0
+            waitTime:0,
+            str:"false"
         },
         { //回到起点
             alt: 20.090267875712017,
@@ -198,7 +212,8 @@ var line=[
             heading: 2.8283229475275538,
             pitch: -0.17567078388335267,
             roll: 0.0007402932651014993,
-            waitTime:0
+            waitTime:0,
+            str:"false"
         },
 ];
 //景点位置

+ 9 - 4
Map/index.html

@@ -13,12 +13,17 @@
         }
 
         html,
-        body,
+        body{
+            width: 100%;
+            height: 100%;
+            margin: 0 auto;
+            padding: 0; 
+        }
         #cesiumContainer {
             width: 100%;
             height: 100%;
-            margin: 0;
-            padding: 0;
+            margin: 0 auto;
+            padding: 0; 
             overflow: hidden;
         }
 
@@ -59,7 +64,7 @@
 </head>
 
 <body>
-    <div id="cesiumContainer">
+    <div id="container">
         <button id="fun">开始</button>
         <button id="fun1">暂停</button>
         <button id="fun2">继续</button>

+ 19 - 10
Map/map.js

@@ -1,6 +1,6 @@
 //DGE 是自主研发数字孪生框架
 //DGE 作者:tianhongguo 
-let map = new DGE.Map('cesiumContainer', {
+let map = new DGE.Map('container', {
    animation:false,    //左下角的动画仪表盘
             baseLayerPicker:false,  //右上角的图层选择按钮
             geocoder:false,  //搜索框
@@ -16,7 +16,7 @@ let map = new DGE.Map('cesiumContainer', {
            baseUrl:"./Source/"
 });
 
-map.viewer._cesiumWidget._creditContainer.style.display = "none";
+
 let tileset=map.data.threeDTiles.load({
     url:"https://testgis.4dage.com/liangqichaoshuju/tileset.json",
     height:10,
@@ -54,7 +54,7 @@ map.viewer.camera.setView({
   options.enableDistanceLegend= false;
   // 用于启用或禁用指南针外环。true是启用,false是禁用。默认值为true。如果将选项设置为false,则该环将可见但无效。
   options.enableCompassOuterRing= true;
-  DGE.CesiumNavigation(map.viewer, options);
+  DGE.MapNavigation(map.viewer, options);
 
 let route =new DGE.FlyRoute("测试路线","FlyRouteId");
 line.map(({
@@ -104,11 +104,11 @@ function addLabels(){
             }
         });
     })
-    intervalFun();
 }
 
 function intervalFun(){
-    var j=0;
+    var j=0;//同一个时间段重复运行
+    interval&&clearInterval(interval)
     interval=setInterval(()=>{
         if(flyShow){
             let ens=map.viewer.entities.values;
@@ -124,9 +124,7 @@ function intervalFun(){
                     })
                 }
             }
-            if(index==0&&j==0){
-                addStr(line[index].str)
-            }
+           
             if(index!=map.flyManager.activeStepIndex){
                 j=0;
                 index=map.flyManager.activeStepIndex;
@@ -134,9 +132,18 @@ function intervalFun(){
                     addStr(line[index].str)
                 }
             }
+            if(index==0&&j==0){
+                addStr(line[index].str)
+            }
+            
+            if(index==line.length-2){
+                clear()
+            }
+          
             j++;
         }
     },1000);
+    console.log("interval",interval)
 }
 function addStr(str){
     var txtdiv=document.getElementById("font");
@@ -149,13 +156,15 @@ function addStr(str){
         txtdiv.appendChild(txt);
     }
     var width=(window.innerWidth-txtdiv.clientWidth)/2;
-    txtdiv.style.left=width;
-    let styleStr="position: absolute;z-index: 100;bottom: 10%;background-color:rgba(157,96,34,0.5);color:white;left:"+width+"px;"
+
+    var left=(width/window.innerWidth)*100+"%";
+    let styleStr="position: absolute;z-index: 100;bottom: 10%;background-color:rgba(157,96,34,0.5);color:white;left:"+left
     txtdiv.setAttribute('style',styleStr);
 }
 //清除
 function clear(){
     clearInterval(interval);
+    console.log("interval",interval)
     var txtdiv=document.getElementById("font");
     while(txtdiv.hasChildNodes()) 
     {