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';