Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
Map3D
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘恽伟
Map3D
Commits
f60a295e
Commit
f60a295e
authored
Feb 22, 2019
by
刘恽伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决飞行时报错
parent
8ad09e97
Pipeline
#9
canceled with stages
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
178 deletions
+11
-178
Linkage.js
test/Build/Static/js/main/Linkage.js
+0
-14
Roam.js
test/Build/Static/js/main/Roam.js
+7
-69
core.js
test/Build/Static/js/main/core.js
+4
-4
ui.js
test/Build/Static/js/main/ui.js
+0
-90
index.html
test/index.html
+0
-1
No files found.
test/Build/Static/js/main/Linkage.js
View file @
f60a295e
...
...
@@ -56,18 +56,6 @@ function Linkage(viewer, option) {
});
_self
.
map
.
zoomTo
(
point
,
new
Cesium
.
HeadingPitchRange
(
0
,
0
,
distance
))
}
// /**
// * 获得当前三维场景焦点
// */
// $('.' + _self.option.mainScene).click(function () {
// _self.isFocus3D = true;
// });
// /**
// * 获得当前二维地图焦点
// */
// $('.' + _self.option.container).click(function () {
// _self.isFocus3D = false;
// });
/**
* 动态分屏
*/
...
...
@@ -121,12 +109,10 @@ function Linkage(viewer, option) {
});
hander2d
=
new
Cesium
.
ScreenSpaceEventHandler
(
_self
.
scene
.
canvas
);
hander2d
.
setInputAction
(
function
(
movement
)
{
console
.
log
(
"!!!!!!!!"
);
_self
.
isFocus3D
=
true
;
},
Cesium
.
ScreenSpaceEventType
.
MOUSE_MOVE
);
hander3d
=
new
Cesium
.
ScreenSpaceEventHandler
(
_self
.
map
.
canvas
);
hander3d
.
setInputAction
(
function
(
movement
)
{
console
.
log
(
"???????"
);
_self
.
isFocus3D
=
false
;
},
Cesium
.
ScreenSpaceEventType
.
MOUSE_MOVE
);
_self
.
map
.
scene
.
screenSpaceCameraController
.
zoomEventTypes
=
[
Cesium
.
CameraEventType
.
WHEEL
,
Cesium
.
CameraEventType
.
PINCH
];
...
...
test/Build/Static/js/main/Roam.js
View file @
f60a295e
...
...
@@ -13,31 +13,11 @@ function Roam(viewer) {
_self
.
isDraw
=
false
;
_self
.
viewer
=
viewer
;
_self
.
height
=
100
;
_self
.
repeatTime
=
5
;
_self
.
repeatNum
=
5
;
_self
.
repeatTime
=
2
;
_self
.
repeatNum
=
2
;
_self
.
drawLayer
=
new
Cesium
.
PrimitiveCollection
();
_self
.
drawHelper
=
new
DrawGeometryHelper
(
viewer
);
_self
.
viewer
.
scene
.
primitives
.
add
(
_self
.
drawLayer
);
/**
* 绘制折线
* @param name
* @constructor
*/
function
DrawPolyLine
(
name
)
{
_self
.
drawHelper
.
startDrawingPolyline
({
callback
:
function
(
position
,
state
)
{
if
(
state
===
"drawClick"
)
{
_self
.
polyline
.
push
(
cartesian2LonLat
(
position
.
clone
()));
}
else
if
(
state
===
"drawEnd"
)
{
let
property
=
setRoamRoad
(
_self
.
polyline
);
addRoamRoad
(
property
);
_self
.
drawHelper
.
stopDrawing
();
closeCSS
(
name
);
}
}
});
}
/**
* 加载默认飞行路径
...
...
@@ -50,7 +30,7 @@ function Roam(viewer) {
let
property
=
new
Cesium
.
SampledPositionProperty
();
viewer
.
clock
.
startTime
=
_self
.
start
.
clone
();
viewer
.
clock
.
currentTime
=
_self
.
start
.
clone
();
viewer
.
clock
.
clockRange
=
Cesium
.
ClockRange
.
UNBOUND
ED
;
//Loop at the end
viewer
.
clock
.
clockRange
=
Cesium
.
ClockRange
.
CLAMP
ED
;
//Loop at the end
viewer
.
clock
.
multiplier
=
1
;
viewer
.
clock
.
shouldAnimate
=
false
;
for
(
let
i
=
0
;
i
<
polygon
.
length
-
1
;
i
++
)
{
...
...
@@ -69,7 +49,6 @@ function Roam(viewer) {
}
_self
.
stop
=
time
.
clone
();
_self
.
viewer
.
clock
.
stopTime
=
_self
.
stop
.
clone
();
setActiveCSS
(
true
);
return
property
;
}
...
...
@@ -112,39 +91,11 @@ function Roam(viewer) {
return
[
lon
,
lat
];
}
/**
* 关闭css
* @param name
*/
function
closeCSS
(
name
)
{
$
((
'#'
+
name
+
"-svg"
)).
css
(
'fill'
,
'#ffffff'
);
$
(
'.roams'
).
removeClass
(
'roams'
);
}
/**
* 控制按钮点击
* @param active
*/
function
setActiveCSS
(
active
)
{
if
(
active
)
{
$
(
'#roam-start'
).
addClass
(
'active'
);
$
(
'#roam-pause'
).
addClass
(
'active'
);
$
(
'#roam-stop'
).
addClass
(
'active'
)
}
else
{
$
(
'#roam-start'
).
removeClass
(
'active'
);
$
(
'#roam-pause'
).
removeClass
(
'active'
);
$
(
'#roam-stop'
).
removeClass
(
'active'
)
}
}
/**
* 飞行
* @param clock
*/
var
setview
=
function
(
clock
)
{
if
(
Cesium
.
JulianDate
.
lessThanOrEquals
(
_self
.
viewer
.
clock
.
stopTime
,
clock
.
_currentTime
))
{
_self
.
stopRoam
();
}
var
setview
=
function
()
{
_self
.
stopRoam
();
};
/**
* 开始飞行
...
...
@@ -154,7 +105,7 @@ function Roam(viewer) {
_self
.
viewer
.
clock
.
currentTime
=
_self
.
viewer
.
clock
.
startTime
;
_self
.
isStop
=
!
_self
.
isStop
;
}
_self
.
viewer
.
clock
.
on
Tick
.
addEventListener
(
setview
);
_self
.
viewer
.
clock
.
on
Stop
.
addEventListener
(
setview
);
_self
.
viewer
.
clock
.
shouldAnimate
=
true
;
_self
.
viewer
.
trackedEntity
=
_self
.
target
;
};
...
...
@@ -171,8 +122,7 @@ function Roam(viewer) {
_self
.
isStop
=
true
;
_self
.
viewer
.
clock
.
shouldAnimate
=
false
;
_self
.
viewer
.
trackedEntity
=
null
;
_self
.
viewer
.
clock
.
onTick
.
removeEventListener
(
setview
);
closeCSS
(
"roam-start"
);
_self
.
viewer
.
clock
.
onStop
.
removeEventListener
(
setview
);
};
/**
* 加载默认路径
...
...
@@ -188,20 +138,11 @@ function Roam(viewer) {
let
property
=
setRoamRoad
(
arr
);
addRoamRoad
(
property
);
};
/**
* 绘制自定义路径
* @param name
*/
Roam
.
prototype
.
drawRoamRoad
=
function
(
name
)
{
_self
.
Clean
();
DrawPolyLine
(
name
);
};
/**
* 清除路径飞行
* @constructor
*/
Roam
.
prototype
.
Clean
=
function
()
{
_self
.
drawHelper
.
stopDrawing
();
_self
.
drawLayer
.
removeAll
();
_self
.
polyline
=
[];
_self
.
start
=
false
;
...
...
@@ -213,8 +154,6 @@ function Roam(viewer) {
_self
.
target
=
null
;
}
_self
.
stopRoam
();
setActiveCSS
(
false
);
};
}
\ No newline at end of file
test/Build/Static/js/main/core.js
View file @
f60a295e
...
...
@@ -93,8 +93,8 @@ function initialize() {
east
=
add3Dtile
(
config
.
MainModelData
.
east
.
url
,
config
.
MainModelData
.
east
.
matrix
);
west
=
add3Dtile
(
config
.
MainModelData
.
west
.
url
,
config
.
MainModelData
.
west
.
matrix
);
vector
=
add3Dtile
(
config
.
MainModelData
.
vector
.
url
,
config
.
MainModelData
.
vector
.
matrix
);
piontCloud
=
add3Dtile
(
config
.
MainModelData
.
cloud
.
url
,
config
.
MainModelData
.
cloud
.
matrix
);
for
(
let
i
=
0
;
i
<
bbb
.
length
;
i
+=
3
)
{
//
piontCloud = add3Dtile(config.MainModelData.cloud.url, config.MainModelData.cloud.matrix);
for
(
let
i
=
0
;
i
<
15
;
i
+=
3
)
{
points
.
push
(
viewer
.
entities
.
add
({
name
:
"点"
+
(
i
/
3
+
1
),
position
:
new
Cesium
.
Cartesian3
.
fromDegrees
(
bbb
[
i
],
bbb
[
i
+
1
],
bbb
[
i
+
2
]),
...
...
@@ -110,10 +110,10 @@ function initialize() {
}
//二维面
var
entities
var
entities
;
let
houseAreaSign
=
Cesium
.
GeoJsonDataSource
.
load
(
'Build/Data/houseAreaSign.json'
,{
clampToGround
:
true
});
houseAreaSign
.
then
(
function
(
dataSource
)
{
entities
=
dataSource
.
entities
entities
=
dataSource
.
entities
;
var
areaEntitiesVals
=
entities
.
values
;
for
(
let
i
=
0
;
i
<
areaEntitiesVals
.
length
;
i
++
)
{
var
entity
=
areaEntitiesVals
[
i
];
...
...
test/Build/Static/js/main/ui.js
View file @
f60a295e
...
...
@@ -182,96 +182,6 @@ $(document).ready(function () {
"id"
:
605
,
"text"
:
"点5"
,
"checked"
:
false
},
{
"id"
:
606
,
"text"
:
"点6"
,
"checked"
:
false
},
{
"id"
:
607
,
"text"
:
"点7"
,
"checked"
:
false
},
{
"id"
:
608
,
"text"
:
"点8"
,
"checked"
:
false
},
{
"id"
:
609
,
"text"
:
"点9"
,
"checked"
:
false
},
{
"id"
:
610
,
"text"
:
"点10"
,
"checked"
:
false
},
{
"id"
:
611
,
"text"
:
"点11"
,
"checked"
:
false
},
{
"id"
:
612
,
"text"
:
"点12"
,
"checked"
:
false
},
{
"id"
:
613
,
"text"
:
"点13"
,
"checked"
:
false
},
{
"id"
:
614
,
"text"
:
"点14"
,
"checked"
:
false
},
{
"id"
:
615
,
"text"
:
"点15"
,
"checked"
:
false
},
{
"id"
:
616
,
"text"
:
"点16"
,
"checked"
:
false
},
{
"id"
:
617
,
"text"
:
"点17"
,
"checked"
:
false
},
{
"id"
:
618
,
"text"
:
"点18"
,
"checked"
:
false
},
{
"id"
:
619
,
"text"
:
"点19"
,
"checked"
:
false
},
{
"id"
:
620
,
"text"
:
"点20"
,
"checked"
:
false
},
{
"id"
:
621
,
"text"
:
"点21"
,
"checked"
:
false
},
{
"id"
:
622
,
"text"
:
"点22"
,
"checked"
:
false
},
{
"id"
:
623
,
"text"
:
"点23"
,
"checked"
:
false
}
]
...
...
test/index.html
View file @
f60a295e
...
...
@@ -12,7 +12,6 @@
<script
src=
"http://172.16.10.132:3333/utils/jquery/jquery-2.1.0.min.js"
></script>
<script
src=
"http://172.16.10.132:3333/utils/easyui/jquery.easyui.min.js"
></script>
<script
src=
"http://172.16.10.132:3333/extend/Measure/MapMeasure.js"
></script>
<script
src=
"http://172.16.10.132:3333/extend/Measure/MapMeasure.js"
></script>
<script
src=
"http://172.16.10.132:3333/extend/Draw/DrawGeometryHelper.js"
></script>
<script
src=
"http://172.16.10.132:3333/extend/Navigation/viewerCesiumNavigationMixin.min.js"
></script>
<script
src=
"Build/Static/js/main/ui.js"
></script>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment