Skip to content

Commit 0e91363

Browse files
authored
Merge pull request #157 from GeoinformationSystems/features/feeds_oceans_continents
2 parents 0e1809c + 6b16f9c commit 0e91363

File tree

18 files changed

+791
-16
lines changed

18 files changed

+791
-16
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,7 @@ publications/static/OPTIMAP_Data-Privacy-Concept.docx
145145
certbot/conf/
146146

147147
certbot/www/
148+
149+
publications/management/commands/marine_regions_iho.geojson
150+
151+
publications/management/commands/world_continents.geojson

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ python manage.py dumpdata --exclude=auth --exclude=contenttypes | jq > fixtures/
8383
To load the test data into your database, run the following command choosing one of the existing fixtures:
8484

8585
```bash
86-
python manage.py loaddata fixtures/test_data{optimap, partners}.json
86+
python manage.py loaddata fixtures/test_data_{optimap, partners, global_feeds}.json
8787
```
8888

8989
#### Adding New Test Data
@@ -141,6 +141,9 @@ python manage.py collectstatic --noinput
141141
# If you need to run tasks (harvesting, data export) then start a cluster in a separate shell
142142
python manage.py qcluster
143143

144+
# If you want to use the predefined feeds for continents and oceans we need to load the geometries for global regions
145+
python manage.py load_global_regions
146+
144147
# Start the Django development server
145148
python manage.py runserver
146149

etc/manage-and-run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ python manage.py createcachetable
1313
echo "OPTIMAP ENTRYPOINT | Apply database migrations"
1414
python manage.py migrate
1515

16+
# Load regions data
17+
echo "OPTIMAP ENTRYPOINT | Load global regions data"
18+
python manage.py load_global_regions
19+
1620
# Start server
1721
echo "OPTIMAP ENTRYPOINT | Starting server"
1822
# make the next process the main process, cf. https://www.baeldung.com/ops/docker-exec-process-replacement

0 commit comments

Comments
 (0)