Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fixture rules of sensitive area #3470 #3721

Merged
merged 4 commits into from
Nov 28, 2023

Conversation

amandine-sahl
Copy link
Contributor

@amandine-sahl amandine-sahl commented Sep 11, 2023

Description

Ajout d'une fixture règle pour les zones sensibles.
Manque les pictogrammes pour les 4 règles suivantes :

  • Accès piéton interdit
  • Accès piéton réglementé
  • Canyoning réglementé
  • Canyoning interdit
  • Stationnement interdit

Related Issue

#3470

Checklist

@codecov
Copy link

codecov bot commented Sep 11, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (1aa50fa) 98.33% compared to head (0ce3391) 98.33%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3721   +/-   ##
=======================================
  Coverage   98.33%   98.33%           
=======================================
  Files         292      292           
  Lines       21792    21792           
=======================================
  Hits        21429    21429           
  Misses        363      363           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cypress
Copy link

cypress bot commented Sep 11, 2023

Passing run #7590 ↗︎

0 24 0 0 Flakiness 0

Details:

Merge 0ce3391 into 1aa50fa...
Project: Geotrek-admin Commit: 72a90f292c ℹ️
Status: Passed Duration: 02:05 💡
Started: Nov 28, 2023 1:41 PM Ended: Nov 28, 2023 1:43 PM

Review all test suite changes for PR #3721 ↗︎

debian/postinst Outdated Show resolved Hide resolved
docs/install/advanced-configuration.rst Outdated Show resolved Hide resolved
docs/changelog.rst Outdated Show resolved Hide resolved
Copy link
Member

@babastienne babastienne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Juste one more line to remove and then it seems good to me

docker/load_data.sh Outdated Show resolved Hide resolved
@amandine-sahl
Copy link
Contributor Author

Pour information quel devrait être le message de mon commit pour répondre correctement à la tache "My commits are all using prefix convention (emoji + tag name) and references associated issues" ?

@camillemonchicourt
Copy link
Member

Pour information quel devrait être le message de mon commit pour répondre correctement à la tache "My commits are all using prefix convention (emoji + tag name) and references associated issues" ?

Normalement les infos sont maintenant sur https://geotrek.readthedocs.io/en/latest/CONTRIBUTING.html#pull-requests

@babastienne
Copy link
Member

@amandine-sahl puisqu'il s'agit d'un improvement je dirais de le formuler au choix parmi les propositions suivantes :

  • 💫 [IMPR] Create fixture with national parks rules for sensitive areas
  • [IMPR] Create fixture with national parks rules for sensitive areas
  • 💫 Create fixture with national parks rules for sensitive areas

Le prefix (émoji et/ou tagname) est là pour identifier en un coup d'oeil le périmètre d'un développement.
Après la formulation c'est évidement un avis personnel, l'idée étant de bien comprendre ce que contient le commit si quelqu'un retombe dessus dans 3 ans.

@babastienne
Copy link
Member

@amandine-sahl il y a un conflit qui nous empêche de merger ta PR. Peux-tu fixer le conflit et me pinger quand c'est fait ? Ensuite de mon côté c'est ok pour merger.

@amandine-sahl
Copy link
Contributor Author

@babastienne le conflit a été résolu

docs/changelog.rst Outdated Show resolved Hide resolved
@Chatewgne Chatewgne merged commit 94eee3c into GeotrekCE:master Nov 28, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants