Skip to content

Commit 22f15b8

Browse files
lesbaaLes Moffat
andauthored
Rd 812 restructure (#168)
* chore: - restructure repo to be more inline with future feature branch - eslint --fix * fix(MapTilerTerrainControl): fix dodgy import * chore(tools.js): add comment * fix(demos): implement demo-utils in demos * chore(lint): add new line * fix(demos): fix sky-night demo * feat(tests): create tests to check that current exports are matched to expected exports * feat(testing): add testing mocks for browser apis * chore(demos): remove superfluous code from demos * 3.0.2 * chore(changelog): update changelog * fix(types): Unit is a type not a constant, moving to global `types` file * fix(package.json): use local version of eslint instead of npx * chore(ColorRamp): because of macos case issues, we need to rename ColorRamp to ColorRamp_ and back again * chore(ColorRamp): rename colorramp * fix: make sure correct modules are exported * fix(lint):apease CI linter (lints differently to local) --------- Co-authored-by: Les Moffat <[email protected]>
1 parent e3d186b commit 22f15b8

Some content is hidden

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

54 files changed

+1234
-2823
lines changed

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
[*]
7+
indent_style = space
8+
indent_size = 2
9+
end_of_line = LF
10+
charset = utf-8
11+
trim_trailing_whitespace = false
12+
insert_final_newline = true
13+
max_line_length = 180

.husky/pre-commit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
npx lint-staged
1+
npx lint-staged;
2+
npm run test;

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# MapTiler SDK Changelog
22

3+
## 3.0.2
4+
## ✨ Features and improvements
5+
None
6+
7+
## 🐛 Bug fixes
8+
None
9+
10+
## 🔧 Others
11+
Restructuring of repo, additon of tests to check consistency of library exports.
12+
313
## 3.0.1
414
### New Features
515
- Update Maplibre to v5.0.1
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
<div id="style-picker-container">
3131
<select name="mapstyles" id="mapstyles-picker"></select>
3232
</div>
33-
3433
<script src="../build/maptiler-sdk.umd.min.js"></script>
34+
<script src="assets/demo-utils.js"></script>
3535
<script>
36-
maptilersdk.config.apiKey = new URLSearchParams(location.search).get("key") || "API_KEY";
36+
37+
addPerformanceStats();
38+
setupMapTilerApiKey();
3739

3840
if (maptilersdk.config.apiKey === "API_KEY") {
3941
const errorMessage = "MapTiler API key is missing. Please use URL `key` parameter to set it (`?key=XXXXX`).";
@@ -68,4 +70,4 @@
6870
</script>
6971
</body>
7072

71-
</html>
73+
</html>
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,11 @@
6565
</div>
6666

6767
<script src="../build/maptiler-sdk.umd.min.js"></script>
68-
68+
<script src="assets/demo-utils.js"></script>
6969
<script>
70-
maptilersdk.config.apiKey = new URLSearchParams(location.search).get("key") || "API_KEY";
71-
72-
if (maptilersdk.config.apiKey === "API_KEY") {
73-
const errorMessage = "MapTiler API key is missing. Please use URL `key` parameter to set it (`?key=XXXXX`).";
7470

75-
alert(errorMessage);
76-
throw new Error(errorMessage);
77-
}
71+
addPerformanceStats();
72+
setupMapTilerApiKey();
7873

7974
const map = new maptilersdk.Map({
8075
container: document.getElementById("map-container"),
Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,11 @@
8080
</div>
8181

8282
<script src="../build/maptiler-sdk.umd.min.js"></script>
83+
<script src="assets/demo-utils.js"></script>
8384
<script>
84-
maptilersdk.config.apiKey = new URLSearchParams(location.search).get("key") || "API_KEY";
8585

86-
if (maptilersdk.config.apiKey === "API_KEY") {
87-
const errorMessage = "MapTiler API key is missing. Please use URL `key` parameter to set it (`?key=XXXXX`).";
88-
89-
alert(errorMessage);
90-
throw new Error(errorMessage);
91-
}
86+
addPerformanceStats();
87+
setupMapTilerApiKey();
9288

9389
const map = new maptilersdk.Map({
9490
container: document.getElementById("map-container"),
@@ -111,10 +107,12 @@
111107
});
112108
});
113109

114-
document.getElementById("fog-ground-blend").addEventListener("input", (e) => {
115-
map.setSky({
116-
"fog-ground-blend": parseFloat(e.target.value),
117-
});
110+
document.getElementById("fog-ground-blend").addEventListener("input", (e) => {
111+
map.setSky({
112+
"fog-ground-blend": parseFloat(e.target.value),
113+
});
114+
});
115+
118116
document.getElementById("horizon-color").addEventListener("input", (e) => {
119117
map.setSky({
120118
"horizon-color": e.target.value,
@@ -125,6 +123,7 @@
125123
map.setSky({
126124
"horizon-fog-blend": parseFloat(e.target.value),
127125
});
126+
});
128127
document.getElementById("fog-color").addEventListener("input", (e) => {
129128
map.setSky({
130129
"fog-color": e.target.value,
@@ -135,6 +134,7 @@
135134
map.setSky({
136135
"sky-horizon-blend": parseFloat(e.target.value),
137136
});
137+
});
138138
document.getElementById("fog-ground-blend").addEventListener("input", (e) => {
139139
map.setSky({
140140
"fog-ground-blend": parseFloat(e.target.value),
@@ -145,6 +145,8 @@
145145
map.setSky({
146146
"atmosphere-blend": parseFloat(e.target.value),
147147
});
148+
});
149+
148150
document.getElementById("horizon-fog-blend").addEventListener("input", (e) => {
149151
map.setSky({
150152
"horizon-fog-blend": parseFloat(e.target.value),
@@ -167,6 +169,8 @@
167169
"sky-horizon-blend": 1.0,
168170
"atmosphere-blend": 0.5,
169171
})
172+
});
173+
170174
document.getElementById("atmosphere-blend").addEventListener("input", (e) => {
171175
map.setSky({
172176
"atmosphere-blend": parseFloat(e.target.value),
@@ -186,5 +190,4 @@
186190
});
187191
</script>
188192
</body>
189-
190-
</html>
193+
</html>
Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,12 @@
2727

2828
<body>
2929
<div id="map-container"></div>
30-
3130
<script src="../build/maptiler-sdk.umd.min.js"></script>
32-
<script>
33-
maptilersdk.config.apiKey = new URLSearchParams(location.search).get("key") || "API_KEY";
34-
35-
if (maptilersdk.config.apiKey === "API_KEY") {
36-
const errorMessage = "MapTiler API key is missing. Please use URL `key` parameter to set it (`?key=XXXXX`).";
31+
<script src="assets/demo-utils.js"></script>
3732

38-
alert(errorMessage);
39-
throw new Error(errorMessage);
40-
}
33+
<script>
34+
addPerformanceStats();
35+
setupMapTilerApiKey();
4136

4237
const map = new maptilersdk.Map({
4338
container: document.getElementById("map-container"),
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,11 @@
3131
<select name="mapstyles" id="mapstyles-picker"></select>
3232
</div>
3333

34-
<script src="../dist/maptiler-sdk.umd.min.js"></script>
34+
<script src="assets/demo-utils.js"></script>
3535
<script>
36-
maptilersdk.config.apiKey = new URLSearchParams(location.search).get("key") || "API_KEY";
37-
38-
if (maptilersdk.config.apiKey === "API_KEY") {
39-
const errorMessage = "MapTiler API key is missing. Please use URL `key` parameter to set it (`?key=XXXXX`).";
40-
41-
alert(errorMessage);
42-
throw new Error(errorMessage);
43-
}
4436

37+
addPerformanceStats();
38+
setupMapTilerApiKey();
4539
const map = new maptilersdk.Map({
4640
container: document.getElementById("map-container"),
4741
style: maptilersdk.MapStyle.OUTDOOR.DARK,
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@
3838

3939
<body>
4040
<script src="../build/maptiler-sdk.umd.min.js"></script>
41-
41+
<script src="assets/demo-utils.js"></script>
4242
<script>
43+
44+
addPerformanceStats();
45+
setupMapTilerApiKey();
46+
4347
function getRandomMapStyle() {
4448
const styles = Object.keys(maptilersdk.MapStyle);
4549
const style = maptilersdk.MapStyle[styles[Math.floor(Math.random() * styles.length)]];
@@ -69,8 +73,6 @@
6973
</script>
7074

7175
<script>
72-
maptilersdk.config.apiKey = "YOUR_API_KEY";
73-
7476
/*
7577
* The mapLeftTop will lose the WebGL context because it is removed
7678
* so the event will not be called.

0 commit comments

Comments
 (0)