Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
062b432
Added the flow for feeds of continents and oceans
uxairibrar May 26, 2025
f646ca1
Adding test data for publication
uxairibrar May 29, 2025
e1301a2
Added different formats
uxairibrar May 31, 2025
863b3e6
Merge remote-tracking branch 'origin/main' into features/feeds_oceans…
uxairibrar May 31, 2025
a88deeb
Updated PR Issues
uxairibrar Jun 23, 2025
1be5672
Merge remote-tracking branch 'origin/main' into features/feeds_oceans…
uxairibrar Jun 23, 2025
95d1829
Merge conflicting 0003 migrations in publications
uxairibrar Jun 23, 2025
9598446
Updated the Readme
uxairibrar Jun 23, 2025
cd9ca95
Add comment about manualy data source closing
nuest Jun 24, 2025
dab5e56
Discard changes to publications/templates/footer.html
nuest Jun 24, 2025
d2b1b30
Re-add feeds without formatting to footer.html
nuest Jun 24, 2025
4feeae1
Remove formatting only changes
nuest Jun 24, 2025
ca2d1af
Updated URL and Test File
uxairibrar Jul 7, 2025
e7c70ef
Updated Path
uxairibrar Jul 7, 2025
6615e70
Merge branch 'main' into features/feeds_oceans_continents
nuest Jul 8, 2025
a95043e
reset migrations and update fixture
nuest Jul 8, 2025
2ce23d6
reformat feeds HTML page
nuest Jul 8, 2025
50b47df
include load_global_regions in README and only download unless existing
nuest Jul 8, 2025
a5ff73a
remove unused import
nuest Jul 8, 2025
f930f0c
rename test file and add fix most tests for feeds
nuest Jul 8, 2025
f59ea74
add admin UI for GlobalRegions
nuest Jul 8, 2025
1416e16
ignore cached global region geometries file
nuest Jul 8, 2025
6b16f9c
Resolved Global_Feeds Issue
uxairibrar Jul 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,7 @@ publications/static/OPTIMAP_Data-Privacy-Concept.docx
certbot/conf/

certbot/www/

publications/management/commands/marine_regions_iho.geojson

publications/management/commands/world_continents.geojson
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ python manage.py dumpdata --exclude=auth --exclude=contenttypes | jq > fixtures/
To load the test data into your database, run the following command choosing one of the existing fixtures:

```bash
python manage.py loaddata fixtures/test_data{optimap, partners}.json
python manage.py loaddata fixtures/test_data_{optimap, partners, global_feeds}.json
```

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

# If you want to use the predefined feeds for continents and oceans we need to load the geometries for global regions
python manage.py load_global_regions

# Start the Django development server
python manage.py runserver

Expand Down
4 changes: 4 additions & 0 deletions etc/manage-and-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ python manage.py createcachetable
echo "OPTIMAP ENTRYPOINT | Apply database migrations"
python manage.py migrate

# Load regions data
echo "OPTIMAP ENTRYPOINT | Load global regions data"
python manage.py load_global_regions

# Start server
echo "OPTIMAP ENTRYPOINT | Starting server"
# make the next process the main process, cf. https://www.baeldung.com/ops/docker-exec-process-replacement
Expand Down
Loading