Commit Graph

554 Commits

Author SHA1 Message Date
Vinayak Kulkarni
6e7c3eb3b3
build: move to GitHub Actions workflow(s) (#597)
* build: add `Pipeline` GitHub Action workflow(s)

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* refactor(build): use CT action instead of travis-ci

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* chore: remove `main` branch

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* build: add `ct` workflow in The Pipeline 🕺

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* revert: remove builder workflow to automate deployments on `ghcr.io`

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* build(ci): upgrade node version to 17

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* build: use node version from `"engines"`

https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#node-version-file

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* chore: run linter(s) once we have linting tools in place

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: file name for automerger workflow

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: run workflow on protected branch

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* chore: ignore hadolint rules

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: setup-node after checkout repo

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: remove deprecated ::set-output

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* style: fix Dockerfile lint issues

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* chore(deps): upgrade pinned libcurl4 package

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* feat: add codeql workflow

https: //github.com/github/codeql-action/
Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: enable Lint check in CI

cause #626 is merged! ❤️

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* feat: add publishConfig in `package.json` 🕺

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* style: remove extra space

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* feat: add builder workflow 🎉

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* perf: enable `npm ci` since we now have lockfile 🕺

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* refactor!: remove pipeline and just enable automerger & CI

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* refactor: enable codeql & remove CI

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* revert: old files unneeded in this PR

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* revert: remove hadolint config

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* build: enable CT as per @acalcutt review

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: remove travis cause CT workflow

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* force ubuntu-20.04

Testing fails on ubuntu-latest due to no libicu66 being available in ubuntu 22.04

* simplify dependencies install

* add publish workflow

* remove automerger for now

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
Co-authored-by: acalcutt <acalcutt@techidiots.net>
2022-12-08 01:15:12 -05:00
zstadler
ac3b2f3dce
usage.rst: Add "Docker and --port" section (#651) 2022-12-05 00:02:05 -05:00
Michael Nutt
a7af45ee3f
fix: Ensure font serving does not reflect userdata-derived errors as HTML (#647)
* fix: ensure font serving does not reflect userdata-derived errors as HTML

Signed-off-by: Michael Nutt <michael@nuttnet.net>
2022-11-24 11:07:11 -05:00
Andrew Calcutt
c134795b81
change docker to use port 8080 by default (#638)
* change docker to use default 8080 port
2022-11-20 23:00:41 -05:00
Vinayak Kulkarni
0346d5c304
fix: issue with husky install (#639)
* fix: issue with husky in production

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: remove husky prepare

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
2022-11-09 15:39:28 -05:00
Vinayak Kulkarni
9b64093c42
style: fix lint issues in code 🕺 (#626)
* style: fix lint issues in code 🕺

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* style: lint fix all files

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* chore: add `keywords` for better reach

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* feat: add `husky` & `commitlint`

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* chore: ignore `public` directory

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* revert: do not lint `public` directory

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* style: fix issues with lint

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* feat: add eslint config

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* feat: add lint-staged

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* style: lint fix all file(s)

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: ignore rules for light version

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* fix: remove unnecessary space

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* chore(deps): update lockfile

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

* style: autofix linting issue(s)

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
2022-11-08 22:56:07 -05:00
zstadler
50201f0a99
Add Docker Healthcheck (#636)
* Add Docker Healthcheck

Fixes #635

* Update Dockerfile_light

* Update healthcheck.js

fix healthcheck output error: "file:///usr/src/app/src/healthcheck.js:1\nvar http = require(\"http\");\n           ^\n\nReferenceError: require is not defined in ES module scope, you can use import instead\nThis file is being treated as an ES module because it has a '.js' file extension and '/usr/src/app/package.json' contains \"type\": \"module\". To treat it as a CommonJS script, rename it to use the '.cjs' file extension.\n    at file:///usr/src/app/src/healthcheck.js:1:12\n    at ModuleJob.run (node:internal/modules/esm/module_job:193:25)\n    at async Promise.all (index 0)\n    at async ESMLoader.import (node:internal/modules/esm/loader:526:24)\n    at async loadESM (node:internal/process/esm_loader:91:5)\n    at async handleMainPromise (node:internal/modules/run_main:65:12)\n"

* update version

Co-authored-by: acalcutt <acalcutt@techidiots.net>
2022-11-06 21:30:55 -05:00
Max
d97c217e62
chown /data volume in Dockerfiles (#634) 2022-11-06 20:31:26 -05:00
zstadler
145ea15be3
Add .gitattribute (#637)
Lines in `.sh` scripts must always end with `lf`,
even in Windows' git shell
2022-11-06 18:08:26 -05:00
Andrew Calcutt
1243405807
Fix 'use omit=dev' warning. copy package-lock.json if it exists (#632)
* Fix 'use omit=dev' warning. copy package-lock

* add package-lock to project

* change to ci.

light version won't copy over package-lock, so keep that npm install.
2022-10-28 19:30:08 -04:00
Andrew Calcutt
212af8145c
fix canvas import (#631) 2022-10-28 19:04:20 -04:00
Andrew Calcutt
b6e2d101eb
Fix HUP kill not reloading config (#630)
* try to fix HUP config reset
* remove..outdated?.. require.cache
2022-10-28 11:53:21 -04:00
benedikt-brandtner-bikemap
f3f63498a8
Extended Static-Images Endpoint (#619)
* extended staticmap capabilities

* added allowRemoteMarkerIcons configuration option and restricted fetching of remote marker icons only when option is set to true;
asynchronously load all available icons in a settings object on server startup;
replaced fs.existsSync() call in serve_rendered when drawing marker icons with a check against available icons settings object;

* updated documentation for linecap parameter in staticmaps endpoint;
added linejoin parameter to staticmaps endpoint;

* added capability of staticmap endpoint to draw multiple paths
2022-10-27 22:55:46 -04:00
Andrew Calcutt
f8a0ab6d3c
Move docker images to ubuntu (#620)
* Move docker images to ubuntu

Co-authored-by: Michael Nutt <michael@nuttnet.net>
2022-10-05 09:11:03 -04:00
Monstrofil
38604c0a45
Bugfix: publicUrl is not used in some urls (#605)
In WMTS the publicUrl path was missed and it was not working properly.
Similar story about wmts.tmpl: the baseUrl is not working properly when
tileserver is hidden behind the proxy with different root path.

* Minor bugfix: make baseUrl always use '/' in the end

Co-authored-by: Oleksandr Shyshatskyi <oshyshatskyi@cloudlinux.com>
Co-authored-by: acalcutt <acalcutt@techidiots.net>
2022-09-30 09:18:13 -04:00
Andrew Calcutt
7f6d6bc994
Update publishing (#616)
* Update publish syntax
* Update publishing instructions
* version bump
2022-09-28 16:39:26 -04:00
Andrew Calcutt
b2bd5eaa96
Convert to esm module syntax (#606)
* switch to esm module

* Update package.json

* change to maplibre package

* fix tests

* eslint

* remove extra package updates

* Delete package-lock.json

* change 'fs' to 'node:fs'

* put back node 10.

without the package updates this still works

* remove trailing commas

* remove unassociated fix / formatting

* remove unassociated fix

* remove eslint from this PR

* remove unassociated fix

* lint

* Merge remote-tracking branch 'upstream/master' into esm_update

* fix mlgl

* update maplibre-native to new version with arm64

* update minor version
2022-09-28 14:41:55 -04:00
Michael Nutt
7cfcc413c4
don't include duplicate attributions (#613) 2022-09-24 16:36:39 -04:00
Nathan Gass
edd36dd251
Open mbtiles in readonly mode (#506) 2022-09-24 12:17:35 -04:00
Tobias
a5459fb3ba
CSS: Fix line break for long key-value strings (#580)
* CSS: Fix line break for long key-value strings

`break-all` forces a line break for long strings (https://developer.mozilla.org/en-US/docs/Web/CSS/word-break).

* add pr fix to maplinre-gl-inspect.css

Co-authored-by: acalcutt <acalcutt@techidiots.net>
2022-09-24 00:46:17 -04:00
Mateusz Łoskot
44372784e1
Fix URL to WMTS capabilities to be based on public URL (#501) 2022-09-23 09:35:32 -04:00
Frank
161ac5ff84
Fix rendering with tileMargin on top and bottom border of map (#571)
Co-authored-by: Frank Stolle <f.stolle@hosting-agency.de>
2022-09-22 23:22:06 -04:00
Ruben Poppe
9af3bff4f7
update spelling (#594) 2022-09-22 21:50:10 -04:00
Andrew Calcutt
031b4cb39a update version 2022-09-22 00:24:40 -04:00
Andrew Calcutt
6a8ced5d9d
Update all packages to their latest release (#610)
* Update all packages
2022-09-21 23:04:21 -04:00
Andrew Calcutt
70acddb40c
Readme update (#611)
* Update README.md
2022-09-21 23:03:22 -04:00
Andrew Calcutt
788d8328c4
Merge pull request #604 from WifiDB/commander
Update commander from 4.1.1 to 9.4.0
2022-09-21 13:31:43 -04:00
acalcutt
7ef9730a9c Merge remote-tracking branch 'upstream/master' into commander 2022-09-21 13:26:18 -04:00
Andrew Calcutt
2796b1514d
Merge pull request #608 from WifiDB/second_renderer
Add static renderer pool to fix static images
2022-09-21 13:08:50 -04:00
acalcutt
8584a117fe change to single quotes 2022-09-21 10:31:57 -04:00
Andrew Calcutt
48b4c33bed
Merge pull request #609 from maptiler/docs-klokan-to-maptiler
Docs update & build test
2022-09-21 10:31:08 -04:00
Petr Pridal
5a4268fcc1
Update conf.py 2022-09-21 16:20:31 +02:00
acalcutt
c1e9dc76ea more static respondImage 2022-09-20 23:33:51 -04:00
acalcutt
80d3699383 try to make a separate static renderer pool 2022-09-20 23:12:01 -04:00
Petr Sloup
49fae1e739
Merge pull request #603 from WifiDB/maplibre-gl-js
Update templates to use maplibre-gl-js, maplibre-gl-inspect, and leaflet .
2022-09-16 21:09:44 +02:00
acalcutt
208611f630 Merge remote-tracking branch 'upstream/master' into commander 2022-09-16 13:35:50 -04:00
acalcutt
97f1801923 Merge remote-tracking branch 'upstream/master' into maplibre-gl-js 2022-09-16 13:33:36 -04:00
Petr Sloup
235b2b7fcd
Merge pull request #602 from WifiDB/maplibre-native
Minimal maplibre-gl-native changes + docker build update
2022-09-16 19:05:47 +02:00
acalcutt
9d2e71fb2e remove CMD that doesn't work 2022-09-16 00:27:50 -04:00
Andrew Calcutt
aba436ea98 specify port 80 to match instructions 2022-09-15 15:48:50 -04:00
acalcutt
3136ccd83a update node version 2022-09-14 22:03:29 -04:00
acalcutt
efb4b2c915 orig formatting 2022-09-14 21:39:35 -04:00
acalcutt
b4cd42b186 fix spacing 2022-09-14 21:36:03 -04:00
acalcutt
b87a256e20 use original variable name 2022-09-14 21:31:02 -04:00
acalcutt
2362137667 update commander 2022-09-14 21:28:32 -04:00
acalcutt
58222b4c7b put back default inspect css 2022-09-14 20:50:16 -04:00
acalcutt
ba5e8c4392 remove mapbox libraries 2022-09-14 20:39:23 -04:00
acalcutt
abe5cd6401 update data and viewer templates 2022-09-14 20:39:02 -04:00
acalcutt
0c6509d959 add maplibre-gl-js / leaflet libraries 2022-09-14 20:36:45 -04:00
acalcutt
5be1072fd6 Update documentation dependencies 2022-09-14 20:16:08 -04:00