Skip to content

Commit 62ee749

Browse files
submarcossubmarcos
authored
Merge branch 'master' into drop_ubuntu_20.04
2 parents c32985d + 6d42781 commit 62ee749

File tree

37 files changed

+214
-87
lines changed

37 files changed

+214
-87
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v6
5656
if: github.event.pull_request.head.repo.full_name != github.repository
57-
with:
58-
ref: ${{ github.head_ref }}
5957

6058
- uses: actions/checkout@v6
6159
if: github.event.pull_request.head.repo.full_name == github.repository
@@ -102,4 +100,4 @@ jobs:
102100
with:
103101
# Optional. Commit message for the created commit.
104102
# Defaults to "Apply automatic changes"
105-
commit_message: "Fix translation files"
103+
commit_message: "Fix translation files"

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
./venv/bin/coverage xml -o coverage.xml
150150
151151
- name: Save coverage
152-
uses: actions/upload-artifact@v5
152+
uses: actions/upload-artifact@v6
153153
with:
154154
name: coverage_${{ matrix.os }}_${{ matrix.tests-env }}
155155
path: coverage.xml
@@ -169,7 +169,7 @@ jobs:
169169

170170
steps:
171171
- uses: actions/checkout@v6
172-
- uses: actions/download-artifact@v6
172+
- uses: actions/download-artifact@v7
173173
with:
174174
name: coverage_${{ matrix.os }}_${{ matrix.tests-env }}
175175
path: .
@@ -236,7 +236,7 @@ jobs:
236236
cp ./dpkg/*.deb /home/runner/work/Geotrek-admin/
237237
238238
- name: Archive package artifact
239-
uses: actions/upload-artifact@v5
239+
uses: actions/upload-artifact@v6
240240
with:
241241
name: ${{ matrix.os }}
242242
path: |
@@ -317,7 +317,7 @@ jobs:
317317
continue-on-error: false
318318

319319
- name: Archive results as artifacts
320-
uses: actions/upload-artifact@v5
320+
uses: actions/upload-artifact@v6
321321
with:
322322
name: cypress-docker
323323
path: |
@@ -355,7 +355,7 @@ jobs:
355355
356356
steps:
357357
- uses: actions/checkout@v6
358-
- uses: actions/download-artifact@v6
358+
- uses: actions/download-artifact@v7
359359
with:
360360
name: ${{ matrix.os }}
361361

@@ -406,7 +406,7 @@ jobs:
406406
continue-on-error: false
407407

408408
- name: Archive results as artifacts
409-
uses: actions/upload-artifact@v5
409+
uses: actions/upload-artifact@v6
410410
with:
411411
name: cypress-${{ matrix.code }}
412412
path: |
@@ -423,13 +423,13 @@ jobs:
423423

424424
- name: Download 22.04 debian artifact
425425
if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
426-
uses: actions/download-artifact@v6
426+
uses: actions/download-artifact@v7
427427
with:
428428
name: jammy
429429

430430
- name: Download 24.04 debian artifact
431431
if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
432-
uses: actions/download-artifact@v6
432+
uses: actions/download-artifact@v7
433433
with:
434434
name: noble
435435

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.121.1+dev
1+
2.121.2+dev

‎debian/changelog‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
geotrek-admin (2.121.1+dev) UNRELEASED; urgency=medium
1+
geotrek-admin (2.121.2+dev) UNRELEASED; urgency=medium
22

33
* Merging improvements
44

5-
-- Geotrek Team <[email protected]> Mon, 17 Nov 2025 15:31:36 +0000
5+
-- Geotrek Team <[email protected]> Tue, 16 Dec 2025 10:05:48 +0000
6+
7+
geotrek-admin (2.121.2) RELEASED; urgency=medium
8+
9+
* Merging improvements
10+
* New package release
11+
12+
-- Geotrek Team <[email protected]> Tue, 16 Dec 2025 10:05:41 +0000
613

714
geotrek-admin (2.121.1) RELEASED; urgency=medium
815

‎docs/changelog.rst‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22
CHANGELOG
33
=========
44

5-
2.121.1+dev (XXXX-XX-XX)
5+
2.121.2+dev (XXXX-XX-XX)
66
----------------------------
77

88
**Breaking changes**
99

1010
* Ubuntu focal 20.04 debian package is not supported anymore. Please update or migrate your server to Ubuntu 24.04.
1111

1212

13+
2.121.2 (2025-12-16)
14+
----------------------------
15+
16+
**Bug fixes**
17+
18+
* Fix ``label_en`` content on sensitivity module parser
19+
* Fix restricted area geojson that are not different by type in cache (#5136)
20+
1321
2.121.1 (2025-11-17)
1422
----------------------------
1523

‎docs/import-data/development.rst‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,45 @@ Execution flow diagram
8484
Configurable built-in parsers
8585
=============================
8686

87+
Existing parsers
88+
-----------------
89+
90+
Several default parsers are available in Geotrek.
91+
They are more or less generic scripts designed to save time when creating data mappings.
92+
Below is the list of these scripts for each touristic information system:
93+
94+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
95+
| | Apidae | Tourinsoft | Cirkwi | Lei | Esprit Parc | Openstreetmap |
96+
+==========================+==========+==============+==========+======+===============+===============+
97+
| Touristic content | x | x | x | x | x | x |
98+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
99+
| Touristic event | x | x | | x | | |
100+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
101+
| Information desk | x | | | | | x |
102+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
103+
| Infrastructure | x | | | | | x |
104+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
105+
| Services | x | | | | | |
106+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
107+
| POI | x | | | | | x |
108+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
109+
| Trek * | x | | x | | | |
110+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
111+
| District | | | | | | x |
112+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
113+
| City | | | | | | x |
114+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
115+
| Restricted area | | | | | | x |
116+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
117+
| Signage | | | | | | x |
118+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
119+
| Outdoor site | | | | | | x |
120+
+--------------------------+----------+--------------+----------+------+---------------+---------------+
121+
122+
\* Geometry is only available without dynamic segmentation.
123+
It is not possible to import geometries for treks in a database using dynamic segmentation.
124+
125+
87126
.. _apidae-parsers:
88127

89128
APIDAE

‎docs/requirements.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ colorama==0.4.6
3131
# via sphinx-autobuild
3232
docutils==0.21.2
3333
# via sphinx
34-
exceptiongroup==1.3.0
35-
# via anyio
34+
exceptiongroup==1.3.1
35+
# via
36+
# -c ../requirements.txt
37+
# anyio
3638
h11==0.16.0
3739
# via uvicorn
3840
idna==3.11
@@ -120,7 +122,7 @@ typing-extensions==4.15.0
120122
# uvicorn
121123
typing-inspection==0.4.2
122124
# via pydantic
123-
urllib3==2.5.0
125+
urllib3==2.6.2
124126
# via
125127
# -c ../requirements.txt
126128
# requests

‎docs/user-manual/touristic-modules.rst‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Itinéraires
1111

1212
..
1313
14-
Les itinéraires sont des randonnées présentés au grand public : l’itinéraire est défini selon la géométrie des tronçons empruntés.
14+
Les itinéraires sont des randonnées présentées au grand public : l’itinéraire est défini selon la géométrie des tronçons empruntés.
1515
L’ajout ou la modification sont fréquents.
1616

1717
Fiche détaillée
@@ -430,6 +430,25 @@ Services
430430
Contenus touristiques
431431
=====================
432432

433+
Les contenus touristiques sont des lieux accessibles sans date préétablie, par exemple un hôtel,
434+
une auberge, un producteur artisanal, etc. Ils sont filtrables directement depuis la liste des
435+
éléments géographiques et sont identifiés dans Geotrek-Rando comme des « services ».
436+
437+
Les contenus touristiques contiennent de multiples champs, mais il existe trois champs
438+
permettant de filtrer sur le contenu :
439+
440+
- **Categorie**
441+
- **Type 1** (sous-type 1)
442+
- **Type 2** (sous-type 2)
443+
444+
Le Type 1 et le Type 2 sont dépendants de la catégorie.
445+
Par exemple, pour une catégorie « Hébergement », on peut avoir :
446+
447+
- une sous-catégorie *Type 1* : « Type d’hébergement »
448+
(contenant des valeurs comme *Camping*, *Hébergement collectif*, *Hôtel*, *Gîte*, etc.)
449+
- une sous-catégorie *Type 2* : « Label »
450+
(indiquant par exemple des appartenances à des réseaux, ou des niveaux comme des étoiles)
451+
433452
Zone tampon pour contenus à proximité
434453
----------------------------------------
435454

@@ -444,6 +463,8 @@ La taille de la zone tampon est fixée à 500m autour de l'itinéraire pour remo
444463
Évènements touristiques
445464
=======================
446465

466+
Les événements touristiques sont des lieux ou des événements accessibles avec date préétablie, par exemple, une randonnée accompagnée.
467+
447468
.. _signalements:
448469

449470
Signalements

‎geotrek/core/locale/fr/LC_MESSAGES/django.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-10-23 11:11+0200\n"
11-
"PO-Revision-Date: 2025-10-22 09:00+0000\n"
12-
"Last-Translator: Emmanuelle Helly <emmanuelle.helly@makina-corpus.com>\n"
10+
"POT-Creation-Date: 2025-09-23 12:05+0200\n"
11+
"PO-Revision-Date: 2025-10-10 18:37+0000\n"
12+
"Last-Translator: J-E Castagnede <jean-etienne.castagnede@makina-corpus.com>\n"
1313
"Language-Team: French <https://weblate.makina-corpus.net/projects/geotrek-admin/core/fr/>\n"
1414
"Language: fr\n"
1515
"MIME-Version: 1.0\n"

‎geotrek/diving/locale/fr/LC_MESSAGES/django.po‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-10-23 11:11+0200\n"
11-
"PO-Revision-Date: 2025-10-22 09:00+0000\n"
12-
"Last-Translator: Emmanuelle Helly <emmanuelle.helly@makina-corpus.com>\n"
10+
"POT-Creation-Date: 2025-01-30 13:53+0000\n"
11+
"PO-Revision-Date: 2025-10-10 18:37+0000\n"
12+
"Last-Translator: J-E Castagnede <jean-etienne.castagnede@makina-corpus.com>\n"
1313
"Language-Team: French <https://weblate.makina-corpus.net/projects/geotrek-admin/diving/fr/>\n"
1414
"Language: fr\n"
1515
"MIME-Version: 1.0\n"

0 commit comments

Comments
 (0)