From 687ead8ee7711e41e5111803b6eb93222ef555d3 Mon Sep 17 00:00:00 2001 From: Jacob Bijsterbosch Date: Thu, 2 Jul 2026 21:52:30 +0200 Subject: [PATCH] Create new example new example database The Monitor is the location where the new nature and grid database should be generated. The previous example database was therefore misleading and caused confusion. --- .../src/data/sql/build_and_store.sql | 13 ------------- .../src/data/sql/load_dataset_24.sql | 2 -- .../{build-nature-and-grid => example}/README.md | 2 +- .../{build-nature-and-grid => example}/settings.rb | 2 +- .../src/build/config/.gitignore | 0 .../src/build/config/AeriusSettings.rb | 0 .../src/build/scripts/default.rb | 0 .../src/build/scripts/test_structure.rb | 0 .../src/data/sql/load.rb | 3 +-- .../example/src/data/sql/load_dataset_25.sql | 11 +++++++++++ .../src/main/sql/structure.sql | 11 ----------- 11 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 source/database/build-nature-and-grid/src/data/sql/build_and_store.sql delete mode 100644 source/database/build-nature-and-grid/src/data/sql/load_dataset_24.sql rename source/database/{build-nature-and-grid => example}/README.md (87%) rename source/database/{build-nature-and-grid => example}/settings.rb (92%) rename source/database/{build-nature-and-grid => example}/src/build/config/.gitignore (100%) rename source/database/{build-nature-and-grid => example}/src/build/config/AeriusSettings.rb (100%) rename source/database/{build-nature-and-grid => example}/src/build/scripts/default.rb (100%) rename source/database/{build-nature-and-grid => example}/src/build/scripts/test_structure.rb (100%) rename source/database/{build-nature-and-grid => example}/src/data/sql/load.rb (79%) create mode 100644 source/database/example/src/data/sql/load_dataset_25.sql rename source/database/{build-nature-and-grid => example}/src/main/sql/structure.sql (55%) diff --git a/source/database/build-nature-and-grid/src/data/sql/build_and_store.sql b/source/database/build-nature-and-grid/src/data/sql/build_and_store.sql deleted file mode 100644 index 5a7f701..0000000 --- a/source/database/build-nature-and-grid/src/data/sql/build_and_store.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Nature - Habitats and Species -{import_common_into_schema 'database-modules/build_nature/build.sql', 'nature'} -{import_common_into_schema 'database-modules/build_nature/store.sql', 'nature'} - - --- Grid - Receptors and hexagons -{import_common_into_schema 'database-modules/build_grid/load.sql', 'grid'} -{import_common_into_schema 'database-modules/build_grid/build.sql', 'grid'} -{import_common_into_schema 'database-modules/build_grid/store.sql', 'grid'} - --- Grid - Receptors-to -{import_common_into_schema 'database-modules/build_grid_receptors_to/build-single-zoom-level.sql', 'grid'} -{import_common_into_schema 'database-modules/build_grid_receptors_to/store.sql', 'grid'} diff --git a/source/database/build-nature-and-grid/src/data/sql/load_dataset_24.sql b/source/database/build-nature-and-grid/src/data/sql/load_dataset_24.sql deleted file mode 100644 index ba1fa55..0000000 --- a/source/database/build-nature-and-grid/src/data/sql/load_dataset_24.sql +++ /dev/null @@ -1,2 +0,0 @@ -{import_common_into_schema 'database-modules/nature_areas/dataset_24.sql', 'nature'} -{import_common_into_schema 'database-modules/nature_habitats_and_species/supplied_24.sql', 'nature'} diff --git a/source/database/build-nature-and-grid/README.md b/source/database/example/README.md similarity index 87% rename from source/database/build-nature-and-grid/README.md rename to source/database/example/README.md index a7a0f02..820f922 100644 --- a/source/database/build-nature-and-grid/README.md +++ b/source/database/example/README.md @@ -1,6 +1,6 @@ # Nature and grid build database -This database is a demo how to use the common modules and generate the Nature and Grid related dbdata files. +This database is a demo how to use the common modules and load the Nature and Grid related dbdata files. ## Commands diff --git a/source/database/build-nature-and-grid/settings.rb b/source/database/example/settings.rb similarity index 92% rename from source/database/build-nature-and-grid/settings.rb rename to source/database/example/settings.rb index 37fda66..d5ee7a9 100644 --- a/source/database/build-nature-and-grid/settings.rb +++ b/source/database/example/settings.rb @@ -2,7 +2,7 @@ # Product specific database build settings. # -$product = :"build-nature-and-grid" # The product these settings are for. +$product = :"example" # The product these settings are for. #------------------------------------- diff --git a/source/database/build-nature-and-grid/src/build/config/.gitignore b/source/database/example/src/build/config/.gitignore similarity index 100% rename from source/database/build-nature-and-grid/src/build/config/.gitignore rename to source/database/example/src/build/config/.gitignore diff --git a/source/database/build-nature-and-grid/src/build/config/AeriusSettings.rb b/source/database/example/src/build/config/AeriusSettings.rb similarity index 100% rename from source/database/build-nature-and-grid/src/build/config/AeriusSettings.rb rename to source/database/example/src/build/config/AeriusSettings.rb diff --git a/source/database/build-nature-and-grid/src/build/scripts/default.rb b/source/database/example/src/build/scripts/default.rb similarity index 100% rename from source/database/build-nature-and-grid/src/build/scripts/default.rb rename to source/database/example/src/build/scripts/default.rb diff --git a/source/database/build-nature-and-grid/src/build/scripts/test_structure.rb b/source/database/example/src/build/scripts/test_structure.rb similarity index 100% rename from source/database/build-nature-and-grid/src/build/scripts/test_structure.rb rename to source/database/example/src/build/scripts/test_structure.rb diff --git a/source/database/build-nature-and-grid/src/data/sql/load.rb b/source/database/example/src/data/sql/load.rb similarity index 79% rename from source/database/build-nature-and-grid/src/data/sql/load.rb rename to source/database/example/src/data/sql/load.rb index 1cdba7c..dd78770 100644 --- a/source/database/build-nature-and-grid/src/data/sql/load.rb +++ b/source/database/example/src/data/sql/load.rb @@ -2,8 +2,7 @@ cluster_tables -run_sql "load_dataset_24.sql" -run_sql "build_and_store.sql" +run_sql "load_dataset_25.sql" synchronize_serials diff --git a/source/database/example/src/data/sql/load_dataset_25.sql b/source/database/example/src/data/sql/load_dataset_25.sql new file mode 100644 index 0000000..0538727 --- /dev/null +++ b/source/database/example/src/data/sql/load_dataset_25.sql @@ -0,0 +1,11 @@ +-- +-- Nature +-- +{import_common_into_schema 'database-modules/nature_areas/dataset_25.sql', 'nature'} +{import_common_into_schema 'database-modules/nature_habitats_and_species/supplied_25.sql', 'nature'} + +-- +-- Grid +-- +{import_common_into_schema 'database-modules/grid/dataset_25.sql', 'grid'} +{import_common_into_schema 'database-modules/grid_receptors_to/single-zoom-level/dataset_25.sql', 'grid'} diff --git a/source/database/build-nature-and-grid/src/main/sql/structure.sql b/source/database/example/src/main/sql/structure.sql similarity index 55% rename from source/database/build-nature-and-grid/src/main/sql/structure.sql rename to source/database/example/src/main/sql/structure.sql index 79bfd8b..0d1c90d 100644 --- a/source/database/build-nature-and-grid/src/main/sql/structure.sql +++ b/source/database/example/src/main/sql/structure.sql @@ -12,10 +12,8 @@ CREATE EXTENSION postgis; -- CREATE SCHEMA nature; --- Habitats and species {import_common_into_schema 'database-modules/nature_areas/', 'nature'} {import_common_into_schema 'database-modules/nature_habitats_and_species/', 'nature'} -{import_common_into_schema 'database-modules/build_nature/', 'nature'} -- @@ -23,14 +21,5 @@ CREATE SCHEMA nature; -- CREATE SCHEMA grid; --- Receptors and hexagons {import_common_into_schema 'database-modules/grid/', 'grid'} -{import_common_into_schema 'database-modules/build_grid/', 'grid'} - --- Receptors-to lookup tables {import_common_into_schema 'database-modules/grid_receptors_to/single-zoom-level.sql', 'grid'} -{import_common_into_schema 'database-modules/build_grid_receptors_to/', 'grid'} - --- Update the default RESULT_ZOOM_LEVELS value if desired --- Now set to 3 so the demo builds a bit faster than building the zoom-level 1 grid (the default value) -UPDATE system.constants SET value = 3 WHERE key = 'RESULT_ZOOM_LEVELS';