feat: Smart/Origin parcours 3 itinévert

alembic_migration/versions/27bf1b7197a6_add_coverages.py

@@ -0,0 +1,39 @@
+"""Add coverages
+
+Revision ID: 335e0bc4df28
+Revises: 6b40cb9c7c3d
+Create Date: 2025-11-18 14:15:26.377504
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '335e0bc4df28'
+down_revision = '6b40cb9c7c3d'
+branch_labels = None
+depends_on = None
+
+def upgrade():
+    coverage_type = sa.Enum('fr-idf', 'fr-ne', 'fr-nw', 'fr-se', 'fr-sw', name='coverage_type', schema='guidebook')
+    op.create_table('coverages',
+    sa.Column('coverage_type', coverage_type, nullable=True),
+    sa.Column('document_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['document_id'], ['guidebook.documents.document_id'], ),
+    sa.PrimaryKeyConstraint('document_id'),
+    schema='guidebook'
+    )
+    op.create_table('coverages_archives',
+    sa.Column('coverage_type', coverage_type, nullable=True),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['id'], ['guidebook.documents_archives.id'], ),
+    sa.PrimaryKeyConstraint('id'),
+    schema='guidebook'
+    )
+
+
+def downgrade():
+    op.drop_table('coverages_archives', schema='guidebook')
+    op.drop_table('coverages', schema='guidebook')
+    sa.Enum('fr-idf', 'fr-ne', 'fr-nw', 'fr-se', 'fr-sw', name='coverage_type', schema='guidebook').drop(op.get_bind())

c2corg_api/__init__.py

@@ -101,26 +101,31 @@ def configure_anonymous(settings, config):
     config.registry.anonymous_user_id = account_id
 
 
+def delete_waypoint_stopareas(connection, waypoint_id):
+    # Delete existing stopareas for waypoint
+    delete_relation_query = text(
+        """
+        DELETE FROM guidebook.waypoints_stopareas
+        WHERE waypoint_id = :waypoint_id
+    """
+    )
+
+    connection.execute(
+        delete_relation_query,
+        {
+            "waypoint_id": waypoint_id,
+        },
+    )
+
+
 @event.listens_for(DocumentGeometry, "after_insert")
 @event.listens_for(DocumentGeometry, "after_update")
 def process_new_waypoint(mapper, connection, geometry):
     """Processes a new waypoint to find its public transports after
     inserting it into documents_geometries."""
-    log.debug("Entering process_new_waypoint callback")
+    # Check if document is a waypoint
     waypoint_id = geometry.document_id
 
-    max_distance_waypoint_to_stoparea = int(
-        os.getenv("MAX_DISTANCE_WAYPOINT_TO_STOPAREA")
-    )
-    walking_speed = float(os.getenv("WALKING_SPEED"))
-    max_stop_area_for_1_waypoint = int(os.getenv("MAX_STOP_AREA_FOR_1_WAYPOINT"))  # noqa: E501
-    api_key = os.getenv("NAVITIA_API_KEY")
-    max_duration = int(max_distance_waypoint_to_stoparea / walking_speed)
-
-    # Augmenter le nombre d'arrêts récupérés pour avoir plus de choix (comme dans le bash)  # noqa: E501
-    max_stop_area_fetched = max_stop_area_for_1_waypoint * 3
-
-    # Check if document is a waypoint
     document_type = connection.execute(
         text(
             """
@@ -134,6 +139,18 @@ def process_new_waypoint(mapper, connection, geometry):
     if document_type != "w":
         return
 
+    log.debug("Entering process_new_waypoint callback")
+    max_distance_waypoint_to_stoparea = int(
+        os.getenv("MAX_DISTANCE_WAYPOINT_TO_STOPAREA")
+    )
+    walking_speed = float(os.getenv("WALKING_SPEED"))
+    max_stop_area_for_1_waypoint = int(os.getenv("MAX_STOP_AREA_FOR_1_WAYPOINT"))  # noqa: E501
+    api_key = os.getenv("NAVITIA_API_KEY")
+    max_duration = int(max_distance_waypoint_to_stoparea / walking_speed)
+
+    # Augmenter le nombre d'arrêts récupérés pour avoir plus de choix (comme dans le bash)  # noqa: E501
+    max_stop_area_fetched = max_stop_area_for_1_waypoint * 3
+
     waypoint_type = connection.execute(
         text(
             """
@@ -182,7 +199,8 @@ def process_new_waypoint(mapper, connection, geometry):
     places_data = places_response.json()
 
     if "places_nearby" not in places_data or not places_data["places_nearby"]:
-        log.warning(f"No Navitia stops found for the waypoint {waypoint_id}")
+        log.warning(f"No Navitia stops found for the waypoint {waypoint_id}; deleting previously registered stops")  # noqa: E501
+        delete_waypoint_stopareas(connection, waypoint_id)
         return
 
     # --- NOUVEAU : Filtrage par diversité de transport (comme dans bash) ---
@@ -226,23 +244,11 @@ def process_new_waypoint(mapper, connection, geometry):
             known_transports.update(current_stop_transports)
             selected_count += 1
 
-    # Delete existing stopareas for waypoint
-    delete_relation_query = text(
-        """
-        DELETE FROM guidebook.waypoints_stopareas
-        WHERE waypoint_id = :waypoint_id
-    """
-    )
-
-    connection.execute(
-        delete_relation_query,
-        {
-            "waypoint_id": waypoint_id,
-        },
-    )
-
     log.warning(f"Selected {selected_count} stops out of {len(places_data['places_nearby'])} for waypoint {waypoint_id}")  # noqa: E501
 
+    log.warning("Deleting previously registered stops")
+    delete_waypoint_stopareas(connection, waypoint_id)
+
     # Traiter uniquement les arrêts sélectionnés
     for place in selected_stops:
         stop_id = place["id"]
@@ -363,7 +369,7 @@ def calculate_route_duration(mapper, connection, route):
     jour du script bash.
     """
     route_id = route.document_id
-    log.warn(f"Calculating duration for route ID: {route_id}")
+    log.warning(f"Calculating duration for route ID: {route_id}")
 
     # Récupération des activités et normalisation des dénivelés
     activities = route.activities if route.activities is not None else []
@@ -440,15 +446,15 @@ def _calculate_climbing_duration(route, height_diff_up, height_diff_down, route_
             return None  # Pas de données utilisables pour le calcul
 
         dm = dp / v_diff
-        log.warn(f"Calculated climbing route duration for route {route_id} (activity {activity}, no difficulties_height): {dm:.2f} hours")  # noqa: E501
+        log.warning(f"Calculated climbing route duration for route {route_id} (activity {activity}, no difficulties_height): {dm:.2f} hours")  # noqa: E501
         return dm
 
     # CAS 2: Le dénivelé des difficultés est renseigné
     d_diff = float(difficulties_height)
 
     # Vérification de cohérence
     if dp > 0 and d_diff > dp:
-        log.warn(f"Route {route_id}: Inconsistent difficulties_height ({d_diff}m) > height_diff_up ({dp}m). Returning NULL.")  # noqa: E501
+        log.warning(f"Route {route_id}: Inconsistent difficulties_height ({d_diff}m) > height_diff_up ({dp}m). Returning NULL.")  # noqa: E501
         return None
 
     # Calcul du temps des difficultés
@@ -466,7 +472,7 @@ def _calculate_climbing_duration(route, height_diff_up, height_diff_down, route_
     # Calcul final selon le cadrage: max(t_diff, t_app) + 0.5 * min(t_diff, t_app)  # noqa: E501
     dm = max(t_diff, t_app) + 0.5 * min(t_diff, t_app)
 
-    log.warn(f"Calculated climbing route duration for route {route_id} (activity {activity}): {dm:.2f} hours (t_diff={t_diff:.2f}, t_app={t_app:.2f})")  # noqa: E501
+    log.warning(f"Calculated climbing route duration for route {route_id} (activity {activity}): {dm:.2f} hours (t_diff={t_diff:.2f}, t_app={t_app:.2f})")  # noqa: E501
     return dm
 
 
@@ -517,7 +523,7 @@ def _calculate_standard_duration(activity, route, height_diff_up, height_diff_do
     else:
         dm = (dv / 2) + dh
 
-    log.warn(f"Calculated standard route duration for route {route_id} (activity {activity}): {dm:.2f} hours")  # noqa: E501
+    log.warning(f"Calculated standard route duration for route {route_id} (activity {activity}): {dm:.2f} hours")  # noqa: E501
     return dm
 
 
@@ -531,8 +537,9 @@ def _validate_and_convert_duration(min_duration, route_id):
         or min_duration < min_duration_hours
         or min_duration > max_duration_hours
     ):
-        log.warn(
-            f"Route {route_id}: Calculated duration ({min_duration:.2f} hours if not None) is out of bounds (min={min_duration_hours}h, max={max_duration_hours}h) or NULL. Setting duration to NULL."  # noqa: E501
+        min_duration_str = "None" if min_duration is None else f"{min_duration:.2f}"  # noqa: E501
+        log.warning(
+            f"Route {route_id}: Calculated duration (min_duration={min_duration_str}) is out of bounds (min={min_duration_hours}h, max={max_duration_hours}h) or NULL. Setting duration to NULL."  # noqa: E501
         )
         return None
 
@@ -551,6 +558,6 @@ def _update_route_duration(connection, route_id, calculated_duration_in_days):
         ),
         {"duration": calculated_duration_in_days, "route_id": route_id},
     )
-    log.warn(
+    log.warning(
         f"Route {route_id}: Database updated with calculated_duration = {calculated_duration_in_days} days."  # noqa: E501
     )

c2corg_api/models/__init__.py

@@ -24,6 +24,7 @@ class BaseMixin(object):
 
 # all models, for which tables should be created, must be listed here:
 from c2corg_api.models import document  # noqa
+from c2corg_api.models import coverage  # noqa
 from c2corg_api.models import waypoint  # noqa
 from c2corg_api.models import route  # noqa
 from c2corg_api.models import document_history  # noqa
@@ -59,6 +60,7 @@ class BaseMixin(object):
     topo_map.MAP_TYPE: topo_map.TopoMap,
     area.AREA_TYPE: area.Area,
     outing.OUTING_TYPE: outing.Outing,
+    coverage.COVERAGE_TYPE: coverage.Coverage,
 }
 
 document_locale_types = {
@@ -72,4 +74,5 @@ class BaseMixin(object):
     topo_map.MAP_TYPE: document.DocumentLocale,
     area.AREA_TYPE: document.DocumentLocale,
     outing.OUTING_TYPE: outing.OutingLocale,
+    coverage.COVERAGE_TYPE: document.DocumentLocale,
 }

c2corg_api/models/common/attributes.py

@@ -785,3 +785,11 @@
     'highline',
     'waterline'
 ]
+
+coverage_types = [
+    'fr-idf',
+    'fr-ne',
+    'fr-nw',
+    'fr-se',
+    'fr-sw'
+]

c2corg_api/models/common/document_types.py

@@ -9,6 +9,7 @@
 WAYPOINT_TYPE = 'w'
 BOOK_TYPE = 'b'
 XREPORT_TYPE = 'x'
+COVERAGE_TYPE = 'v'
 
 ALL = [
     AREA_TYPE, ARTICLE_TYPE, IMAGE_TYPE, MAP_TYPE, OUTING_TYPE, ROUTE_TYPE,

c2corg_api/models/common/fields_coverage.py

@@ -0,0 +1,21 @@
+DEFAULT_FIELDS = [
+    'coverage_type'
+    'geometry.geom_detail'
+]
+
+DEFAULT_REQUIRED = [
+    'coverage_type',
+    'geometry',
+    'geometry.geom_detail'
+]
+
+LISTING_FIELDS = [
+    'coverage_type',
+    'geometry.geom_detail'
+]
+
+fields_coverage = {
+    'fields': DEFAULT_FIELDS,
+    'required': DEFAULT_REQUIRED,
+    'listing': LISTING_FIELDS
+}

c2corg_api/models/common/sortable_search_attributes.py

@@ -348,3 +348,39 @@
     'slope_40_45': 3,
     'slope_gt_45': 4
 }
+
+
+search_attr_by_field = {
+    'quality': sortable_quality_types,
+    'access_time': sortable_access_times,
+    'paragliding_rating': sortable_paragliding_ratings,
+    'durations': sortable_route_duration_types,
+    'ski_rating': sortable_ski_ratings,
+    'ski_exposition': sortable_exposition_ratings,
+    'labande_ski_rating': sortable_labande_ski_ratings,
+    'labande_global_rating': sortable_global_ratings,
+    'global_rating': sortable_global_ratings,
+    'engagement_rating': sortable_engagement_ratings,
+    'risk_rating': sortable_risk_ratings,
+    'equipment_rating': sortable_equipment_ratings,
+    'ice_rating': sortable_ice_ratings,
+    'mixed_rating': sortable_mixed_ratings,
+    'exposition_rock_rating': sortable_exposition_rock_ratings,
+    'rock_free_rating': sortable_climbing_ratings,
+    'rock_required_rating': sortable_climbing_ratings,
+    'aid_rating': sortable_aid_ratings,
+    'via_ferrata_rating': sortable_via_ferrata_ratings,
+    'hiking_rating': sortable_hiking_ratings,
+    'hiking_mtb_exposition': sortable_exposition_ratings,
+    'snowshoe_rating': sortable_snowshoe_ratings,
+    'mtb_up_rating': sortable_mtb_up_ratings,
+    'mtb_down_rating': sortable_mtb_down_ratings,
+    'frequentation': sortable_frequentation_types,
+    'condition_rating': sortable_condition_ratings,
+    'snow_quality': sortable_snow_quality_ratings,
+    'snow_quantity': sortable_snow_quality_ratings,
+    'glacier_rating': sortable_glacier_ratings,
+    'severity': sortable_severities,
+    'avalanche_level': sortable_avalanche_levels,
+    'avalanche_slope': sortable_avalanche_slopes
+}