Rename data directory to assets

bbox-services · Jun 23, 2023 · 87c8e5e · 87c8e5e
1 parent 34ccfb4
commit 87c8e5e
Show file tree

Hide file tree

Showing 26 changed files with 36 additions and 38 deletions.
diff --git a/data/.gitignore → assets/.gitignore b/data/.gitignore → assets/.gitignore
@@ -1,2 +1,3 @@
 /download
+/maputnik
 /*.bin
diff --git a/data/Makefile → assets/Makefile b/data/Makefile → assets/Makefile
diff --git a/data/custom-grid-lv95.json → assets/custom-grid-lv95.json b/data/custom-grid-lv95.json → assets/custom-grid-lv95.json
diff --git a/data/helloworld.db → assets/helloworld.db b/data/helloworld.db → assets/helloworld.db
diff --git a/data/helloworld.qgs → assets/helloworld.qgs b/data/helloworld.qgs → assets/helloworld.qgs
diff --git a/data/liechtenstein.mbtiles → assets/liechtenstein.mbtiles b/data/liechtenstein.mbtiles → assets/liechtenstein.mbtiles
diff --git a/data/maplibre.html → assets/maplibre.html b/data/maplibre.html → assets/maplibre.html
diff --git a/data/mbtiles_mvt_fl-style.json → assets/mbtiles_mvt_fl-style.json b/data/mbtiles_mvt_fl-style.json → assets/mbtiles_mvt_fl-style.json
diff --git a/data/mvtbench.gpkg → assets/mvtbench.gpkg b/data/mvtbench.gpkg → assets/mvtbench.gpkg
diff --git a/data/ne.map → assets/ne.map b/data/ne.map → assets/ne.map
diff --git a/data/ne.qgs → assets/ne.qgs b/data/ne.qgs → assets/ne.qgs
diff --git a/data/ne_extracts.gpkg → assets/ne_extracts.gpkg b/data/ne_extracts.gpkg → assets/ne_extracts.gpkg
diff --git a/data/ne_extracts.qgz → assets/ne_extracts.qgz b/data/ne_extracts.qgz → assets/ne_extracts.qgz
diff --git a/data/railway-test.gpkg → assets/railway-test.gpkg b/data/railway-test.gpkg → assets/railway-test.gpkg
diff --git a/data/usergrid.html → assets/usergrid.html b/data/usergrid.html → assets/usergrid.html
diff --git 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
@@ -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
@@ -174,8 +174,7 @@ mod test {
 
     #[test]
     fn umn() {
-        let s = r##"
-<?xml version='1.0' encoding="UTF-8" standalone="no" ?>
+        let s = r##"<?xml version='1.0' encoding="UTF-8" standalone="no" ?>
 <WMS_Capabilities version="1.3.0"  xmlns="http://www.opengis.net/wms"   xmlns:sld="http://www.opengis.net/sld"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd  http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd  http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/mapserv?service=WMS&amp;version=1.3.0&amp;request=GetSchemaExtension">
 
 <!-- MapServer version 7.4.3 OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=CAIRO SUPPORTS=SVG_SYMBOLS SUPPORTS=RSVG SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS SUPPORTS=PBF INPUT=JPEG INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
@@ -338,8 +337,7 @@ mod test {
 
     #[test]
     fn qgis() {
-        let s = r##"
-<?xml version="1.0" encoding="utf-8"?>
+        let s = r##"<?xml version="1.0" encoding="utf-8"?>
 <WMS_Capabilities xmlns:sld="http://www.opengis.net/sld" version="1.3.0" xmlns="http://www.opengis.net/wms" xmlns:qgs="http://www.qgis.org/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd http://www.qgis.org/wms http://127.0.0.1:8080/wms/qgs/ne?SERVICE=WMS&amp;REQUEST=GetSchemaExtension">
  <Service>
   <Name>WMS</Name>
@@ -641,8 +639,7 @@ mod test {
 
     #[test]
     fn qgis_getprojectsettings() {
-        let s = r##"
-<?xml version="1.0" encoding="utf-8"?>
+        let s = r##"<?xml version="1.0" encoding="utf-8"?>
 <WMS_Capabilities xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd http://www.qgis.org/wms http://127.0.0.1:8080/wms/qgs/ne?SERVICE=WMS&amp;REQUEST=GetSchemaExtension" xmlns="http://www.opengis.net/wms" xmlns:sld="http://www.opengis.net/sld" version="1.3.0" xmlns:qgs="http://www.qgis.org/wms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <Service>
   <Name>WMS</Name>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,7 @@
   <script>
   var map = new maplibregl.Map({
     container: 'map',
-    style: 'http://localhost:8080/data/{{ param }}-style.json',
+    style: 'http://localhost:8080/assets/{{ param }}-style.json',
     center: [9.5076, 47.0944],
     zoom: 11
   });