diff --git a/data/.gitignore b/assets/.gitignore similarity index 62% rename from data/.gitignore rename to assets/.gitignore index 6cdca6f6..4764075f 100644 --- a/data/.gitignore +++ b/assets/.gitignore @@ -1,2 +1,3 @@ /download +/maputnik /*.bin diff --git a/data/Makefile b/assets/Makefile similarity index 100% rename from data/Makefile rename to assets/Makefile diff --git a/data/custom-grid-lv95.json b/assets/custom-grid-lv95.json similarity index 100% rename from data/custom-grid-lv95.json rename to assets/custom-grid-lv95.json diff --git a/data/helloworld.db b/assets/helloworld.db similarity index 100% rename from data/helloworld.db rename to assets/helloworld.db diff --git a/data/helloworld.qgs b/assets/helloworld.qgs similarity index 100% rename from data/helloworld.qgs rename to assets/helloworld.qgs diff --git a/data/liechtenstein.mbtiles b/assets/liechtenstein.mbtiles similarity index 100% rename from data/liechtenstein.mbtiles rename to assets/liechtenstein.mbtiles diff --git a/data/maplibre.html b/assets/maplibre.html similarity index 100% rename from data/maplibre.html rename to assets/maplibre.html diff --git a/data/mbtiles_mvt_fl-style.json b/assets/mbtiles_mvt_fl-style.json similarity index 100% rename from data/mbtiles_mvt_fl-style.json rename to assets/mbtiles_mvt_fl-style.json diff --git a/data/mvtbench.gpkg b/assets/mvtbench.gpkg similarity index 100% rename from data/mvtbench.gpkg rename to assets/mvtbench.gpkg diff --git a/data/ne.map b/assets/ne.map similarity index 100% rename from data/ne.map rename to assets/ne.map diff --git a/data/ne.qgs b/assets/ne.qgs similarity index 100% rename from data/ne.qgs rename to assets/ne.qgs diff --git a/data/ne_extracts.gpkg b/assets/ne_extracts.gpkg similarity index 100% rename from data/ne_extracts.gpkg rename to assets/ne_extracts.gpkg diff --git a/data/ne_extracts.qgz b/assets/ne_extracts.qgz similarity index 100% rename from data/ne_extracts.qgz rename to assets/ne_extracts.qgz diff --git a/data/railway-test.gpkg b/assets/railway-test.gpkg similarity index 100% rename from data/railway-test.gpkg rename to assets/railway-test.gpkg diff --git a/data/usergrid.html b/assets/usergrid.html similarity index 100% rename from data/usergrid.html rename to assets/usergrid.html diff --git a/bbox-feature-server/src/datasource/gpkg.rs b/bbox-feature-server/src/datasource/gpkg.rs index e43aee8c..bd5da0ee 100644 --- a/bbox-feature-server/src/datasource/gpkg.rs +++ b/bbox-feature-server/src/datasource/gpkg.rs @@ -243,7 +243,7 @@ mod tests { #[tokio::test] async fn gpkg_content() { - let pool = GpkgDatasource::new_pool("../data/ne_extracts.gpkg") + let pool = GpkgDatasource::new_pool("../assets/ne_extracts.gpkg") .await .unwrap(); let collections = pool.collections().await.unwrap(); @@ -264,7 +264,7 @@ mod tests { #[tokio::test] async fn gpkg_features() { let filter = FilterParams::default(); - let ds = GpkgDatasource::new_pool("../data/ne_extracts.gpkg") + let ds = GpkgDatasource::new_pool("../assets/ne_extracts.gpkg") .await .unwrap(); let info = GpkgCollectionInfo { diff --git a/bbox-feature-server/src/inventory.rs b/bbox-feature-server/src/inventory.rs index a7a3eb7c..bb8e9118 100644 --- a/bbox-feature-server/src/inventory.rs +++ b/bbox-feature-server/src/inventory.rs @@ -206,7 +206,7 @@ mod tests { #[tokio::test] async fn inventory_scan() { - let inventory = Inventory::scan(&DatasourceCfg::from_path("../data")).await; + let inventory = Inventory::scan(&DatasourceCfg::from_path("../assets")).await; // assert_eq!(inventory.collections().len(), 3); assert!(inventory.collections().len() >= 3); assert_eq!( diff --git a/bbox-map-server/src/wms_capabilities.rs b/bbox-map-server/src/wms_capabilities.rs index d6e8b5ba..ce93d92b 100644 --- a/bbox-map-server/src/wms_capabilities.rs +++ b/bbox-map-server/src/wms_capabilities.rs @@ -174,8 +174,7 @@ mod test { #[test] fn umn() { - let s = r##" - + let s = r##" @@ -338,8 +337,7 @@ mod test { #[test] fn qgis() { - let s = r##" - + let s = r##" WMS @@ -641,8 +639,7 @@ mod test { #[test] fn qgis_getprojectsettings() { - let s = r##" - + let s = r##" WMS diff --git a/bbox-routing-server/src/endpoints.rs b/bbox-routing-server/src/endpoints.rs index 6aa19af5..a2de6995 100644 --- a/bbox-routing-server/src/endpoints.rs +++ b/bbox-routing-server/src/endpoints.rs @@ -260,7 +260,7 @@ mod tests { #[actix_web::test] async fn test_route() -> Result<(), Error> { - let router = Router::from_gpkg("../data/railway-test.gpkg", "flows", "geom") + let router = Router::from_gpkg("../assets/railway-test.gpkg", "flows", "geom") .await .unwrap(); let app = test::init_service( diff --git a/bbox-routing-server/src/engine.rs b/bbox-routing-server/src/engine.rs index 3c9add49..4ebf4221 100644 --- a/bbox-routing-server/src/engine.rs +++ b/bbox-routing-server/src/engine.rs @@ -257,7 +257,7 @@ mod tests { #[tokio::test] async fn chgraph() { - let router = Router::from_gpkg("../data/railway-test.gpkg", "flows", "geom") + let router = Router::from_gpkg("../assets/railway-test.gpkg", "flows", "geom") .await .unwrap(); diff --git a/bbox-server/README.md b/bbox-server/README.md index 94ce8b2b..a89eb831 100644 --- a/bbox-server/README.md +++ b/bbox-server/README.md @@ -27,10 +27,10 @@ Configuraton is read from `bbox.toml` and environment variables. [[assets.static]] # Static file serving -# Env var example: BBOX_ASSETS__STATIC='[{dir="data",path="data"}]' -# ./data/* -> http://localhost:8080/data/ -# dir = "./data" -# path = "data" +# Env var example: BBOX_ASSETS__STATIC='[{dir="assets",path="assets"}]' +# ./assets/* -> http://localhost:8080/assets/ +# dir = "./assets" +# path = "/assets" [[assets.repo]] # QGIS plugin repository diff --git a/bbox-tile-server/README.md b/bbox-tile-server/README.md index ed1ed0c7..50fbbb2c 100644 --- a/bbox-tile-server/README.md +++ b/bbox-tile-server/README.md @@ -44,7 +44,7 @@ Tile requests: Run tile server without configuration: - cargo run -- serve ../data/liechtenstein.mbtiles + cargo run -- serve ../assets/liechtenstein.mbtiles curl -o /tmp/tile.mvt http://localhost:8080/xyz/liechtenstein/14/8621/5759.mvt @@ -70,7 +70,7 @@ Style JSON requests: Map viewer examples: - x-www-browser http://127.0.0.1:8080/data/usergrid.html?debug=1 + x-www-browser http://127.0.0.1:8080/assets/usergrid.html?debug=1 Map viewer template examples: @@ -132,14 +132,14 @@ Stop MinIO: ### Using Maputnik for MVT styling * Download latest public.zip from https://github.com/maputnik/editor/releases -* Unpack into ../data/ and rename public to maputnik +* Unpack into ../assets/ and rename public to maputnik Open example: - http://localhost:8080/data/maputnik/index.html?style=http://localhost:8080/data/maplibre-style.json - http://localhost:8080/data/maputnik/index.html#11.0/47.0944/9.5076 + http://localhost:8080/assets/maputnik/index.html?style=http://localhost:8080/assets/maplibre-style.json + http://localhost:8080/assets/maputnik/index.html#11.0/47.0944/9.5076 - http://localhost:8080/data/maputnik/index.html?style=http://localhost:8080/xyz/mbtiles_mvt_fl.style.json + http://localhost:8080/assets/maputnik/index.html?style=http://localhost:8080/xyz/mbtiles_mvt_fl.style.json ### S3 upload benchmarks diff --git a/bbox.toml b/bbox.toml index e84c642e..00a5ede9 100644 --- a/bbox.toml +++ b/bbox.toml @@ -25,17 +25,17 @@ path = "/metrics" #agent_endpoint = "localhost:6831" [[datasource.directory]] -dir = "../data" +dir = "../assets" #[[datasource.postgis]] #url = "postgresql://t_rex:t_rex@127.0.0.1:5439/t_rex_tests" [[assets.static]] # Static file serving -# Env var example: BBOX_ASSETS__STATIC='[{dir="data",path="/data"}]' -# ./data/* -> http://localhost:8080/data/ -dir = "./data" -path = "/data" +# Env var example: BBOX_ASSETS__STATIC='[{dir="assets",path="/assets"}]' +# ./assets/* -> http://localhost:8080/assets/ +dir = "./assets" +path = "/assets" [[assets.template]] # Template file serving @@ -61,15 +61,15 @@ path = "/qgisrepo" [mapserver.qgis_backend] # QGIS Server settings # Environment variable prefix: BBOX_MAPSERVER__QGIS_BACKEND__ -project_basedir = "../data" # Base dir for project files (.qgs, .qgz) -qgs.path = "/qgis" # WMS URL base path -qgz.path = "/qgz" # WMS URL base path +project_basedir = "../assets" # Base dir for project files (.qgs, .qgz) +qgs.path = "/qgis" # WMS URL base path +qgz.path = "/qgz" # WMS URL base path [mapserver.umn_backend] # UMN MapServer settings # Environment variable prefix: BBOX_MAPSERVER__UMN_BACKEND__ -project_basedir = "../data" # Base dir for project files (.map) -path = "/wms/map" # WMS URL base path +project_basedir = "../assets" # Base dir for project files (.map) +path = "/wms/map" # WMS URL base path #[mapserver.mock_backend] # Enable FCGI mockup backend (for testing) @@ -85,14 +85,14 @@ path = "/wms/map" # WMS URL base path #[[routing.service]] #profile = "railway" -#gpkg = "../data/railway-test.gpkg" +#gpkg = "../assets/railway-test.gpkg" #table = "flows" #geom = "geom" # -- custom grids -- [[tileserver.grid]] -json = "../data/custom-grid-lv95.json" +json = "../assets/custom-grid-lv95.json" # -- tile source provider configuration -- @@ -140,4 +140,4 @@ params = "transparent=true" [[tileserver.tileset]] name = "mbtiles_mvt_fl" -mbtiles = { path = "../data/liechtenstein.mbtiles" } +mbtiles = { path = "../assets/liechtenstein.mbtiles" } diff --git a/docker/bbox/Makefile b/docker/bbox/Makefile index 51f7576b..94dc74ee 100644 --- a/docker/bbox/Makefile +++ b/docker/bbox/Makefile @@ -16,8 +16,8 @@ down: docker compose --profile $(profile) down loaddb: - #docker compose --profile processes run windmill_worker ogr2ogr -f PostgreSQL PG:'host=postgresql user=geodb password=$$PG_PASS dbname=geodb' /data/ne_extracts.gpkg - docker compose --profile processes run windmill_worker ogr2ogr -f PostgreSQL PG:"host=postgresql user=geodb dbname=geodb" /data/ne_extracts.gpkg + #docker compose --profile processes run windmill_worker ogr2ogr -f PostgreSQL PG:'host=postgresql user=geodb password=$$PG_PASS dbname=geodb' /assets/ne_extracts.gpkg + docker compose --profile processes run windmill_worker ogr2ogr -f PostgreSQL PG:"host=postgresql user=geodb dbname=geodb" /assets/ne_extracts.gpkg resetdb: docker stop bbox_postgresql_1 diff --git a/docker/bbox/docker-compose.yml b/docker/bbox/docker-compose.yml index 28c0f13c..63181b26 100644 --- a/docker/bbox/docker-compose.yml +++ b/docker/bbox/docker-compose.yml @@ -9,7 +9,7 @@ services: # - PGPASSWORD=$PG_PASS volumes: - ./bbox-full.toml:/var/www/bbox.toml:ro - - ../../data:/data + - ../../assets:/assets - ../../plugins:/var/www/plugins:ro postgresql: diff --git a/templates/maplibre.html b/templates/maplibre.html index 08fec56a..922bf30c 100644 --- a/templates/maplibre.html +++ b/templates/maplibre.html @@ -12,7 +12,7 @@