Skip to content

Commit

Permalink
Merge pull request #3298 from GeotrekCE/dev_verticality
Browse files Browse the repository at this point in the history
✨  Handle HD point of view images for Treks, Sites and POIs
  • Loading branch information
Chatewgne committed Jan 31, 2023
2 parents 2d6b622 + 9fe81ad commit 781bb42
Show file tree
Hide file tree
Showing 165 changed files with 2,817 additions and 273 deletions.
2 changes: 1 addition & 1 deletion conf/nginx.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ server {
access_log /var/log/nginx/geotrek_access.log;
error_log /var/log/nginx/geotrek_error.log;

client_max_body_size 10M;
client_max_body_size 200M;

location /static {
expires 1d;
Expand Down
13 changes: 11 additions & 2 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ CHANGELOG
2.95.0+dev (XXXX-XX-XX)
-----------------------

**Minor improvements**
**New feature**

- APIDAE Trek Parser output now shows APIDAE IDs of entities triggering warnings during import
- Handle very high resolution images (HD Views) that will automatically be tiled, for ``Trek``, ``POI`` and ``Site`` (#3378)
- Handle annotations on HD Views (points, lines, polygons and text)

**Improvements**

- APIDAE Trek Parser output now shows APIDAE IDs of entities triggering warnings during import
- Update maximum request size in Nginx from 10M to 200M to allow uploading HD pictures (#3378)

**Bug fixes**

Expand All @@ -25,6 +30,10 @@ CHANGELOG
- Dependency graph is now checked in CI (see docs/contribute/development to how add a new dependency).
- New git pre-commit hook to check all is alright before commit (see docs/contribute/development).

**Warning**

- The default Nginx configuration template has been improved (https://github.com/GeotrekCE/Geotrek-admin/pull/3298/commits/f9c72d95c1fd7eee2dee26dc73a5927966a812bf) to allow uploading big images. It is highly recommanded to apply changes to your Nginx configuration template (in /opt/geotrek-admin/var/conf/nginx.conf.in).


2.95.0 (2023-01-24)
-----------------------
Expand Down
2 changes: 1 addition & 1 deletion geotrek/altimetry/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion geotrek/altimetry/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion geotrek/altimetry/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion geotrek/altimetry/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: 2015-10-06 12:11+0100\n"
"Language-Team: \n"
"Language: fr\n"
Expand Down
2 changes: 1 addition & 1 deletion geotrek/altimetry/locale/it/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion geotrek/altimetry/locale/nl/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
10 changes: 5 additions & 5 deletions geotrek/api/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -230,7 +230,7 @@ msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas related to this "
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
msgstr ""

Expand Down Expand Up @@ -338,13 +338,13 @@ msgstr ""
msgid "Filter by one or more category id, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on cancelled boolean : true/false expected"
msgid "Filter events on bookable boolean : true/false expected"
msgstr ""

msgid "Filter by one or more Place id, comma-separated."
msgid "Filter events on cancelled boolean : true/false expected"
msgstr ""

msgid "Dates before"
Expand Down
10 changes: 5 additions & 5 deletions geotrek/api/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -230,7 +230,7 @@ msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas related to this "
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
msgstr ""

Expand Down Expand Up @@ -338,13 +338,13 @@ msgstr ""
msgid "Filter by one or more category id, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on cancelled boolean : true/false expected"
msgid "Filter events on bookable boolean : true/false expected"
msgstr ""

msgid "Filter by one or more Place id, comma-separated."
msgid "Filter events on cancelled boolean : true/false expected"
msgstr ""

msgid "Dates before"
Expand Down
10 changes: 5 additions & 5 deletions geotrek/api/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -230,7 +230,7 @@ msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas related to this "
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
msgstr ""

Expand Down Expand Up @@ -338,13 +338,13 @@ msgstr ""
msgid "Filter by one or more category id, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on cancelled boolean : true/false expected"
msgid "Filter events on bookable boolean : true/false expected"
msgstr ""

msgid "Filter by one or more Place id, comma-separated."
msgid "Filter events on cancelled boolean : true/false expected"
msgstr ""

msgid "Dates before"
Expand Down
19 changes: 12 additions & 7 deletions geotrek/api/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: 2020-10-20 16:33+0000\n"
"Last-Translator: Bastien Potiron <[email protected]>\n"
"Language-Team: French <https://weblate.makina-corpus.net/projects/geotrek-"
Expand Down Expand Up @@ -243,7 +243,7 @@ msgid "Trek"
msgstr "Itinéraire"

msgid ""
"Filter by a trek id. It will show only the sensitive areas related to this "
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
msgstr ""
"Filtrer par l'id d'un itinéraire. Le filtre n'affichera que les zones "
Expand Down Expand Up @@ -374,15 +374,16 @@ msgstr "Catégories"
msgid "Filter by one or more category id, comma-separated."
msgstr "Filtrer par un ou plusieurs id de catégorie, séparés par des virgules."

msgid "Filter by one or more Place id, comma-separated."
msgstr ""
"Filtrer par un ou plusieurs id de lieu d'évènement, séparés par des virgules."

msgid "Filter events on bookable boolean : true/false expected"
msgstr "Filtre les évènements réservables : true/false attendu"

msgid "Filter events on cancelled boolean : true/false expected"
msgstr "Filtre sur les évènements annulés : true/false attendu"

msgid "Filter by one or more Place id, comma-separated."
msgstr "Filtrer par un ou plusieurs id de lieu d'évènement, séparés par des virgules."

msgid "Dates before"
msgstr ""

Expand Down Expand Up @@ -616,9 +617,13 @@ msgstr "Données altimétriques non disponibles"
msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'start_time'"
msgstr "Ce champ est déprécié et sera retiré dans de prochaines releases, merci d'utiliser 'start_time' à la place."
msgstr ""
"Ce champ est déprécié et sera retiré dans de prochaines releases, merci "
"d'utiliser 'start_time' à la place."

msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'capacity'"
msgstr "Ce champ est déprécié et sera retiré dans de prochaines releases, merci d'utiliser 'capacity' à la place."
msgstr ""
"Ce champ est déprécié et sera retiré dans de prochaines releases, merci "
"d'utiliser 'capacity' à la place."
10 changes: 5 additions & 5 deletions geotrek/api/locale/it/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -230,7 +230,7 @@ msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas related to this "
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
msgstr ""

Expand Down Expand Up @@ -338,13 +338,13 @@ msgstr ""
msgid "Filter by one or more category id, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on cancelled boolean : true/false expected"
msgid "Filter events on bookable boolean : true/false expected"
msgstr ""

msgid "Filter by one or more Place id, comma-separated."
msgid "Filter events on cancelled boolean : true/false expected"
msgstr ""

msgid "Dates before"
Expand Down
10 changes: 5 additions & 5 deletions geotrek/api/locale/nl/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-03 13:51+0000\n"
"POT-Creation-Date: 2022-12-16 09:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -230,7 +230,7 @@ msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas related to this "
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
msgstr ""

Expand Down Expand Up @@ -338,13 +338,13 @@ msgstr ""
msgid "Filter by one or more category id, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on cancelled boolean : true/false expected"
msgid "Filter events on bookable boolean : true/false expected"
msgstr ""

msgid "Filter by one or more Place id, comma-separated."
msgid "Filter events on cancelled boolean : true/false expected"
msgstr ""

msgid "Dates before"
Expand Down
Loading

0 comments on commit 781bb42

Please sign in to comment.