Commit graph

1382 commits

Author SHA1 Message Date
acalcutt
4b51f87dd7 Merge remote-tracking branch 'okimiko/terrain-elevation-contour' into terrain-elevation-contour 2025-02-05 00:19:10 -05:00
Miko
f15d1df514 Merge branch 'master' into terrain-elevation-contour 2025-02-04 23:52:57 +01:00
Miko
1d60dd6afc
use ttf files of googlefonts/opensans (#1447)
- fixes browser console warning on the index page regarding too large kerning table included in the original font

Co-authored-by: Miko <miko@none>
2025-01-26 15:31:34 -05:00
Andrew Calcutt
7662cb84ce
v5.1.3 (#1453) 2025-01-26 12:49:53 -05:00
Miko
467203e125
fix sighup (#1452) 2025-01-25 14:14:57 -05:00
acalcutt
9bb270b6c5 v5.1.2 2025-01-17 18:58:26 -05:00
Miko
f02c63c94c
Fix broken light (invalid use of heavy dependencies) (#1449)
* fix broken light (invalid use of heavy dependencies)
- move elevation calculation to serve_rendered and stub in serve_light due to use of canvas and sharp
- elevation api is not available for light

* add elevatppy lint:js:fix

* remove not working isLight function

* apply lint:js:fix

* add isLight to data.tmpl

* add note of not available elevation api in light version

* hide elevation link in light version

* cleanup terrain and elevation template flags

---------

Co-authored-by: Miko <miko@none>
2025-01-17 18:51:35 -05:00
Miko
32668ed90a increase opacity of contour lines 2025-01-11 21:28:50 +01:00
Miko
eb6a11b3b9 Merge branch 'master' into terrain-elevation-contour 2025-01-11 20:54:18 +01:00
Andrew Calcutt
b0a2cefb0e
Update v5.1.1 CHANGELOG.md 2025-01-11 00:39:31 -05:00
Andrew Calcutt
f7be63a35c
v5.1.1 (#1444) 2025-01-11 00:18:20 -05:00
Andrew Calcutt
407c2eb209
v5.1.1-pre.0 2025-01-10 23:46:11 -05:00
Andrew Calcutt
4d11796967
Fix wrong node version in docker final image. (#1442)
* fix wrong node version in final docker image

* fix outdated Docker_test file

* v5.1.1-pre.0
2025-01-10 23:44:44 -05:00
Andrew Calcutt
68ce971133
v5.1.0 (#1441) 2025-01-10 21:11:58 -05:00
Andrew Calcutt
5e1e87ac83
Update release.yml 2025-01-10 21:08:10 -05:00
Andrew Calcutt
5469ac313e
Test 5.1.0-pre.1 (#1440) 2025-01-10 20:51:00 -05:00
Andrew Calcutt
7e53bb8ab4
Fix workflow wrong output for tag (#1439) 2025-01-10 20:45:17 -05:00
Andrew Calcutt
5ce5fa5283
Update recommended node to v22 + Update docker images to use node 22 (#1438)
* Update recommended node

* update dockerfile to node 22

* Update CHANGELOG.md
2025-01-10 20:19:11 -05:00
Andrew Calcutt
97be9db6b7
Upgrade Express to v5 +Canvas v3 + code cleanup (#1429)
* first attempt to upgrade express to v5

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* try to fix https://github.com/maptiler/tileserver-gl/issues/1411

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup server.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup serve_font.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup sever_rendered.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup server_data.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup serve_style

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* Update serve_style.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* Move UV_THREADPOOL_SIZE  to main thred

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup utils.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* Use common app.get for images and static images

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* add allowedTileSizes and option

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup error responses

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* fix /style/id.json with next('route')

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* improve sprite path

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* add parseFloadts around zxy

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* simplify server_data

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* move tile fetch and add fix verbose logging

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* add Handling request to verbose logging

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* first attempt to upgrade express to v5

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* try to fix https://github.com/maptiler/tileserver-gl/issues/1411

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup server.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup serve_font.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup sever_rendered.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup server_data.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup serve_style

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* Update serve_style.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* Move UV_THREADPOOL_SIZE  to main thred

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup utils.js

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* Use common app.get for images and static images

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* add allowedTileSizes and option

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* cleanup error responses

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* fix /style/id.json with next('route')

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* improve sprite path

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* add parseFloadts around zxy

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* simplify server_data

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* move tile fetch and add fix verbose logging

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* add Handling request to verbose logging

Co-Authored-By: Andrew Calcutt <acalcutt@techidiots.net>

* merge elevation changes

* lint format

* add verbose logging, improve headers

* try to fix codeql

Information exposure through a stack trace

* test

* all tests passing

* cleanup unneeded changes

* cleanup

* try to fix codeql error

* font fixes

* fix tile size issue

* try to improve scale + codeql

* codeql for sprite logging

* codeql serve fonts

* codeql fixes

* fix failing test with multiple fonts

* Update serve_font.js

* codeql

* codeql

* codeql

* Update utils.js

* codeql

* codeql

* codeql

* codeql

* codeql sanitize

* Update serve_font.js

* Update serve_font.js

* remove useless assignment

* move isGzipped

* add if-modified-since and cache-control

* use consistent cache control

* reformat

* codeql

* codeql

* codeql

* codeql

* codeql

* codeql

* codeql

* Update serve_font.js

* Update serve_font.js

* Update serve_font.js

* Update serve_style.js

* Update serve_style.js

* Update serve_style.js

* Revert "Update serve_style.js"

This reverts commit e0574b1887.

* Revert "Update serve_style.js"

This reverts commit b1e1d72f25.

* Revert "Update serve_style.js"

This reverts commit 0f3629c752.

* Add readFile function

* use readFile, add path.normalize

* Update serve_rendered.js

* simplify input checking

* Update utils.js

* codeql

* Revert "codeql"

This reverts commit e18874fda0.

* Revert "Update utils.js"

This reverts commit 5de617dfe2.

* Revert "simplify input checking"

This reverts commit 62a3212629.

* move allowed functions to utils.js

* use xy[0],xy[1],

* uprade canvas per https://github.com/maptiler/tileserver-gl/issues/1433

* make font regex less restrictive

* fix regex error

* Add version and changelog

* Update CHANGELOG.md

* Update CHANGELOG.md
2025-01-10 19:34:17 -05:00
Andrew Calcutt
3abbb39633
Update PUBLISHING.md 2025-01-10 19:11:31 -05:00
Andrew Calcutt
52549e5c3c
Fix workflow missing semver in first job (#1437)
* remove bad env use

* try to fix outputs level

* move release type get to where semver is installed
2025-01-10 19:08:42 -05:00
Andrew Calcutt
77b741986f
try to Fix workflow (#1436)
* remove bad env use

* try to fix outputs level
2025-01-10 18:56:23 -05:00
Miko
63ff3fc988 run lint:js:fix 2025-01-11 00:56:18 +01:00
Andrew Calcutt
70f954b308
remove bad env use (#1435) 2025-01-10 18:53:06 -05:00
Miko
e1634d16b8 re-add baseurl, required bei maplibre-gl 2025-01-11 00:51:52 +01:00
Miko
450de42854 fix further rebase issues 2025-01-11 00:49:41 +01:00
Andrew Calcutt
c30d799811
add support for pre-release in release workflow (#1434)
* add support for pre-release in release workflow

* Update release.yml

* add release check

* workflow cleanup

* cleanup

* Create CHANGELOG.md

* Update PUBLISHING.md
2025-01-10 18:46:19 -05:00
Miko
6ad99a30b6 remove base url, re-add encoding based background-color 2025-01-11 00:20:22 +01:00
Miko
56dbeb2e8e fix rebase issues and update contour router to express5 2025-01-11 00:01:39 +01:00
Miko
c9e7f10034 disable debug log 2025-01-10 23:29:04 +01:00
Miko
904f3794a9 add elevation info 2025-01-10 23:27:06 +01:00
Miko
1bfeac2e01 add contour-label 2025-01-10 23:26:28 +01:00
Miko
43f86e9a66 add control for contour lines 2025-01-10 23:25:54 +01:00
acalcutt
d9d606b1f7 update levels 2025-01-10 23:25:16 +01:00
acalcutt
15a51acabb rename functions 2025-01-10 23:25:16 +01:00
acalcutt
07b6ccc536 remove unneeded pngjs 2025-01-10 23:25:16 +01:00
acalcutt
1961c24a69 change levels 2025-01-10 23:24:10 +01:00
acalcutt
2d90d8a27a add levels 2025-01-10 23:24:10 +01:00
acalcutt
d4c2ce1e4d get sharp image generation working 2025-01-10 23:23:12 +01:00
acalcutt
f7883a26ad test 4 2025-01-10 23:23:11 +01:00
acalcutt
5b753cafd1 partially working 2025-01-10 23:21:41 +01:00
acalcutt
b65ea0524f remove unuded metadata variable 2025-01-10 23:20:15 +01:00
acalcutt
088a5e8834 formatting 2025-01-10 23:20:15 +01:00
acalcutt
fb73f53861 Revert "test 3"
This reverts commit 0619a98d2b675a719f271ae64ecd5366898857fc.
2025-01-10 23:20:15 +01:00
acalcutt
cd4f162f27 test 3 2025-01-10 23:19:44 +01:00
acalcutt
b95a20791f test 2 2025-01-10 23:18:42 +01:00
acalcutt
a10555e2ee test 1 - not working 2025-01-10 23:18:36 +01:00
Miko
1f1fe49ec9 update readme for encoding option 2025-01-10 23:17:20 +01:00
Miko
4d33886f72 add map controls
Co-authored-by: Andrew Calcutt <acalcutt@techidiots.net>
2025-01-10 23:14:13 +01:00
Miko
02210f0bb8 add documentation for elevation api 2025-01-10 23:09:35 +01:00