Skip to content

Commit 16c9a02

Browse files
thw0rtedthw0rted
committed
Merge branch 'main' into issue-9275
2 parents 059d87d + dcf2adb commit 16c9a02

File tree

788 files changed

+116521
-20417
lines changed

Some content is hidden

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

788 files changed

+116521
-20417
lines changed

‎.eslintignore

-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ ThirdParty/**
1111
Tools/**
1212
Apps/Sandcastle/jsHintOptions.js
1313
Apps/Sandcastle/gallery/gallery-index.js
14-
Source/Core/buildModuleUrl.js
15-
Specs/spec-main.js
1614
index.release.html

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ Source/ThirdParty/rbush.js
4444
Source/ThirdParty/topojson.js
4545
Source/ThirdParty/Tween.js
4646
Source/ThirdParty/Uri.js
47-
Source/ThirdParty/when.js
4847
Source/ThirdParty/zip.js
4948
Source/ThirdParty/Workers/pako_inflate.min.js
5049
Source/ThirdParty/Workers/pako_deflate.min.js

‎Apps/.jshintrc

-61
This file was deleted.

‎Apps/CesiumViewer/CesiumViewer.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
CzmlDataSource,
1212
GeoJsonDataSource,
1313
KmlDataSource,
14+
GpxDataSource,
1415
TileMapServiceImageryProvider,
1516
Viewer,
1617
viewerCesiumInspectorMixin,
@@ -118,6 +119,8 @@ function main() {
118119
sourceType = "geojson";
119120
} else if (/\.kml$/i.test(source) || /\.kmz$/i.test(source)) {
120121
sourceType = "kml";
122+
} else if (/\.gpx$/i.test(source) || /\.gpx$/i.test(source)) {
123+
sourceType = "gpx";
121124
}
122125
}
123126

@@ -132,6 +135,8 @@ function main() {
132135
canvas: scene.canvas,
133136
screenOverlayContainer: viewer.container,
134137
});
138+
} else if (sourceType === "gpx") {
139+
loadPromise = GpxDataSource.load(source);
135140
} else {
136141
showLoadError(source, "Unknown format.");
137142
}
@@ -153,7 +158,7 @@ function main() {
153158
viewer.flyTo(dataSource);
154159
}
155160
})
156-
.otherwise(function (error) {
161+
.catch(function (error) {
157162
showLoadError(source, error);
158163
});
159164
}

‎Apps/HelloWorld.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<body>
2929
<div id="cesiumContainer"></div>
3030
<script>
31-
var viewer = new Cesium.Viewer("cesiumContainer");
31+
const viewer = new Cesium.Viewer("cesiumContainer");
3232
</script>
3333
</body>
3434
</html>

‎Apps/SampleData/gpx/complexTrk.gpx

+219
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
<gpx creator="GPS Visualizer http://www.gpsvisualizer.com/" version="1.0">
2+
<wpt lat="45.44283" lon="-121.72904"><ele>1374</ele><name>Vista Ridge Trailhead</name><sym>Trail Head</sym></wpt>
3+
<wpt lat="45.41000" lon="-121.71349"><ele>1777</ele><name>Wy'East Basin</name></wpt>
4+
<wpt lat="45.41124" lon="-121.70404"><ele>1823</ele><name>Dollar Lake</name></wpt>
5+
<wpt lat="45.39260" lon="-121.69937"><ele>2394</ele><name>Barrett Spur</name><sym>Summit</sym></wpt>
6+
<trk>
7+
<name>Barrett Spur 1</name>
8+
<trkseg>
9+
<trkpt lat="45.4431641" lon="-121.7295456"></trkpt>
10+
<trkpt lat="45.4428615" lon="-121.7290800"></trkpt>
11+
<trkpt lat="45.4425697" lon="-121.7279085"></trkpt>
12+
<trkpt lat="45.4424274" lon="-121.7267360"></trkpt>
13+
<trkpt lat="45.4422017" lon="-121.7260429"></trkpt>
14+
<trkpt lat="45.4416576" lon="-121.7252347"></trkpt>
15+
<trkpt lat="45.4406144" lon="-121.7241181"></trkpt>
16+
<trkpt lat="45.4398193" lon="-121.7224890"></trkpt>
17+
<trkpt lat="45.4387649" lon="-121.7226112"></trkpt>
18+
<trkpt lat="45.4383933" lon="-121.7224328"></trkpt>
19+
<trkpt lat="45.4377850" lon="-121.7224159"></trkpt>
20+
<trkpt lat="45.4372204" lon="-121.7226603"></trkpt>
21+
<trkpt lat="45.4347837" lon="-121.7226007"></trkpt>
22+
<trkpt lat="45.4332000" lon="-121.7216480"></trkpt>
23+
<trkpt lat="45.4334576" lon="-121.7223143"></trkpt>
24+
<trkpt lat="45.4321730" lon="-121.7222102"></trkpt>
25+
<trkpt lat="45.4316609" lon="-121.7219974"></trkpt>
26+
<trkpt lat="45.4303068" lon="-121.7220616"></trkpt>
27+
<trkpt lat="45.4270753" lon="-121.7209685"></trkpt>
28+
<trkpt lat="45.4267610" lon="-121.7211872"></trkpt>
29+
<trkpt lat="45.4260133" lon="-121.7212623"></trkpt>
30+
<trkpt lat="45.4257683" lon="-121.7214738"></trkpt>
31+
<trkpt lat="45.4257400" lon="-121.7217762"></trkpt>
32+
<trkpt lat="45.4259485" lon="-121.7226009"></trkpt>
33+
<trkpt lat="45.4249972" lon="-121.7223672"></trkpt>
34+
<trkpt lat="45.4246035" lon="-121.7219816"></trkpt>
35+
<trkpt lat="45.4238682" lon="-121.7219830"></trkpt>
36+
<trkpt lat="45.4226721" lon="-121.7216494"></trkpt>
37+
<trkpt lat="45.4224120" lon="-121.7217998"></trkpt>
38+
<trkpt lat="45.4211497" lon="-121.7218767"></trkpt>
39+
<trkpt lat="45.4193319" lon="-121.7208650"></trkpt>
40+
<trkpt lat="45.4186435" lon="-121.7202956"></trkpt>
41+
<trkpt lat="45.4185934" lon="-121.7200745"></trkpt>
42+
<trkpt lat="45.4178963" lon="-121.7196035"></trkpt>
43+
<trkpt lat="45.4171101" lon="-121.7198115"></trkpt>
44+
<trkpt lat="45.4166827" lon="-121.7193250"></trkpt>
45+
<trkpt lat="45.4161855" lon="-121.7190778"></trkpt>
46+
<trkpt lat="45.4159291" lon="-121.7193146"></trkpt>
47+
<trkpt lat="45.4153644" lon="-121.7193939"></trkpt>
48+
<trkpt lat="45.4151268" lon="-121.7191578"></trkpt>
49+
<trkpt lat="45.4148071" lon="-121.7191043"></trkpt>
50+
<trkpt lat="45.4146310" lon="-121.7187962"></trkpt>
51+
<trkpt lat="45.4142524" lon="-121.7187236"></trkpt>
52+
<trkpt lat="45.4142844" lon="-121.7185595"></trkpt>
53+
<trkpt lat="45.4133520" lon="-121.7180429"></trkpt>
54+
<trkpt lat="45.4131406" lon="-121.7181383"></trkpt>
55+
<trkpt lat="45.4130356" lon="-121.7179036"></trkpt>
56+
<trkpt lat="45.4118436" lon="-121.7168789"></trkpt>
57+
<trkpt lat="45.4109205" lon="-121.7156569"></trkpt>
58+
<trkpt lat="45.4104523" lon="-121.7145250"></trkpt>
59+
<trkpt lat="45.4104930" lon="-121.7143814"></trkpt>
60+
<trkpt lat="45.4102075" lon="-121.7140608"></trkpt>
61+
<trkpt lat="45.4099806" lon="-121.7134527"></trkpt>
62+
</trkseg>
63+
<trkseg>
64+
<trkpt lat="45.4099792" lon="-121.7134610"></trkpt>
65+
<trkpt lat="45.4091489" lon="-121.7134937"></trkpt>
66+
<trkpt lat="45.4086133" lon="-121.7132504"></trkpt>
67+
<trkpt lat="45.4080616" lon="-121.7127670"></trkpt>
68+
<trkpt lat="45.4076426" lon="-121.7126047"></trkpt>
69+
<trkpt lat="45.4075043" lon="-121.7122301"></trkpt>
70+
<trkpt lat="45.4070652" lon="-121.7118980"></trkpt>
71+
<trkpt lat="45.4068712" lon="-121.7114766"></trkpt>
72+
<trkpt lat="45.4067987" lon="-121.7108634"></trkpt>
73+
<trkpt lat="45.4064528" lon="-121.7106934"></trkpt>
74+
<trkpt lat="45.4057286" lon="-121.7110326"></trkpt>
75+
<trkpt lat="45.4056813" lon="-121.7108280"></trkpt>
76+
<trkpt lat="45.4055566" lon="-121.7109216"></trkpt>
77+
<trkpt lat="45.4047244" lon="-121.7093884"></trkpt>
78+
<trkpt lat="45.4039059" lon="-121.7083824"></trkpt>
79+
<trkpt lat="45.4037176" lon="-121.7077738"></trkpt>
80+
<trkpt lat="45.4034533" lon="-121.7074489"></trkpt>
81+
<trkpt lat="45.4026499" lon="-121.7071945"></trkpt>
82+
<trkpt lat="45.4019737" lon="-121.7067004"></trkpt>
83+
<trkpt lat="45.4018086" lon="-121.7067477"></trkpt>
84+
<trkpt lat="45.4014084" lon="-121.7063918"></trkpt>
85+
<trkpt lat="45.4013177" lon="-121.7059701"></trkpt>
86+
<trkpt lat="45.4011965" lon="-121.7058914"></trkpt>
87+
<trkpt lat="45.4010688" lon="-121.7053257"></trkpt>
88+
<trkpt lat="45.4008116" lon="-121.7054978"></trkpt>
89+
<trkpt lat="45.4006075" lon="-121.7053495"></trkpt>
90+
<trkpt lat="45.4005546" lon="-121.7054856"></trkpt>
91+
<trkpt lat="45.3991622" lon="-121.7049765"></trkpt>
92+
<trkpt lat="45.3985560" lon="-121.7042976"></trkpt>
93+
<trkpt lat="45.3981831" lon="-121.7042260"></trkpt>
94+
<trkpt lat="45.3973151" lon="-121.7036992"></trkpt>
95+
<trkpt lat="45.3967974" lon="-121.7036370"></trkpt>
96+
<trkpt lat="45.3963985" lon="-121.7033742"></trkpt>
97+
<trkpt lat="45.3945456" lon="-121.7029688"></trkpt>
98+
<trkpt lat="45.3920595" lon="-121.7015918"></trkpt>
99+
<trkpt lat="45.3907614" lon="-121.7012029"></trkpt>
100+
<trkpt lat="45.3906454" lon="-121.7010483"></trkpt>
101+
<trkpt lat="45.3906726" lon="-121.7008185"></trkpt>
102+
<trkpt lat="45.3909774" lon="-121.7008263"></trkpt>
103+
<trkpt lat="45.3911315" lon="-121.7004300"></trkpt>
104+
<trkpt lat="45.3909963" lon="-121.6998193"></trkpt>
105+
<trkpt lat="45.3908688" lon="-121.6997923"></trkpt>
106+
<trkpt lat="45.3917895" lon="-121.6994679"></trkpt>
107+
<trkpt lat="45.3926205" lon="-121.6994847"></trkpt>
108+
<trkpt lat="45.3925915" lon="-121.6992485"></trkpt>
109+
<trkpt lat="45.3928117" lon="-121.6995661"></trkpt>
110+
</trkseg>
111+
</trk>
112+
<trk>
113+
<name>Barrett Spur 2</name>
114+
<trkseg>
115+
<trkpt lat="45.3928201" lon="-121.6995658"></trkpt>
116+
<trkpt lat="45.3935449" lon="-121.6998805"></trkpt>
117+
<trkpt lat="45.3937897" lon="-121.6997710"></trkpt>
118+
<trkpt lat="45.3941789" lon="-121.6999492"></trkpt>
119+
<trkpt lat="45.3942372" lon="-121.7001375"></trkpt>
120+
<trkpt lat="45.3946353" lon="-121.6999452"></trkpt>
121+
<trkpt lat="45.3953599" lon="-121.7005823"></trkpt>
122+
<trkpt lat="45.3957081" lon="-121.7006533"></trkpt>
123+
<trkpt lat="45.3964324" lon="-121.7016813"></trkpt>
124+
<trkpt lat="45.3965766" lon="-121.7016905"></trkpt>
125+
<trkpt lat="45.3969060" lon="-121.7028225"></trkpt>
126+
<trkpt lat="45.3968739" lon="-121.7033856"></trkpt>
127+
<trkpt lat="45.3974854" lon="-121.7040597"></trkpt>
128+
<trkpt lat="45.3986110" lon="-121.7044455"></trkpt>
129+
<trkpt lat="45.3993308" lon="-121.7050832"></trkpt>
130+
<trkpt lat="45.4006454" lon="-121.7055117"></trkpt>
131+
<trkpt lat="45.4017924" lon="-121.7049952"></trkpt>
132+
<trkpt lat="45.4028690" lon="-121.7048065"></trkpt>
133+
<trkpt lat="45.4055213" lon="-121.7056599"></trkpt>
134+
<trkpt lat="45.4055606" lon="-121.7058477"></trkpt>
135+
</trkseg>
136+
<trkseg>
137+
<trkpt lat="45.4055556" lon="-121.7058619"></trkpt>
138+
<trkpt lat="45.4057016" lon="-121.7055424"></trkpt>
139+
<trkpt lat="45.4064672" lon="-121.7058247"></trkpt>
140+
<trkpt lat="45.4065550" lon="-121.7056490"></trkpt>
141+
<trkpt lat="45.4081392" lon="-121.7055042"></trkpt>
142+
<trkpt lat="45.4084785" lon="-121.7052201"></trkpt>
143+
<trkpt lat="45.4089125" lon="-121.7053029"></trkpt>
144+
<trkpt lat="45.4097597" lon="-121.7050730"></trkpt>
145+
<trkpt lat="45.4098359" lon="-121.7049047"></trkpt>
146+
<trkpt lat="45.4101859" lon="-121.7049419"></trkpt>
147+
<trkpt lat="45.4109946" lon="-121.7045409"></trkpt>
148+
<trkpt lat="45.4110654" lon="-121.7040909"></trkpt>
149+
<trkpt lat="45.4113353" lon="-121.7039421"></trkpt>
150+
<trkpt lat="45.4119105" lon="-121.7047169"></trkpt>
151+
<trkpt lat="45.4120297" lon="-121.7046115"></trkpt>
152+
<trkpt lat="45.4123835" lon="-121.7049762"></trkpt>
153+
<trkpt lat="45.4125020" lon="-121.7053677"></trkpt>
154+
<trkpt lat="45.4134357" lon="-121.7051916"></trkpt>
155+
<trkpt lat="45.4135832" lon="-121.7046182"></trkpt>
156+
<trkpt lat="45.4139565" lon="-121.7044171"></trkpt>
157+
<trkpt lat="45.4140658" lon="-121.7041636"></trkpt>
158+
<trkpt lat="45.4145098" lon="-121.7041176"></trkpt>
159+
<trkpt lat="45.4141414" lon="-121.7043045"></trkpt>
160+
<trkpt lat="45.4141558" lon="-121.7050125"></trkpt>
161+
<trkpt lat="45.4136095" lon="-121.7071948"></trkpt>
162+
<trkpt lat="45.4126067" lon="-121.7080044"></trkpt>
163+
<trkpt lat="45.4122181" lon="-121.7088539"></trkpt>
164+
<trkpt lat="45.4124283" lon="-121.7092346"></trkpt>
165+
<trkpt lat="45.4119295" lon="-121.7101625"></trkpt>
166+
<trkpt lat="45.4124117" lon="-121.7104037"></trkpt>
167+
<trkpt lat="45.4122553" lon="-121.7107970"></trkpt>
168+
<trkpt lat="45.4116919" lon="-121.7107601"></trkpt>
169+
<trkpt lat="45.4116619" lon="-121.7110571"></trkpt>
170+
<trkpt lat="45.4113536" lon="-121.7114942"></trkpt>
171+
<trkpt lat="45.4114186" lon="-121.7117619"></trkpt>
172+
<trkpt lat="45.4110215" lon="-121.7125886"></trkpt>
173+
<trkpt lat="45.4106014" lon="-121.7125816"></trkpt>
174+
<trkpt lat="45.4104916" lon="-121.7129590"></trkpt>
175+
<trkpt lat="45.4102544" lon="-121.7130066"></trkpt>
176+
<trkpt lat="45.4099714" lon="-121.7134279"></trkpt>
177+
</trkseg>
178+
<trkseg>
179+
<trkpt lat="45.4099747" lon="-121.7134529"></trkpt>
180+
<trkpt lat="45.4110685" lon="-121.7158641"></trkpt>
181+
<trkpt lat="45.4121873" lon="-121.7171940"></trkpt>
182+
<trkpt lat="45.4131063" lon="-121.7179663"></trkpt>
183+
<trkpt lat="45.4146646" lon="-121.7186587"></trkpt>
184+
<trkpt lat="45.4147872" lon="-121.7190281"></trkpt>
185+
<trkpt lat="45.4153143" lon="-121.7192079"></trkpt>
186+
<trkpt lat="45.4153716" lon="-121.7193714"></trkpt>
187+
<trkpt lat="45.4164891" lon="-121.7190904"></trkpt>
188+
<trkpt lat="45.4172221" lon="-121.7196833"></trkpt>
189+
<trkpt lat="45.4179416" lon="-121.7195244"></trkpt>
190+
<trkpt lat="45.4185782" lon="-121.7197987"></trkpt>
191+
<trkpt lat="45.4193540" lon="-121.7207025"></trkpt>
192+
<trkpt lat="45.4214007" lon="-121.7218387"></trkpt>
193+
<trkpt lat="45.4226606" lon="-121.7215644"></trkpt>
194+
<trkpt lat="45.4247590" lon="-121.7218690"></trkpt>
195+
<trkpt lat="45.4249036" lon="-121.7221738"></trkpt>
196+
<trkpt lat="45.4259458" lon="-121.7225690"></trkpt>
197+
<trkpt lat="45.4257020" lon="-121.7216118"></trkpt>
198+
<trkpt lat="45.4260738" lon="-121.7212258"></trkpt>
199+
<trkpt lat="45.4272087" lon="-121.7208974"></trkpt>
200+
<trkpt lat="45.4277253" lon="-121.7209468"></trkpt>
201+
<trkpt lat="45.4283981" lon="-121.7213890"></trkpt>
202+
<trkpt lat="45.4288768" lon="-121.7213453"></trkpt>
203+
<trkpt lat="45.4301857" lon="-121.7219605"></trkpt>
204+
<trkpt lat="45.4312165" lon="-121.7219340"></trkpt>
205+
<trkpt lat="45.4334856" lon="-121.7222528"></trkpt>
206+
<trkpt lat="45.4331572" lon="-121.7216508"></trkpt>
207+
<trkpt lat="45.4336070" lon="-121.7217366"></trkpt>
208+
<trkpt lat="45.4350551" lon="-121.7225997"></trkpt>
209+
<trkpt lat="45.4371233" lon="-121.7226122"></trkpt>
210+
<trkpt lat="45.4378561" lon="-121.7223631"></trkpt>
211+
<trkpt lat="45.4387304" lon="-121.7225545"></trkpt>
212+
<trkpt lat="45.4397525" lon="-121.7223926"></trkpt>
213+
<trkpt lat="45.4407832" lon="-121.7243251"></trkpt>
214+
<trkpt lat="45.4422796" lon="-121.7260896"></trkpt>
215+
<trkpt lat="45.4428882" lon="-121.7291117"></trkpt>
216+
<trkpt lat="45.4431708" lon="-121.7295917"></trkpt>
217+
</trkseg>
218+
</trk>
219+
</gpx>

0 commit comments

Comments
 (0)