Skip to content

Commit

Permalink
Merge branch 'master' into canvas-renderer
Browse files Browse the repository at this point in the history
  • Loading branch information
mthh committed Jan 22, 2025
2 parents b527b7e + 6c0032b commit e174f0c
Show file tree
Hide file tree
Showing 34 changed files with 2,908 additions and 1,169 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"rules": {
"@typescript-eslint/no-unused-vars": ["warn"],
"@typescript-eslint/no-explicit-any": ["warn"],
"solid/self-closing-comp": 0,
"linebreak-style": 0
},
"parserOptions": {
Expand Down
2 changes: 1 addition & 1 deletion docs/application-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Cette option est disponible dans la barre de menu de l'application, en haut à d

Il est possible de choisir entre plusieurs langues pour l'interface de l'application.

Actuellement seuls le français et l'anglais sont disponibles, mais d'autres langues pourront être ajoutées à l'avenir.
Actuellement seuls le français, l'anglais et l'espagnol sont disponibles, mais d'autres langues pourront être ajoutées à l'avenir.

Cette option est disponible dans la barre de menu de l'application, en haut à droite de l'écran.

Expand Down
12 changes: 12 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ Magrit ne suit pas strictement les règles du *semantic versioning* (versionneme

:::

#### 2.2.1 (2025-01-20)

- Ajout de projections de d3-geo qui étaient manquantes (Conic Conformal, Conic Equal-Area, Conic Equidistant, Gnomonic, Transverse Mercator).

- Améliore le composant permettant de choisir les parallèles standards pour les projections supportant ce paramètre.

- Corrige le redessin de la carte lorsque le(s) parallèle(s) standard(s) sont modifiés.

#### 2.2.0 (2025-01-06)

- Nouveau : Ajout de la traduction de l'interface en espagnol (merci à [@cvbrandoe](https://github.com/cvbrandoe)).

#### 2.1.3 (2024-12-18)

- Corrige le rendu des cartes catégorielles de pictogrammes pour les entités sans valeur
Expand Down
2 changes: 1 addition & 1 deletion docs/en/application-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This option is available in the application menu bar, at the top right of the sc

It is possible to choose between several languages for the application interface.

Currently only French and English are available, but other languages may be added in the future.
Currently only French, English and Spanish are available, but other languages may be added in the future.

This option is available in the application menu bar, at the top right of the screen.

Expand Down
12 changes: 12 additions & 0 deletions docs/en/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@ Magrit does not strictly follow the rules of *semantic versioning* (in the form

:::

#### 2.2.1 (2025-01-20)

- Add some d3-geo projections that were missing (Conic Conformal, Conic Equal-Area, Conic Equidistant, Gnomonic, Transverse Mercator).

- Improve the component for defining standard parallels for projection that support this parameter.

- Fix the redrawing of the map (wasn't happening) when changing the standard parallel(s) of a projection.

#### 2.2.0 (2025-01-06)

- New: Add the translation of the interface in Spanish (thanks to [@cvbrandoe](https://github.com/cvbrandoe)).

#### 2.1.3 (2024-12-18)

- Fix the rendering of categorical pictogram maps for features with no value
Expand Down
5 changes: 4 additions & 1 deletion docs/en/team.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,8 @@ Magrit is designed and developed within the UAR RIATE (CNRS / Université Paris

<VPTeamMembers size="small" :members="contributors" />

The application was translated into Spanish by <a href="https://github.com/cvbrandoe">Carmen Brando</a> (École des Hautes Études en Sciences Sociales).

Occasional contributions were also made by various users: RIATE members (or former members), ESR members and users.
We thank them for their involvement and support :heart:.

We thank them for their involvement and support :heart:
5 changes: 4 additions & 1 deletion docs/team.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ Magrit est conçu et développé au sein de l'UAR RIATE (CNRS / Université Pari

<VPTeamMembers size="small" :members="contributors" />

La traduction de l'application en espagnol a été réalisée par <a href="https://github.com/cvbrandoe">Carmen Brando</a> (École des Hautes Études en Sciences Sociales).

Des contributions ponctuelles ont également été réalisées par différents utilisateurs :
des membres (ou anciens membres) de l'UAR RIATE, des membres de l'ESR et des utilisateurs.
Nous les remercions pour leur implication et leur soutien :heart:.

Nous les remercions pour leur implication et leur soutien :heart:
Loading

0 comments on commit e174f0c

Please sign in to comment.