⚡️ Stop.postal_region and Line.id/operator_id can be integer values

backend/backend/db/base_class.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from logging import getLogger
 from typing import Iterable, Self, TYPE_CHECKING
 
 from sqlalchemy import select
@@ -9,31 +10,36 @@ from sqlalchemy.orm import DeclarativeBase
 if TYPE_CHECKING:
     from .db import Database
 
+logger = getLogger(__name__)
+
 
 class Base(DeclarativeBase):
     db: Database | None = None
 
     @classmethod
-    async def add(cls, stops: Self | Iterable[Self]) -> bool:
-        try:
-            if isinstance(stops, Iterable):
-                cls.db.session.add_all(stops)  # type: ignore
-            else:
-                cls.db.session.add(stops)  # type: ignore
-            await cls.db.session.commit()  # type: ignore
-        except (AttributeError, IntegrityError) as err:
-            print(err)
-            return False
+    async def add(cls, objs: Self | Iterable[Self]) -> bool:
+        if cls.db is not None and (session := await cls.db.get_session()) is not None:
+
+            async with session.begin():
+                try:
+                    if isinstance(objs, Iterable):
+                        session.add_all(objs)
+                    else:
+                        session.add(objs)
+
+                except (AttributeError, IntegrityError) as err:
+                    logger.error(err)
+                    return False
 
         return True
 
     @classmethod
     async def get_by_id(cls, id_: int | str) -> Self | None:
-        try:
-            stmt = select(cls).where(cls.id == id_)  # type: ignore
-            res = await cls.db.session.execute(stmt)  # type: ignore
-            element = res.scalar_one_or_none()
-        except AttributeError as err:
-            print(err)
-            element = None
-        return element
+        if cls.db is not None and (session := await cls.db.get_session()) is not None:
+
+            async with session.begin():
+                stmt = select(cls).where(cls.id == id_)
+                res = await session.execute(stmt)
+                return res.scalar_one_or_none()
+
+        return None

backend/backend/db/db.py

@@ -1,4 +1,10 @@
+from logging import getLogger
+from typing import Annotated, AsyncIterator
+
+from fastapi import Depends
+from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
 from sqlalchemy import text
+from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.asyncio import (
     async_sessionmaker,
     AsyncEngine,
@@ -9,40 +15,47 @@ from sqlalchemy.ext.asyncio import (
 from .base_class import Base
 
 
+logger = getLogger(__name__)
+
+
 class Database:
     def __init__(self) -> None:
-        self._engine: AsyncEngine | None = None
-        self._session_maker: async_sessionmaker[AsyncSession] | None = None
-        self._session: AsyncSession | None = None
+        self._async_engine: AsyncEngine | None = None
+        self._async_session_local: async_sessionmaker[AsyncSession] | None = None
 
-    @property
-    def session(self) -> AsyncSession | None:
-        if self._session is None and (session_maker := self._session_maker) is not None:
-            self._session = session_maker()
-        return self._session
+    async def get_session(self) -> AsyncSession | None:
+        try:
+            return self._async_session_local()  # type: ignore
 
+        except (SQLAlchemyError, AttributeError) as e:
+            logger.exception(e)
+
+        return None
+
+    # TODO: Preserve UserLastStopSearchResults table from drop.
     async def connect(self, db_path: str, clear_static_data: bool = False) -> bool:
+        self._async_engine = create_async_engine(
+            db_path, pool_pre_ping=True, pool_size=10, max_overflow=20
+        )
 
-        # TODO: Preserve UserLastStopSearchResults table from drop.
-        self._engine = create_async_engine(db_path)
-        if self._engine is not None:
-            self._session_maker = async_sessionmaker(
-                self._engine, expire_on_commit=False, class_=AsyncSession
+        if self._async_engine is not None:
+            SQLAlchemyInstrumentor().instrument(engine=self._async_engine.sync_engine)
+
+            self._async_session_local = async_sessionmaker(
+                bind=self._async_engine,
+                # autoflush=False,
+                expire_on_commit=False,
+                class_=AsyncSession,
             )
-            if (session := self.session) is not None:
-                await session.execute(text("CREATE EXTENSION IF NOT EXISTS pg_trgm;"))
 
-            async with self._engine.begin() as conn:
+            async with self._async_engine.begin() as session:
+                await session.execute(text("CREATE EXTENSION IF NOT EXISTS pg_trgm;"))
                 if clear_static_data:
-                    await conn.run_sync(Base.metadata.drop_all)
-                await conn.run_sync(Base.metadata.create_all)
+                    await session.run_sync(Base.metadata.drop_all)
+                    await session.run_sync(Base.metadata.create_all)
 
         return True
 
     async def disconnect(self) -> None:
-        if self._session is not None:
-            await self._session.close()
-            self._session = None
-
-        if self._engine is not None:
-            await self._engine.dispose()
+        if self._async_engine is not None:
+            await self._async_engine.dispose()

backend/backend/idfm_interface/idfm_interface.py

@@ -1,4 +1,5 @@
 from collections import defaultdict
+from logging import getLogger
 from re import compile as re_compile
 from time import time
 from typing import (
@@ -12,11 +13,10 @@ from typing import (
 
 from aiofiles import open as async_open
 from aiohttp import ClientSession
-
 from msgspec import ValidationError
 from msgspec.json import Decoder
-from rich import print
-from shapefile import Reader as ShapeFileReader, ShapeRecord
+from pyproj import Transformer
+from shapefile import Reader as ShapeFileReader, ShapeRecord  # type: ignore
 
 from ..db import Database
 from ..models import ConnectionArea, Line, LinePicto, Stop, StopArea, StopShape
@@ -38,6 +38,10 @@ from .idfm_types import (
 from .ratp_types import Picto as RatpPicto
 
 
+
+logger = getLogger(__name__)
+
+
 class IdfmInterface:
 
     IDFM_ROOT_URL = "https://prim.iledefrance-mobilites.fr/marketplace"
@@ -64,6 +68,8 @@ class IdfmInterface:
 
         self._http_headers = {"Accept": "application/json", "apikey": self._api_key}
 
+        self._epsg2154_epsg3857_transformer = Transformer.from_crs(2154, 3857)
+
         self._json_stops_decoder = Decoder(type=List[IdfmStop])
         self._json_stop_areas_decoder = Decoder(type=List[IdfmStopArea])
         self._json_connection_areas_decoder = Decoder(type=List[IdfmConnectionArea])
@@ -89,19 +95,19 @@ class IdfmInterface:
             (
                 StopShape,
                 self._request_stop_shapes,
-                IdfmInterface._format_idfm_stop_shapes,
+                self._format_idfm_stop_shapes,
             ),
             (
                 ConnectionArea,
                 self._request_idfm_connection_areas,
-                IdfmInterface._format_idfm_connection_areas,
+                self._format_idfm_connection_areas,
             ),
             (
                 StopArea,
                 self._request_idfm_stop_areas,
-                IdfmInterface._format_idfm_stop_areas,
+                self._format_idfm_stop_areas,
             ),
-            (Stop, self._request_idfm_stops, IdfmInterface._format_idfm_stops),
+            (Stop, self._request_idfm_stops, self._format_idfm_stops),
         )
 
         for model, get_method, format_method in STEPS:
@@ -356,11 +362,23 @@ class IdfmInterface:
             fields = line.fields
 
             picto_id = fields.picto.id_ if fields.picto is not None else None
-            picto = await LinePicto.get_by_id(picto_id) if picto_id else None
+
+            line_id = fields.id_line
+            try:
+                formatted_line_id = int(line_id[1:] if line_id[0] == "C" else line_id)
+            except ValueError:
+                logger.warning("Unable to format %s line id.", line_id)
+                continue
+
+            try:
+                operator_id = int(fields.operatorref)  # type: ignore
+            except (ValueError, TypeError):
+                logger.warning("Unable to format %s operator id.", fields.operatorref)
+                operator_id = 0
 
             ret.append(
                 Line(
-                    id=fields.id_line,
+                    id=formatted_line_id,
                     short_name=fields.shortname_line,
                     name=fields.name_line,
                     status=IdfmLineState(fields.status.value),
@@ -373,7 +391,7 @@ class IdfmInterface:
                     ),
                     colour_web_hexa=fields.colourweb_hexa,
                     text_colour_hexa=fields.textcolourprint_hexa,
-                    operator_id=optional_value(fields.operatorref),
+                    operator_id=operator_id,
                     operator_name=optional_value(fields.operatorname),
                     accessibility=IdfmState(fields.accessibility.value),
                     visual_signs_available=IdfmState(
@@ -383,7 +401,6 @@ class IdfmInterface:
                         fields.audiblesigns_available.value
                     ),
                     picto_id=fields.picto.id_ if fields.picto is not None else None,
-                    picto=picto,
                     record_id=line.recordid,
                     record_ts=int(line.record_timestamp.timestamp()),
                 )
@@ -391,23 +408,34 @@ class IdfmInterface:
 
         return ret
 
-    @staticmethod
-    def _format_idfm_stops(*stops: IdfmStop) -> Iterable[Stop]:
+    def _format_idfm_stops(self, *stops: IdfmStop) -> Iterable[Stop]:
         for stop in stops:
             fields = stop.fields
+
             try:
                 created_ts = int(fields.arrcreated.timestamp())  # type: ignore
             except AttributeError:
                 created_ts = None
+
+            epsg3857_point = self._epsg2154_epsg3857_transformer.transform(
+                fields.arrxepsg2154, fields.arryepsg2154
+            )
+
+            try:
+                postal_region = int(fields.arrpostalregion)
+            except ValueError:
+                logger.warning(
+                    "Unable to format %s postal region.", fields.arrpostalregion
+                )
+                continue
+
             yield Stop(
                 id=int(fields.arrid),
                 name=fields.arrname,
-                latitude=fields.arrgeopoint.lat,
-                longitude=fields.arrgeopoint.lon,
+                epsg3857_x=epsg3857_point[0],
+                epsg3857_y=epsg3857_point[1],
                 town_name=fields.arrtown,
-                postal_region=fields.arrpostalregion,
-                xepsg2154=fields.arrxepsg2154,
-                yepsg2154=fields.arryepsg2154,
+                postal_region=postal_region,
                 transport_mode=TransportMode(fields.arrtype.value),
                 version=fields.arrversion,
                 created_ts=created_ts,
@@ -419,53 +447,76 @@ class IdfmInterface:
                 record_ts=int(stop.record_timestamp.timestamp()),
             )
 
-    @staticmethod
-    def _format_idfm_stop_areas(*stop_areas: IdfmStopArea) -> Iterable[StopArea]:
+    def _format_idfm_stop_areas(self, *stop_areas: IdfmStopArea) -> Iterable[StopArea]:
         for stop_area in stop_areas:
             fields = stop_area.fields
+
             try:
                 created_ts = int(fields.zdacreated.timestamp())  # type: ignore
             except AttributeError:
                 created_ts = None
+
+            epsg3857_point = self._epsg2154_epsg3857_transformer.transform(
+                fields.zdaxepsg2154, fields.zdayepsg2154
+            )
+
             yield StopArea(
                 id=int(fields.zdaid),
                 name=fields.zdaname,
                 town_name=fields.zdatown,
                 postal_region=fields.zdapostalregion,
-                xepsg2154=fields.zdaxepsg2154,
-                yepsg2154=fields.zdayepsg2154,
+                epsg3857_x=epsg3857_point[0],
+                epsg3857_y=epsg3857_point[1],
                 type=StopAreaType(fields.zdatype.value),
                 version=fields.zdaversion,
                 created_ts=created_ts,
                 changed_ts=int(fields.zdachanged.timestamp()),
             )
 
-    @staticmethod
     def _format_idfm_connection_areas(
+        self,
         *connection_areas: IdfmConnectionArea,
     ) -> Iterable[ConnectionArea]:
         for connection_area in connection_areas:
+
+            epsg3857_point = self._epsg2154_epsg3857_transformer.transform(
+                connection_area.zdcxepsg2154, connection_area.zdcyepsg2154
+            )
+
             yield ConnectionArea(
                 id=int(connection_area.zdcid),
                 name=connection_area.zdcname,
                 town_name=connection_area.zdctown,
                 postal_region=connection_area.zdcpostalregion,
-                xepsg2154=connection_area.zdcxepsg2154,
-                yepsg2154=connection_area.zdcyepsg2154,
+                epsg3857_x=epsg3857_point[0],
+                epsg3857_y=epsg3857_point[1],
                 transport_mode=StopAreaType(connection_area.zdctype.value),
                 version=connection_area.zdcversion,
                 created_ts=int(connection_area.zdccreated.timestamp()),
                 changed_ts=int(connection_area.zdcchanged.timestamp()),
             )
 
-    @staticmethod
-    def _format_idfm_stop_shapes(*shape_records: ShapeRecord) -> Iterable[StopShape]:
+    def _format_idfm_stop_shapes(
+        self, *shape_records: ShapeRecord
+    ) -> Iterable[StopShape]:
         for shape_record in shape_records:
+
+            epsg3857_points = [
+                self._epsg2154_epsg3857_transformer.transform(*point)
+                for point in shape_record.shape.points
+            ]
+
+            bbox_it = iter(shape_record.shape.bbox)
+            epsg3857_bbox = [
+                self._epsg2154_epsg3857_transformer.transform(*point)
+                for point in zip(bbox_it, bbox_it)
+            ]
+
             yield StopShape(
                 id=shape_record.record[1],
                 type=shape_record.shape.shapeType,
-                bounding_box=list(shape_record.shape.bbox),
-                points=shape_record.shape.points,
+                epsg3857_bbox=epsg3857_bbox,
+                epsg3857_points=epsg3857_points,
             )
 
     async def render_line_picto(self, line: Line) -> tuple[None | str, None | str]:
@@ -508,7 +559,7 @@ class IdfmInterface:
         print("---------------------------------------------------------------------")
         return data
 
-    async def get_next_passages(self, stop_point_id: str) -> IdfmResponse | None:
+    async def get_next_passages(self, stop_point_id: int) -> IdfmResponse | None:
         ret = None
         params = {"MonitoringRef": f"STIF:StopPoint:Q:{stop_point_id}:"}
         async with ClientSession(headers=self._http_headers) as session:

backend/backend/models/line.py

@@ -5,13 +5,11 @@ from typing import Iterable, Self, Sequence
 from sqlalchemy import (
     BigInteger,
     Boolean,
-    Column,
     Enum,
     ForeignKey,
     Integer,
     select,
     String,
-    Table,
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship, selectinload
 from sqlalchemy.sql.expression import tuple_
@@ -25,12 +23,14 @@ from ..idfm_interface.idfm_types import (
 )
 from .stop import _Stop
 
-line_stop_association_table = Table(
-    "line_stop_association_table",
-    Base.metadata,
-    Column("line_id", ForeignKey("lines.id")),
-    Column("stop_id", ForeignKey("_stops.id")),
-)
+
+class LineStopAssociations(Base):
+
+    id = mapped_column(BigInteger, primary_key=True)
+    line_id = mapped_column(BigInteger, ForeignKey("lines.id"))
+    stop_id = mapped_column(BigInteger, ForeignKey("_stops.id"))
+
+    __tablename__ = "line_stop_associations"
 
 
 class LinePicto(Base):
@@ -53,7 +53,7 @@ class Line(Base):
 
     db = db
 
-    id = mapped_column(String, primary_key=True)
+    id = mapped_column(BigInteger, primary_key=True)
 
     short_name = mapped_column(String)
     name = mapped_column(String, nullable=False)
@@ -68,7 +68,7 @@ class Line(Base):
     colour_web_hexa = mapped_column(String, nullable=False)
     text_colour_hexa = mapped_column(String, nullable=False)
 
-    operator_id = mapped_column(String)
+    operator_id = mapped_column(Integer)
     operator_name = mapped_column(String)
 
     accessibility = mapped_column(Enum(IdfmState), nullable=False)
@@ -83,7 +83,7 @@ class Line(Base):
 
     stops: Mapped[list[_Stop]] = relationship(
         "_Stop",
-        secondary=line_stop_association_table,
+        secondary="line_stop_associations",
         back_populates="lines",
         lazy="selectin",
     )
@@ -94,23 +94,24 @@ class Line(Base):
     async def get_by_name(
         cls, name: str, operator_name: None | str = None
     ) -> Sequence[Self] | None:
-        session = cls.db.session
-        if session is None:
-            return None
+        if (session := await cls.db.get_session()) is not None:
 
-        filters = {"name": name}
-        if operator_name is not None:
-            filters["operator_name"] = operator_name
+            async with session.begin():
+                filters = {"name": name}
+                if operator_name is not None:
+                    filters["operator_name"] = operator_name
 
-        stmt = (
-            select(cls)
-            .filter_by(**filters)
-            .options(selectinload(cls.stops), selectinload(cls.picto))
-        )
-        res = await session.execute(stmt)
-        lines = res.scalars().all()
+                stmt = (
+                    select(cls)
+                    .filter_by(**filters)
+                    .options(selectinload(cls.stops), selectinload(cls.picto))
+                )
+                res = await session.execute(stmt)
+                lines = res.scalars().all()
 
-        return lines
+                return lines
+
+        return None
 
     @classmethod
     async def _add_picto_to_line(cls, line: str | Self, picto: LinePicto) -> None:
@@ -133,57 +134,63 @@ class Line(Base):
 
     @classmethod
     async def add_pictos(cls, line_to_pictos: Iterable[tuple[str, LinePicto]]) -> bool:
-        session = cls.db.session
-        if session is None:
-            return False
+        if (session := await cls.db.get_session()) is not None:
 
-        await asyncio_gather(
-            *[cls._add_picto_to_line(line, picto) for line, picto in line_to_pictos]
-        )
+            async with session.begin():
+                await asyncio_gather(
+                    *[
+                        cls._add_picto_to_line(line, picto)
+                        for line, picto in line_to_pictos
+                    ]
+                )
 
-        await session.commit()
+                return True
 
-        return True
+        return False
 
     @classmethod
     async def add_stops(cls, line_to_stop_ids: Iterable[tuple[str, str, int]]) -> int:
-        session = cls.db.session
-        if session is None:
-            return 0
+        if (session := await cls.db.get_session()) is not None:
 
-        line_names_ops, stop_ids = set(), set()
-        for line_name, operator_name, stop_id in line_to_stop_ids:
-            line_names_ops.add((line_name, operator_name))
-            stop_ids.add(stop_id)
+            async with session.begin():
 
-        lines_res = await session.execute(
-            select(Line).where(
-                tuple_(Line.name, Line.operator_name).in_(line_names_ops)
-            )
-        )
+                line_names_ops, stop_ids = set(), set()
+                for line_name, operator_name, stop_id in line_to_stop_ids:
+                    line_names_ops.add((line_name, operator_name))
+                    stop_ids.add(stop_id)
 
-        lines = defaultdict(list)
-        for line in lines_res.scalars():
-            lines[(line.name, line.operator_name)].append(line)
-
-        stops_res = await session.execute(select(_Stop).where(_Stop.id.in_(stop_ids)))
-        stops = {stop.id: stop for stop in stops_res.scalars()}
-
-        found = 0
-        for line_name, operator_name, stop_id in line_to_stop_ids:
-            if (stop := stops.get(stop_id)) is not None:
-                if (stop_lines := lines.get((line_name, operator_name))) is not None:
-                    for stop_line in stop_lines:
-                        stop_line.stops.append(stop)
-                    found += 1
-                else:
-                    print(f"No line found for {line_name}/{operator_name}")
-            else:
-                print(
-                    f"No stop found for {stop_id} id"
-                    f"(used by {line_name}/{operator_name})"
+                lines_res = await session.execute(
+                    select(Line).where(
+                        tuple_(Line.name, Line.operator_name).in_(line_names_ops)
+                    )
                 )
 
-        await session.commit()
+                lines = defaultdict(list)
+                for line in lines_res.scalars():
+                    lines[(line.name, line.operator_name)].append(line)
 
-        return found
+                stops_res = await session.execute(
+                    select(_Stop).where(_Stop.id.in_(stop_ids))
+                )
+                stops = {stop.id: stop for stop in stops_res.scalars()}
+
+                found = 0
+                for line_name, operator_name, stop_id in line_to_stop_ids:
+                    if (stop := stops.get(stop_id)) is not None:
+                        if (
+                            stop_lines := lines.get((line_name, operator_name))
+                        ) is not None:
+                            for stop_line in stop_lines:
+                                stop_line.stops.append(stop)
+                            found += 1
+                        else:
+                            print(f"No line found for {line_name}/{operator_name}")
+                    else:
+                        print(
+                            f"No stop found for {stop_id} id"
+                            f"(used by {line_name}/{operator_name})"
+                        )
+
+                return found
+
+        return 0

backend/backend/models/stop.py

@@ -1,18 +1,20 @@
 from __future__ import annotations
 
+from logging import getLogger
 from typing import Iterable, Sequence, TYPE_CHECKING
 
 from sqlalchemy import (
     BigInteger,
-    Column,
+    Computed,
+    desc,
     Enum,
     Float,
     ForeignKey,
+    func,
     Integer,
     JSON,
     select,
     String,
-    Table,
 )
 from sqlalchemy.orm import (
     mapped_column,
@@ -22,6 +24,7 @@ from sqlalchemy.orm import (
     with_polymorphic,
 )
 from sqlalchemy.schema import Index
+from sqlalchemy_utils.types.ts_vector import TSVectorType
 
 from ..db import Base, db
 from ..idfm_interface.idfm_types import TransportMode, IdfmState, StopAreaType
@@ -30,12 +33,15 @@ if TYPE_CHECKING:
     from .line import Line
 
 
-stop_area_stop_association_table = Table(
-    "stop_area_stop_association_table",
-    Base.metadata,
-    Column("stop_id", ForeignKey("_stops.id")),
-    Column("stop_area_id", ForeignKey("stop_areas.id")),
-)
+logger = getLogger(__name__)
+
+class StopAreaStopAssociations(Base):
+
+    id = mapped_column(BigInteger, primary_key=True)
+    stop_id = mapped_column(BigInteger, ForeignKey("_stops.id"))
+    stop_area_id = mapped_column(BigInteger, ForeignKey("stop_areas.id"))
+
+    __tablename__ = "stop_area_stop_associations"
 
 
 class _Stop(Base):
@@ -47,9 +53,9 @@ class _Stop(Base):
 
     name = mapped_column(String, nullable=False, index=True)
     town_name = mapped_column(String, nullable=False)
-    postal_region = mapped_column(String, nullable=False)
-    xepsg2154 = mapped_column(BigInteger, nullable=False)
-    yepsg2154 = mapped_column(BigInteger, nullable=False)
+    postal_region = mapped_column(Integer, nullable=False)
+    epsg3857_x = mapped_column(Float, nullable=False)
+    epsg3857_y = mapped_column(Float, nullable=False)
 
     version = mapped_column(String, nullable=False)
     created_ts = mapped_column(BigInteger)
@@ -57,12 +63,14 @@ class _Stop(Base):
 
     lines: Mapped[list[Line]] = relationship(
         "Line",
-        secondary="line_stop_association_table",
+        secondary="line_stop_associations",
         back_populates="stops",
         lazy="selectin",
     )
     areas: Mapped[list["StopArea"]] = relationship(
-        "StopArea", secondary=stop_area_stop_association_table, back_populates="stops"
+        "StopArea",
+        secondary="stop_area_stop_associations",
+        back_populates="stops",
     )
     connection_area_id: Mapped[int] = mapped_column(
         ForeignKey("connection_areas.id"), nullable=True
@@ -71,48 +79,51 @@ class _Stop(Base):
         back_populates="stops", lazy="selectin"
     )
 
+    names_tsv = mapped_column(
+        TSVectorType("name", "town_name", regconfig="french"),
+        Computed("to_tsvector('french', name || ' ' || town_name)", persisted=True),
+    )
+
     __tablename__ = "_stops"
     __mapper_args__ = {"polymorphic_identity": "_stops", "polymorphic_on": kind}
     __table_args__ = (
-        # To optimize the ilike requests
         Index(
-            "name_idx_gin",
-            name,
+            "names_tsv_idx",
+            names_tsv,
             postgresql_ops={"name": "gin_trgm_ops"},
             postgresql_using="gin",
         ),
     )
 
-    # TODO: Test https://www.cybertec-postgresql.com/en/postgresql-more-performance-for-like-and-ilike-statements/
-    # TODO: Should be able to remove with_polymorphic ?
     @classmethod
-    async def get_by_name(cls, name: str) -> Sequence[type[_Stop]] | None:
-        session = cls.db.session
-        if session is None:
-            return None
+    async def get_by_name(cls, name: str) -> Sequence[_Stop] | None:
+        if (session := await cls.db.get_session()) is not None:
 
-        stop_stop_area = with_polymorphic(_Stop, [Stop, StopArea])
-        stmt = (
-            select(stop_stop_area)
-            .where(stop_stop_area.name.ilike(f"%{name}%"))
-            .options(
-                selectinload(stop_stop_area.areas),
-                selectinload(stop_stop_area.lines),
-            )
-        )
+            async with session.begin():
+                descendants = with_polymorphic(_Stop, "*")
 
-        res = await session.execute(stmt)
-        stops = res.scalars().all()
+                match_stmt = descendants.names_tsv.match(
+                    name, postgresql_regconfig="french"
+                )
+                ranking_stmt = func.ts_rank_cd(
+                    descendants.names_tsv, func.plainto_tsquery("french", name)
+                )
+                stmt = (
+                    select(descendants).filter(match_stmt).order_by(desc(ranking_stmt))
+                )
 
-        return stops
+                res = await session.execute(stmt)
+                stops = res.scalars().all()
+
+                return stops
+
+        return None
 
 
 class Stop(_Stop):
 
     id = mapped_column(BigInteger, ForeignKey("_stops.id"), primary_key=True)
 
-    latitude = mapped_column(Float, nullable=False)
-    longitude = mapped_column(Float, nullable=False)
     transport_mode = mapped_column(Enum(TransportMode), nullable=False)
     accessibility = mapped_column(Enum(IdfmState), nullable=False)
     visual_signs_available = mapped_column(Enum(IdfmState), nullable=False)
@@ -133,7 +144,7 @@ class StopArea(_Stop):
 
     stops: Mapped[list["Stop"]] = relationship(
         "Stop",
-        secondary=stop_area_stop_association_table,
+        secondary="stop_area_stop_associations",
         back_populates="areas",
         lazy="selectin",
     )
@@ -148,41 +159,43 @@ class StopArea(_Stop):
     async def add_stops(
         cls, stop_area_to_stop_ids: Iterable[tuple[int, int]]
     ) -> int | None:
-        session = cls.db.session
-        if session is None:
-            return None
+        if (session := await cls.db.get_session()) is not None:
 
-        stop_area_ids, stop_ids = set(), set()
-        for stop_area_id, stop_id in stop_area_to_stop_ids:
-            stop_area_ids.add(stop_area_id)
-            stop_ids.add(stop_id)
+            async with session.begin():
 
-        stop_areas_res = await session.scalars(
-            select(StopArea)
-            .where(StopArea.id.in_(stop_area_ids))
-            .options(selectinload(StopArea.stops))
-        )
-        stop_areas: dict[int, StopArea] = {
-            stop_area.id: stop_area for stop_area in stop_areas_res.all()
-        }
+                stop_area_ids, stop_ids = set(), set()
+                for stop_area_id, stop_id in stop_area_to_stop_ids:
+                    stop_area_ids.add(stop_area_id)
+                    stop_ids.add(stop_id)
 
-        stop_res = await session.execute(select(Stop).where(Stop.id.in_(stop_ids)))
-        stops: dict[int, Stop] = {stop.id: stop for stop in stop_res.scalars()}
+                stop_areas_res = await session.scalars(
+                    select(StopArea)
+                    .where(StopArea.id.in_(stop_area_ids))
+                    .options(selectinload(StopArea.stops))
+                )
+                stop_areas: dict[int, StopArea] = {
+                    stop_area.id: stop_area for stop_area in stop_areas_res.all()
+                }
 
-        found = 0
-        for stop_area_id, stop_id in stop_area_to_stop_ids:
-            if (stop_area := stop_areas.get(stop_area_id)) is not None:
-                if (stop := stops.get(stop_id)) is not None:
-                    stop_area.stops.append(stop)
-                    found += 1
-                else:
-                    print(f"No stop found for {stop_id} id")
-            else:
-                print(f"No stop area found for {stop_area_id}")
+                stop_res = await session.execute(
+                    select(Stop).where(Stop.id.in_(stop_ids))
+                )
+                stops: dict[int, Stop] = {stop.id: stop for stop in stop_res.scalars()}
 
-        await session.commit()
+                found = 0
+                for stop_area_id, stop_id in stop_area_to_stop_ids:
+                    if (stop_area := stop_areas.get(stop_area_id)) is not None:
+                        if (stop := stops.get(stop_id)) is not None:
+                            stop_area.stops.append(stop)
+                            found += 1
+                        else:
+                            print(f"No stop found for {stop_id} id")
+                    else:
+                        print(f"No stop area found for {stop_area_id}")
 
-        return found
+                return found
+
+        return None
 
 
 class StopShape(Base):
@@ -191,8 +204,8 @@ class StopShape(Base):
 
     id = mapped_column(BigInteger, primary_key=True)  # Same id than ConnectionArea
     type = mapped_column(Integer, nullable=False)
-    bounding_box = mapped_column(JSON)
-    points = mapped_column(JSON)
+    epsg3857_bbox = mapped_column(JSON)
+    epsg3857_points = mapped_column(JSON)
 
     __tablename__ = "stop_shapes"
 
@@ -206,8 +219,8 @@ class ConnectionArea(Base):
     name = mapped_column(String, nullable=False)
     town_name = mapped_column(String, nullable=False)
     postal_region = mapped_column(String, nullable=False)
-    xepsg2154 = mapped_column(BigInteger, nullable=False)
-    yepsg2154 = mapped_column(BigInteger, nullable=False)
+    epsg3857_x = mapped_column(Float, nullable=False)
+    epsg3857_y = mapped_column(Float, nullable=False)
     transport_mode = mapped_column(Enum(StopAreaType), nullable=False)
 
     version = mapped_column(String, nullable=False)
@@ -223,38 +236,40 @@ class ConnectionArea(Base):
     async def add_stops(
         cls, conn_area_to_stop_ids: Iterable[tuple[int, int]]
     ) -> int | None:
-        session = cls.db.session
-        if session is None:
-            return None
+        if (session := await cls.db.get_session()) is not None:
 
-        conn_area_ids, stop_ids = set(), set()
-        for conn_area_id, stop_id in conn_area_to_stop_ids:
-            conn_area_ids.add(conn_area_id)
-            stop_ids.add(stop_id)
+            async with session.begin():
 
-        conn_area_res = await session.execute(
-            select(ConnectionArea)
-            .where(ConnectionArea.id.in_(conn_area_ids))
-            .options(selectinload(ConnectionArea.stops))
-        )
-        conn_areas: dict[int, ConnectionArea] = {
-            conn.id: conn for conn in conn_area_res.scalars()
-        }
+                conn_area_ids, stop_ids = set(), set()
+                for conn_area_id, stop_id in conn_area_to_stop_ids:
+                    conn_area_ids.add(conn_area_id)
+                    stop_ids.add(stop_id)
 
-        stop_res = await session.execute(select(_Stop).where(_Stop.id.in_(stop_ids)))
-        stops: dict[int, _Stop] = {stop.id: stop for stop in stop_res.scalars()}
+                conn_area_res = await session.execute(
+                    select(ConnectionArea)
+                    .where(ConnectionArea.id.in_(conn_area_ids))
+                    .options(selectinload(ConnectionArea.stops))
+                )
+                conn_areas: dict[int, ConnectionArea] = {
+                    conn.id: conn for conn in conn_area_res.scalars()
+                }
 
-        found = 0
-        for conn_area_id, stop_id in conn_area_to_stop_ids:
-            if (conn_area := conn_areas.get(conn_area_id)) is not None:
-                if (stop := stops.get(stop_id)) is not None:
-                    conn_area.stops.append(stop)
-                    found += 1
-                else:
-                    print(f"No stop found for {stop_id} id")
-            else:
-                print(f"No connection area found for {conn_area_id}")
+                stop_res = await session.execute(
+                    select(Stop).where(Stop.id.in_(stop_ids))
+                )
+                stops: dict[int, Stop] = {stop.id: stop for stop in stop_res.scalars()}
 
-        await session.commit()
+                found = 0
+                for conn_area_id, stop_id in conn_area_to_stop_ids:
+                    if (conn_area := conn_areas.get(conn_area_id)) is not None:
+                        if (stop := stops.get(stop_id)) is not None:
+                            conn_area.stops.append(stop)
+                            found += 1
+                        else:
+                            print(f"No stop found for {stop_id} id")
+                    else:
+                        print(f"No connection area found for {conn_area_id}")
 
-        return found
+                return found
+
+        return None

backend/backend/models/user.py

@@ -1,25 +1,27 @@
-from sqlalchemy import Column, ForeignKey, String, Table
+from sqlalchemy import BigInteger, ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..db import Base, db
 from .stop import _Stop
 
-user_last_stop_search_stops_associations_table = Table(
-    "user_last_stop_search_stops_associations_table",
-    Base.metadata,
-    Column("user_mxid", ForeignKey("user_last_stop_search_results.user_mxid")),
-    Column("stop_id", ForeignKey("_stops.id")),
-)
+
+class UserLastStopSearchStopAssociations(Base):
+    id = mapped_column(BigInteger, primary_key=True)
+    user_mxid = mapped_column(
+        String, ForeignKey("user_last_stop_search_results.user_mxid")
+    )
+    stop_id = mapped_column(BigInteger, ForeignKey("_stops.id"))
+
+    __tablename__ = "user_last_stop_search_stop_associations"
 
 
 class UserLastStopSearchResults(Base):
-
     db = db
 
-    __tablename__ = "user_last_stop_search_results"
-
     user_mxid = mapped_column(String, primary_key=True)
     request_content = mapped_column(String, nullable=False)
     stops: Mapped[_Stop] = relationship(
-        _Stop, secondary=user_last_stop_search_stops_associations_table
+        _Stop, secondary="user_last_stop_search_stop_associations"
     )
+
+    __tablename__ = "user_last_stop_search_results"

backend/backend/schemas/line.py

@@ -46,7 +46,7 @@ class TransportMode(StrEnum):
 
 
 class Line(BaseModel):
-    id: str
+    id: int
     shortName: str
     name: str
     status: IdfmLineState

backend/backend/schemas/stop.py

@@ -7,10 +7,8 @@ class Stop(BaseModel):
     id: int
     name: str
     town: str
-    lat: float
-    lon: float
-    # xepsg2154: int
-    # yepsg2154: int
+    epsg3857_x: float
+    epsg3857_y: float
     lines: list[str]
 
 
@@ -18,15 +16,16 @@ class StopArea(BaseModel):
     id: int
     name: str
     town: str
-    # xepsg2154: int
-    # yepsg2154: int
     type: StopAreaType
     lines: list[str]  # SNCF lines are linked to stop areas and not stops.
     stops: list[Stop]
 
 
+Point = tuple[float, float]
+
+
 class StopShape(BaseModel):
     id: int
     type: int
-    bbox: list[float]
-    points: list[tuple[float, float]]
+    epsg3857_bbox: list[Point]
+    epsg3857_points: list[Point]

backend/docker-compose.yml

@@ -13,7 +13,62 @@ services:
         max-size: 10m
         max-file: "3"
     ports:
-      - '127.0.0.1:5438:5432'
+      - "127.0.0.1:5432:5432"
     volumes:
       - ./docker/database/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       - ./docker/database/data:/var/lib/postgresql/data
+
+  jaeger-agent:
+    image: jaegertracing/jaeger-agent:latest
+    command:
+      - "--reporter.grpc.host-port=jaeger-collector:14250"
+    ports:
+      - "127.0.0.1:5775:5775/udp"
+      - "127.0.0.1:6831:6831/udp"
+      - "127.0.0.1:6832:6832/udp"
+      - "127.0.0.1:5778:5778"
+    restart: on-failure
+    depends_on:
+      - jaeger-collector
+
+  jaeger-collector:
+    image: jaegertracing/jaeger-collector:latest
+    command:
+      - "--cassandra.keyspace=jaeger_v1_dc1"
+      - "--cassandra.servers=cassandra"
+      - "--collector.zipkin.host-port=9411"
+      - "--sampling.initial-sampling-probability=.5"
+      - "--sampling.target-samples-per-second=.01"
+    environment:
+      - SAMPLING_CONFIG_TYPE=adaptive
+      - COLLECTOR_OTLP_ENABLED=true
+    ports:
+      - "127.0.0.1:4317:4317"
+      - "127.0.0.1:4318:4318"
+      # - "127.0.0.1:9411:9411"
+      # - "127.0.0.1:14250:14250"
+      # - "127.0.0.1:14268:14268"
+      # - "127.0.0.1:14269:14269"
+    restart: on-failure
+    depends_on:
+      - cassandra-schema
+
+  cassandra:
+    image: cassandra:latest
+
+  cassandra-schema:
+    image: jaegertracing/jaeger-cassandra-schema:latest
+    depends_on:
+      - cassandra
+
+  jaeger-query:
+    image: jaegertracing/jaeger-query:latest
+    command:
+      - "--cassandra.keyspace=jaeger_v1_dc1"
+      - "--cassandra.servers=cassandra"
+    ports:
+      - "127.0.0.1:16686:16686"
+      # - "127.0.0.1:16687:16687"
+    restart: on-failure
+    depends_on:
+      - cassandra-schema

backend/main.py

@@ -1,12 +1,26 @@
+#!/usr/bin/env python3
+import logging
 from collections import defaultdict
 from datetime import datetime
 from os import environ, EX_USAGE
 from typing import Sequence
 
+import uvicorn
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+
+from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
+from opentelemetry.instrumentation.logging import LoggingInstrumentor
+from opentelemetry.sdk.resources import Resource as OtResource
+from opentelemetry.sdk.trace import TracerProvider as OtTracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from rich import print
+from starlette.types import ASGIApp
 
 from backend.db import db
 from backend.idfm_interface import Destinations as IdfmDestinations, IdfmInterface
@@ -26,8 +40,21 @@ if API_KEY is None:
     print('No "API_KEY" environment variable set... abort.')
     exit(EX_USAGE)
 
-# TODO: Remove postgresql+asyncpg from environ variable
-DB_PATH = "postgresql+asyncpg://cer_user:cer_password@127.0.0.1:5438/cer_db"
+APP_NAME = environ.get("APP_NAME", "app")
+MODE = environ.get("MODE", "grpc")
+COLLECTOR_ENDPOINT_GRPC_ENDPOINT = environ.get(
+    "COLLECTOR_ENDPOINT_GRPC_ENDPOINT", "127.0.0.1:14250"  # "jaeger-collector:14250"
+)
+
+# CREATE DATABASE "carrramba-encore-rate";
+# CREATE USER cer WITH ENCRYPTED PASSWORD 'cer_password';
+# GRANT ALL PRIVILEGES ON DATABASE "carrramba-encore-rate" TO cer;
+# \c "carrramba-encore-rate";
+# GRANT ALL ON schema public TO cer;
+# CREATE EXTENSION IF NOT EXISTS pg_trgm;
+
+# TODO: Remove postgresql+psycopg from environ variable
+DB_PATH = "postgresql+psycopg://cer:cer_password@127.0.0.1:5432/carrramba-encore-rate"
 
 
 app = FastAPI()
@@ -42,9 +69,15 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+trace.set_tracer_provider(TracerProvider())
+trace.get_tracer_provider().add_span_processor(BatchSpanProcessor(OTLPSpanExporter()))
+tracer = trace.get_tracer(APP_NAME)
+
+
 idfm_interface = IdfmInterface(API_KEY, db)
 
 
+# TODO: Add command line argument to force database reset.
 @app.on_event("startup")
 async def startup():
     await db.connect(DB_PATH, clear_static_data=True)
@@ -58,8 +91,6 @@ async def shutdown():
     await db.disconnect()
 
 
-# /addwidget https://localhost:4443/static/#?widgetId=$matrix_widget_id&userId=$matrix_user_id
-# /addwidget https://localhost:3000/widget?widgetId=$matrix_widget_id&userId=$matrix_user_id
 STATIC_ROOT = "../frontend/"
 app.mount("/widget", StaticFiles(directory=STATIC_ROOT, html=True), name="widget")
 
@@ -69,7 +100,7 @@ def optional_datetime_to_ts(dt: datetime | None) -> int | None:
 
 
 @app.get("/line/{line_id}", response_model=LineSchema)
-async def get_line(line_id: str) -> LineSchema:
+async def get_line(line_id: int) -> LineSchema:
     line: Line | None = await Line.get_by_id(line_id)
 
     if line is None:
@@ -94,22 +125,16 @@ async def get_line(line_id: str) -> LineSchema:
 
 
 def _format_stop(stop: Stop) -> StopSchema:
-    # print(stop.__dict__)
     return StopSchema(
         id=stop.id,
         name=stop.name,
         town=stop.town_name,
-        # xepsg2154=stop.xepsg2154,
-        # yepsg2154=stop.yepsg2154,
-        lat=stop.latitude,
-        lon=stop.longitude,
+        epsg3857_x=stop.epsg3857_x,
+        epsg3857_y=stop.epsg3857_y,
         lines=[line.id for line in stop.lines],
     )
 
 
-# châtelet
-
-
 @app.get("/stop/")
 async def get_stop(
     name: str = "", limit: int = 10
@@ -142,23 +167,20 @@ async def get_stop(
                 id=stop_area.id,
                 name=stop_area.name,
                 town=stop_area.town_name,
-                # xepsg2154=stop_area.xepsg2154,
-                # yepsg2154=stop_area.yepsg2154,
                 type=stop_area.type,
                 lines=[line.id for line in stop_area.lines],
                 stops=formatted_stops,
             )
         )
 
-    # print(f"{stops = }", flush=True)
     formatted.extend(_format_stop(stop) for stop in stops.values())
 
     return formatted
 
 
 # TODO: Cache response for 30 secs ?
-@app.get("/stop/nextPassages/{stop_id}")
-async def get_next_passages(stop_id: str) -> NextPassagesSchema | None:
+@app.get("/stop/{stop_id}/nextPassages")
+async def get_next_passages(stop_id: int) -> NextPassagesSchema | None:
     res = await idfm_interface.get_next_passages(stop_id)
     if res is None:
         return None
@@ -187,8 +209,9 @@ async def get_next_passages(stop_id: str) -> NextPassagesSchema | None:
 
             dst_names = call.DestinationDisplay
             dsts = [dst.value for dst in dst_names] if dst_names else []
-
-            print(f"{call.ArrivalPlatformName = }")
+            arrivalPlatformName = (
+                call.ArrivalPlatformName.value if call.ArrivalPlatformName else None
+            )
 
             next_passage = NextPassageSchema(
                 line=line_id,
@@ -197,9 +220,7 @@ async def get_next_passages(stop_id: str) -> NextPassagesSchema | None:
                 atStop=call.VehicleAtStop,
                 aimedArrivalTs=optional_datetime_to_ts(call.AimedArrivalTime),
                 expectedArrivalTs=optional_datetime_to_ts(call.ExpectedArrivalTime),
-                arrivalPlatformName=call.ArrivalPlatformName.value
-                if call.ArrivalPlatformName
-                else None,
+                arrivalPlatformName=arrivalPlatformName,
                 aimedDepartTs=optional_datetime_to_ts(call.AimedDepartureTime),
                 expectedDepartTs=optional_datetime_to_ts(call.ExpectedDepartureTime),
                 arrivalStatus=call.ArrivalStatus.value,
@@ -226,8 +247,7 @@ async def get_stop_destinations(
     return destinations
 
 
-# TODO: Rename endpoint -> /stop/{stop_id}/shape
-@app.get("/stop_shape/{stop_id}")
+@app.get("/stop/{stop_id}/shape")
 async def get_stop_shape(stop_id: int) -> StopShapeSchema | None:
     connection_area = None
 
@@ -250,8 +270,17 @@ async def get_stop_shape(stop_id: int) -> StopShapeSchema | None:
         and (shape := await StopShape.get_by_id(connection_area.id)) is not None
     ):
         return StopShapeSchema(
-            id=shape.id, type=shape.type, bbox=shape.bounding_box, points=shape.points
+            id=shape.id,
+            type=shape.type,
+            epsg3857_bbox=shape.epsg3857_bbox,
+            epsg3857_points=shape.epsg3857_points,
         )
 
     msg = f"No shape found for stop {stop_id}"
     raise HTTPException(status_code=404, detail=msg)
+
+
+FastAPIInstrumentor.instrument_app(app)
+
+if __name__ == "__main__":
+    uvicorn.run(app, host="0.0.0.0", port=4443, ssl_certfile="./config/cert.pem")

backend/pyproject.toml

@@ -11,12 +11,20 @@ python = "^3.11"
 aiohttp = "^3.8.3"
 rich = "^12.6.0"
 aiofiles = "^22.1.0"
-sqlalchemy = {extras = ["asyncio"], version = "^2.0.1"}
 fastapi = "^0.88.0"
 uvicorn = "^0.20.0"
-asyncpg = "^0.27.0"
 msgspec = "^0.12.0"
 pyshp = "^2.3.1"
+pyproj = "^3.5.0"
+opentelemetry-instrumentation-fastapi = "^0.38b0"
+sqlalchemy-utils = "^0.41.1"
+opentelemetry-instrumentation-logging = "^0.38b0"
+opentelemetry-sdk = "^1.17.0"
+opentelemetry-api = "^1.17.0"
+opentelemetry-exporter-otlp-proto-http = "^1.17.0"
+opentelemetry-instrumentation-sqlalchemy = "^0.38b0"
+sqlalchemy = "^2.0.12"
+psycopg = "^3.1.9"
 
 [build-system]
 requires = ["poetry-core"]
@@ -38,8 +46,8 @@ autopep8 = "^2.0.1"
 pyflakes = "^3.0.1"
 yapf = "^0.32.0"
 whatthepatch = "^1.0.4"
-sqlalchemy = {extras = ["mypy"], version = "^2.0.1"}
 mypy = "^1.0.0"
+types-sqlalchemy-utils = "^1.0.1"
 
 [tool.mypy]
 plugins = "sqlalchemy.ext.mypy.plugin"

frontend/package.json

@@ -1,38 +1,37 @@
 {
-  "name": "vite-template-solid",
-  "version": "0.0.0",
-  "engine": "19.3.0",
-  "description": "",
-  "scripts": {
-    "start": "vite",
-    "dev": "vite --debug",
-    "build": "vite build",
-    "serve": "vite preview"
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "@types/leaflet": "^1.9.0",
-    "@types/proj4": "^2.5.2",
-    "@vitejs/plugin-basic-ssl": "^1.0.1",
-    "eslint": "^8.32.0",
-    "eslint-plugin-solid": "^0.9.3",
-    "sass": "^1.62.0",
-    "typescript": "^4.9.4",
-    "typescript-eslint-language-service": "^5.0.0",
-    "vite": "^4.0.3",
-    "vite-plugin-solid": "^2.5.0"
-  },
-  "dependencies": {
-    "@hope-ui/solid": "^0.6.7",
-    "@motionone/solid": "^10.15.5",
-    "@solid-primitives/date": "^2.0.5",
-    "@solid-primitives/scroll": "^2.0.10",
-    "@stitches/core": "^1.2.8",
-    "date-fns": "^2.29.3",
-    "matrix-widget-api": "^1.1.1",
-    "ol": "^7.3.0",
-    "proj4": "^2.9.0",
-    "solid-js": "^1.6.6",
-    "solid-transition-group": "^0.0.10"
-  }
+	"name": "vite-template-solid",
+	"version": "0.0.0",
+	"engine": "19.3.0",
+	"description": "",
+	"scripts": {
+		"start": "vite",
+		"dev": "vite --debug",
+		"build": "vite build",
+		"serve": "vite preview",
+		"bundle-visualizer": "npx vite-bundle-visualizer"
+	},
+	"license": "MIT",
+	"devDependencies": {
+		"@types/leaflet": "^1.9.0",
+		"@vitejs/plugin-basic-ssl": "^1.0.1",
+		"eslint": "^8.32.0",
+		"eslint-plugin-solid": "^0.9.3",
+		"sass": "^1.62.0",
+		"typescript": "^4.9.4",
+		"typescript-eslint-language-service": "^5.0.0",
+		"vite": "^4.0.3",
+		"vite-bundle-visualizer": "^0.6.0",
+		"vite-plugin-solid": "^2.5.0"
+	},
+	"dependencies": {
+		"@motionone/solid": "^10.15.5",
+		"@solid-primitives/date": "^2.0.5",
+		"@solid-primitives/scroll": "^2.0.10",
+		"@stitches/core": "^1.2.8",
+		"date-fns": "^2.29.3",
+		"matrix-widget-api": "^1.1.1",
+		"ol": "^7.3.0",
+		"solid-js": "^1.6.6",
+		"solid-transition-group": "^0.0.10"
+	}
 }

frontend/src/App.scss

@@ -2,6 +2,10 @@
 	--idfm-black: #2c2e35;
 	--idfm-white: #ffffff;
 
+	--neutral-color: #d7dbdf;
+
+	--border-radius: calc(15/1920*100%);
+
 	height: inherit;
 	width: inherit;
 

frontend/src/App.tsx

@@ -1,4 +1,4 @@
-import { Component } from 'solid-js';
+import { Component, createSignal } from 'solid-js';
 import { IVisibilityActionRequest, MatrixCapabilities, WidgetApi, WidgetApiToWidgetAction } from 'matrix-widget-api';
 import { HopeProvider } from "@hope-ui/solid";
 
@@ -6,9 +6,10 @@ import { BusinessDataProvider } from './businessData';
 import { AppContextProvider } from './appContext';
 
 import { PassagesDisplay } from './passagesDisplay';
-import { StopsSearchMenu } from './stopsSearchMenu';
+import { StopsSearchMenu } from './stopsSearchMenu/stopsSearchMenu';
 
 import "./App.scss";
+import { onCleanup, onMount } from 'solid-js';
 
 
 function parseFragment() {
@@ -43,6 +44,33 @@ const App: Component = () => {
 		api.transport.reply(ev.detail, {});
 	});
 
+	createSignal({
+		height: window.innerHeight,
+		width: window.innerWidth
+	});
+
+	const onResize = () => {
+		const body = document.body;
+
+		if (window.innerWidth * 9 / 16 < window.innerHeight) {
+			body.style['height'] = 'auto';
+			body.style['width'] = '100vw';
+		}
+		else {
+			body.style['height'] = '100vh';
+			body.style['width'] = 'auto';
+		}
+	};
+
+	onMount(() => {
+		window.addEventListener('resize', onResize);
+		onResize();
+	});
+
+	onCleanup(() => {
+		window.removeEventListener('resize', onResize);
+	})
+
 	return (
 		<BusinessDataProvider>
 			<AppContextProvider>

frontend/src/businessData.tsx

@@ -21,7 +21,7 @@ export interface BusinessDataStore {
 	getStop: (stopId: number) => Stop | undefined;
 	searchStopByName: (name: string) => Promise<Stops>;
 
-	getStopDestinations: (stopId: number) => Promise<StopDestinations>;
+	getStopDestinations: (stopId: number) => Promise<StopDestinations | undefined>;
 	getStopShape: (stopId: number) => Promise<StopShape | undefined>;
 };
 
@@ -44,11 +44,22 @@ export function BusinessDataProvider(props: { children: JSX.Element }) {
 		let line = store.lines[lineId];
 		if (line === undefined) {
 			console.log(`${lineId} not found... fetch it from backend.`);
-			const data = await fetch(`${serverUrl()}/line/${lineId}`, {
+
+			const response = await fetch(`${serverUrl()}/line/${lineId}`, {
 				headers: { 'Content-Type': 'application/json' }
 			});
-			line = await data.json();
-			setStore('lines', lineId, line);
+
+			const json = await response.json();
+
+			if (response.ok) {
+				setStore('lines', lineId, json);
+				line = json;
+			}
+			else {
+				console.warn(`No line found for ${lineId} line id (${json}).`);
+			}
+
+
 		}
 		return line;
 	}
@@ -91,12 +102,19 @@ export function BusinessDataProvider(props: { children: JSX.Element }) {
 	}
 
 	const refreshPassages = async (stopId: number): Promise<void> => {
-		const httpOptions = { headers: { "Content-Type": "application/json" } };
 		console.log(`Fetching data for ${stopId}`);
-		const data = await fetch(`${serverUrl()}/stop/nextPassages/${stopId}`, httpOptions);
-		const response = await data.json();
-		_cleanupPassages(response.passages);
-		addPassages(response.passages);
+		const httpOptions = { headers: { "Content-Type": "application/json" } };
+		const response = await fetch(`${serverUrl()}/stop/${stopId}/nextPassages`, httpOptions);
+
+		const json = await response.json();
+
+		if (response.ok) {
+			_cleanupPassages(json.passages);
+			addPassages(json.passages);
+		}
+		else {
+			console.warn(`No passage found for ${stopId} stop (${json}).`);
+		}
 	}
 
 	const addPassages = (passages: Passages): void => {
@@ -155,39 +173,58 @@ ${linePassagesDestination.length} here... refresh all them.`);
 	}
 
 	const searchStopByName = async (name: string): Promise<Stops> => {
-		const data = await fetch(`${serverUrl()}/stop/?name=${name}`, {
+		const byIdStops: Stops = {};
+
+		const response = await fetch(`${serverUrl()}/stop/?name=${name}`, {
 			headers: { 'Content-Type': 'application/json' }
 		});
-		const stops = await data.json();
 
-		const byIdStops: Stops = {};
-		for (const stop of stops) {
-			byIdStops[stop.id] = stop;
-			setStore('stops', stop.id, stop);
-			for (const innerStop of stop.stops) {
-				setStore('stops', innerStop.id, innerStop);
+		const json = await response.json();
+
+		if (response.ok) {
+			for (const stop of json) {
+				byIdStops[stop.id] = stop;
+				setStore('stops', stop.id, stop);
+
+				if (stop.stops !== undefined) {
+					for (const innerStop of stop.stops) {
+						setStore('stops', innerStop.id, innerStop);
+					}
+				}
 			}
 		}
+		else {
+			console.warn(`No stop found for '${name}' (${json}).`);
+		}
+
 		return byIdStops;
 	}
 
-	const getStopDestinations = async (stopId: number): Promise<StopDestinations> => {
-		const data = await fetch(`${serverUrl()}/stop/${stopId}/destinations`, {
+	const getStopDestinations = async (stopId: number): Promise<StopDestinations | undefined> => {
+		const response = await fetch(`${serverUrl()}/stop/${stopId}/destinations`, {
 			headers: { 'Content-Type': 'application/json' }
 		});
-		const response = await data.json();
-		return response;
+		const destinations = response.ok ? await response.json() : undefined;
+		return destinations;
 	}
 
 	const getStopShape = async (stopId: number): Promise<StopShape | undefined> => {
 		let shape = store.stopShapes[stopId];
 		if (shape === undefined) {
 			console.log(`No shape found for ${stopId} stop... fetch it from backend.`);
-			const data = await fetch(`${serverUrl()}/stop_shape/${stopId}`, {
+			const response = await fetch(`${serverUrl()}/stop/${stopId}/shape`, {
 				headers: { 'Content-Type': 'application/json' }
 			});
-			shape = await data.json();
-			setStore('stopShapes', stopId, shape);
+
+			const json = await response.json();
+
+			if (response.ok) {
+				setStore('stopShapes', stopId, json);
+				shape = json;
+			}
+			else {
+				console.warn(`No shape found for ${stopId} stop (${json}).`);
+			}
 		}
 		return shape;
 	}

frontend/src/extra/iconHamburgerMenu.tsx

@@ -1,19 +1,16 @@
-import { createIcon } from "@hope-ui/solid";
+import { VoidComponent } from "solid-js";
 
-
-// From https://github.com/hope-ui/hope-ui/blob/main/apps/docs/src/icons/IconHamburgerMenu.tsx
-
-export const IconHamburgerMenu = createIcon({
-	viewBox: "0 0 15 15",
-	path: () => (
-		<path
-			d="M1.5 3C1.22386 3 1 3.22386 1 3.5C1 3.77614 1.22386 4 1.5 4H13.5C13.7761 4 14 3.77614 14 3.5C14 3.22386
-	13.7761 3 13.5 3H1.5ZM1 7.5C1 7.22386 1.22386 7 1.5 7H13.5C13.7761 7 14 7.22386 14 7.5C14 7.77614 13.7761 8 13.5
-	8H1.5C1.22386 8 1 7.77614 1 7.5ZM1 11.5C1 11.2239 1.22386 11 1.5 11H13.5C13.7761 11 14 11.2239 14 11.5C14 11.7761
-	13.7761 12 13.5 12H1.5C1.22386 12 1 11.7761 1 11.5Z"
-		fill="currentColor"
-		fill-rule="evenodd"
-		clip-rule="evenodd"
+// Inspired by https://github.com/hope-ui/hope-ui/blob/main/apps/docs/src/icons/IconHamburgerMenu.tsx
+export const IconHamburgerMenu: VoidComponent<{}> = () => {
+	return (
+		<svg class="iconHamburgerMenu" viewBox="0 0 15 15">
+			<path d="M1.5 3C1.22386 3 1 3.22386 1 3.5C1 3.77614 1.22386 4 1.5 4H13.5C13.7761 4 14 3.77614 14 3.5C14 3.22386
+13.7761 3 13.5 3H1.5ZM1 7.5C1 7.22386 1.22386 7 1.5 7H13.5C13.7761 7 14 7.22386 14 7.5C14 7.77614 13.7761 8 13.5
+8H1.5C1.22386 8 1 7.77614 1 7.5ZM1 11.5C1 11.2239 1.22386 11 1.5 11H13.5C13.7761 11 14 11.2239 14 11.5C14 11.7761
+13.7761 12 13.5 12H1.5C1.22386 12 1 11.7761 1 11.5Z"
+				fill="currentColor"
+				fill-rule="evenodd"
+				clip-rule="evenodd"
 			/>
-	),
-});
+		</svg>);
+}

frontend/src/index.scss

@@ -13,10 +13,8 @@
 	src: url(/public/fonts/IDFVoyageur-Medium.otf);
 }
 
-body {
+html, body {
 	aspect-ratio: 16/9;
-	width: 100vw;
-	height: none;
 
 	margin: 0;
 

frontend/src/passagesDisplay.scss

@@ -1,6 +1,7 @@
 @use "_common";
 @use "_utils";
 
+
 .passagesDisplay {
 	@extend %widget;
 
@@ -21,18 +22,24 @@
 		}
 
 		.menu {
+			aspect-ratio: 0.75;
 			height: $header-element-height;
-			aspect-ratio: 1;
+
 			margin-right: calc(30/1920*100%);
 			margin-left: auto;
+			border: $component-border;
+			border-radius: $component-border-radius;
 
 			button {
 				height: 100%;
-				aspect-ratio: 1;
 
-				background-color: var(--idfm-black);
-				border: $component-border;
-				border-radius: $component-border-radius;
+				border: 0;
+				color: var(--idfm-white);
+				background-color: transparent;
+
+				.iconHamburgerMenu {
+					width: 75%;
+				}
 			}
 		}
 

frontend/src/stopsSearchMenu.scss

@@ -1,222 +0,0 @@
-@use "_common";
-@use "_utils";
-
-.stopSearchMenu {
-	@extend %widget;
-
-	.inputGroup {
-		width: 50%;
-		// height: 5%;
-
-		// TODO: Setup hop-ui to avoid to have to overrride rules.
-		input {
-			color: var(--idfm-white);
-			font-family: IDFVoyageur-regular;
-		}
-	}
-
-	.title {
-		@extend %title;
-
-		display: flex;
-		justify-content: center;
-	}
-
-	.body {
-		@extend %body;
-
-		flex-direction: row;
-
-		.stopsPanels {
-			width: 50%;
-			height: 100%;
-
-			scroll-snap-type: y mandatory;
-			overflow-y: scroll;
-
-			.stopPanel {
-				scroll-snap-align: center;
-
-				.stop {
-					width: calc(1880/1920*100%);
-					height: calc(100% / 5);
-					// margin: 0 calc(20/1920*100%);
-					margin: 0 calc(10/1920*100%);
-
-					display: flex;
-					align-items: center;
-					flex-direction: row;
-
-					/* TODO: compute the border weight according to the parent height */
-					/* TODO: Disable border-bottom for the last .line  */
-					border-bottom: solid calc(2px);
-
-					cursor: default;
-
-					.name {
-						margin-left: calc(40/1920*100%);
-						width: 60%;
-						aspect-ratio: 2.5;
-
-						display: flex;
-						align-items: center;
-
-						font-family: IDFVoyageur-bold;
-					}
-
-					.lineRepr {
-						width: 40%;
-						aspect-ratio: 2.5;
-
-						display: flex;
-						flex-direction: row;
-						flex-wrap: wrap;
-						align-items: center;
-
-						.transportMode {
-							@extend %transportMode;
-
-							height: 50%;
-						}
-
-						.linesRepresentationMatrix {
-							@extend %busLinePicto; // Use the larger picto aspect-ratio
-							width: 75%;
-							aspect-ratio: 3;
-
-							display: flex;
-							flex-flow: row;
-							flex-wrap: wrap;
-
- 							%picto {
-								margin-left: 1%;
-								align-self: center;
-								justify-self: center;
-							}
-
-							%singleLinePicto {
-								@extend %picto;
-
-								height: 80%;
-							}
-
-							.transportMode {
-								@extend %transportMode;
-								@extend %picto;
-							}
-
-							.tramLinePicto {
-								@extendnd %tramLinePicto;
-								@extend %singleLinePicto;
-							}
-
-							.trainLinePicto {
-								@extend %trainLinePicto;
-								@extend %singleLinePicto;
-							}
-
-							.metroLinePicto {
-								@extend %metroLinePicto;
-								@extend %singleLinePicto;
-							}
-
-							.busLinePicto {
-								@extend %busLinePicto;
-								@extend %picto;
-
-								height: 40%;
-							}
-						}
-					}
-				}
-			}
-			.displayed {
-				display: block;
-			}
-		}
-
-		.map {
-			position: relative;
-
-			height: 100%;
-			width: 50%;
-
-			.ol-viewport {
-				@extend %body;
-				position: absolute;
-				margin: 0;
-			}
-
-			.popup {
-				@extend %body;
-				margin: 0;
-
-				position: absolute;
-				width: 100%;
-				height: 35%;
-
-				border: solid var(--idfm-white) calc(0.2*1vh);
-
-				background-color: var(--idfm-black);
-
-				z-index: 1;
-				visibility: hidden;
-
-				.header {
-					@extend %header;
-
-					color: var(--idfm-white);
-				}
-
-				.body {
-					@extend %body;
-
-					scroll-snap-type: y mandatory;
-					overflow-y: scroll;
-
-					.line {
-						scroll-snap-align: center;
-
-						height: calc(100% / 3);
-						margin: 0 calc(10/1920*100%);
-
-						display: flex;
-						flex-direction: row;
-						align-items: center;
-
-						font-family: IDFVoyageur-bold;
-
-						.busLinePicto {
-							@extend %busLinePicto;
-
-							height: 80%;
-							width: 30%;
-						}
-
-						.name {
-							width: 100%;
-							height: 60%;
-						}
-
-						div {
-							height: 100%;
-
-							svg {
-								max-width: 100%;
-								max-height: 100%;
-							}
-						}
-					}
-				}
-
-				.footer {
-					@extend %footer;
-				}
-			}
-
-			.displayed {
-				visibility: visible;
-			}
-		}
-	}
-}

frontend/src/stopsSearchMenu.tsx

@@ -1,770 +0,0 @@
-import { createContext, createEffect, createResource, createSignal, For, JSX, onMount, ParentComponent, Show, useContext, VoidComponent } from 'solid-js';
-import { createStore } from "solid-js/store";
-import { createScrollPosition } from "@solid-primitives/scroll";
-
-import { Input, InputLeftAddon, InputGroup } from "@hope-ui/solid";
-
-import OlFeature from 'ol/Feature';
-import OlMap from 'ol/Map';
-import OlView from 'ol/View';
-import { isEmpty as isEmptyExtend } from 'ol/extent';
-import { FeatureLike as OlFeatureLike } from 'ol/Feature';
-import OlOSM from 'ol/source/OSM';
-import OlOverlay from 'ol/Overlay';
-import OlPoint from 'ol/geom/Point';
-import OlPolygon from 'ol/geom/Polygon';
-import OlVectorSource from 'ol/source/Vector';
-import { fromLonLat, toLonLat } from 'ol/proj';
-import { Tile as OlTileLayer, Vector as OlVectorLayer } from 'ol/layer';
-import { Circle, Fill, Stroke, Style } from 'ol/style';
-import { easeOut } from 'ol/easing';
-import { getVectorContext } from 'ol/render';
-import { unByKey } from 'ol/Observable';
-
-import { register } from 'ol/proj/proj4';
-
-import proj4 from 'proj4';
-
-import { Stop, StopShape } from './types';
-import { PositionedPanel, renderLineTransportMode, renderLinePicto, ScrollingText, TransportModeWeights } from './utils';
-
-import { AppContextContext, AppContextStore } from "./appContext";
-import { BusinessDataContext, BusinessDataStore } from "./businessData";
-
-import "./stopsSearchMenu.scss";
-
-
-proj4.defs("EPSG:2154", "+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs");
-register(proj4);
-
-type ByStopIdMapFeatures = Record<number, OlFeature>;
-
-interface SearchStore {
-
-	getSearchText: () => string;
-	setSearchText: (text: string, businessDataStore: BusinessDataStore) => Promise<void>;
-	isSearchInProgress: () => boolean;
-
-	getFoundStops: () => Stop[];
-	setFoundStops: (stops: Stop[]) => void;
-
-	getDisplayedPanelId: () => number;
-	setDisplayedPanelId: (panelId: number) => void;
-
-	getPanels: () => PositionedPanel[];
-	setPanels: (panels: PositionedPanel[]) => void;
-
-	getHighlightedStop: () => Stop | undefined;
-	setHighlightedStop: (stop: Stop) => void;
-	resetHighlightedStop: () => void;
-
-	getMapFeature: (stopId: number) => OlFeature | undefined;
-	getAllMapFeatures: () => ByStopIdMapFeatures;
-	setMapFeature: (stopId: number, feature: OlFeature) => void;
-};
-
-const SearchContext = createContext<SearchStore>();
-
-function SearchProvider(props: { children: JSX.Element }) {
-
-	type Store = {
-		searchText: string;
-		searchInProgress: boolean;
-		foundStops: Stop[];
-		displayedPanelId: number;
-		panels: PositionedPanel[];
-		highlightedStop: Stop | undefined;
-		mapFeatures: ByStopIdMapFeatures;
-	};
-
-	const [store, setStore] = createStore<Store>({
-		searchText: "",
-		searchInProgress: false,
-		foundStops: [],
-		displayedPanelId: 0,
-		panels: [],
-		highlightedStop: undefined,
-		mapFeatures: {},
-	});
-
-	const getSearchText = (): string => {
-		return store.searchText;
-	}
-
-	const setSearchText = async (text: string, businessDataStore: BusinessDataStore): Promise<void> => {
-		setStore('searchInProgress', true);
-
-		setStore('searchText', text);
-
-		const { searchStopByName } = businessDataStore;
-		console.log("store.searchText=", store.searchText);
-		const stopsById = await searchStopByName(store.searchText);
-		console.log("stopsById=", stopsById);
-		setFoundStops(Object.values(stopsById));
-
-		setStore('searchInProgress', false);
-	}
-
-	const isSearchInProgress = (): boolean => {
-		return store.searchInProgress;
-	}
-
-	const getFoundStops = (): Stop[] => {
-		return store.foundStops;
-	}
-
-	const setFoundStops = (stops: Stop[]): void => {
-		setStore('foundStops', stops);
-	}
-
-	const getDisplayedPanelId = (): number => {
-		return store.displayedPanelId;
-	}
-
-	const setDisplayedPanelId = (panelId: number): void => {
-		setStore('displayedPanelId', panelId);
-	}
-
-	const getPanels = (): PositionedPanel[] => {
-		return store.panels;
-	}
-
-	const setPanels = (panels: PositionedPanel[]): void => {
-		setStore('panels', panels);
-	}
-
-	const getHighlightedStop = (): Stop | undefined => {
-		return store.highlightedStop;
-	}
-
-	const setHighlightedStop = (stop: Stop): void => {
-		setStore('highlightedStop', stop);
-	}
-
-	const resetHighlightedStop = (): void => {
-		setStore('highlightedStop', undefined);
-	}
-
-
-	const getAllMapFeatures = (): ByStopIdMapFeatures => {
-		return store.mapFeatures;
-	}
-
-	const getMapFeature = (stopId: number): OlFeature | undefined => {
-		return store.mapFeatures[stopId];
-	}
-
-	const setMapFeature = (stopId: number, feature: OlFeature): void => {
-		setStore('mapFeatures', stopId, feature);
-	};
-
-
-	return (
-		<SearchContext.Provider value={{
-			getSearchText, setSearchText, isSearchInProgress,
-			getFoundStops, setFoundStops,
-			getDisplayedPanelId, setDisplayedPanelId,
-			getPanels, setPanels,
-			getHighlightedStop, setHighlightedStop, resetHighlightedStop,
-			getMapFeature, getAllMapFeatures, setMapFeature,
-		}}>
-			{props.children}
-		</SearchContext.Provider>
-	);
-}
-
-
-const Header: VoidComponent<{ title: string, minCharsNb: number }> = (props) => {
-
-	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
-	const searchStore: SearchStore | undefined = useContext(SearchContext);
-
-	if (businessDataStore === undefined || searchStore === undefined)
-		return <div />;
-
-	const { isSearchInProgress, setSearchText } = searchStore;
-
-	const onStopNameInput: JSX.EventHandler<HTMLInputElement, InputEvent> = async (event): Promise<void> => {
-		/* TODO: Add a tempo before fetching stop for giving time to user to finish his request */
-		const stopName = event.currentTarget.value;
-		if (stopName.length >= props.minCharsNb) {
-			console.log(`Fetching data for "${stopName}" stop name`);
-			await setSearchText(stopName, businessDataStore);
-		}
-	}
-
-	return (
-		<div class="header">
-			<div class="title">
-				<svg viewBox="0 0 1260 50">
-					<text x="0" y="50%" dominant-baseline="middle" font-size="50" style="fill: #ffffff">
-						{props.title}
-					</text>
-				</svg>
-			</div>
-			<div class="inputGroup">
-				<InputGroup >
-					<InputLeftAddon>🚉 🚏</InputLeftAddon>
-					<Input onInput={onStopNameInput} readOnly={isSearchInProgress()} placeholder="Stop name..." />
-				</InputGroup>
-			</div>
-		</div >
-	);
-};
-
-
-const StopRepr: VoidComponent<{ stop: Stop }> = (props) => {
-	const fontSize: number = 40;
-
-	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
-	if (businessDataStore === undefined)
-		return <div />;
-
-	const { getLine } = businessDataStore;
-
-	const fetchLinesRepr = async (lineIds: string[]): Promise<JSX.Element[]> => {
-		const reprs = [];
-		for (const lineId of lineIds) {
-			const line = await getLine(lineId);
-			if (line !== undefined) {
-				reprs.push(<div class="transportMode">{renderLineTransportMode(line)}</div>);
-				reprs.push(renderLinePicto(line));
-			}
-		}
-		return reprs;
-	}
-
-	const [lineReprs] = createResource<JSX.Element[], string[]>(props.stop.lines, fetchLinesRepr);
-
-	return (
-		<div class="stop">
-			<svg class="name" viewBox={`0 0 215 ${fontSize}`}>
-				<text
-					x="100%" y="55%"
-					dominant-baseline="middle" text-anchor="end"
-					font-size={fontSize}>
-					{props.stop.name}
-				</text>
-			</svg>
-			<For each={lineReprs()}>{(line: JSX.Element) => line}</For>
-		</div>
-	);
-}
-
-
-type ByTransportModeReprs = {
-	mode: JSX.Element | undefined;
-	lines: Record<string, JSX.Element | JSX.Element[] | undefined>;
-}
-
-const StopAreaRepr: VoidComponent<{ stop: Stop }> = (props) => {
-	const fontSize: number = 10;
-
-	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
-	const appContextStore: AppContextStore | undefined = useContext(AppContextContext);
-	const searchStore: SearchStore | undefined = useContext(SearchContext);
-
-	if (businessDataStore === undefined || appContextStore === undefined || searchStore === undefined)
-		return <div />;
-
-	const { getLine } = businessDataStore;
-	const { setDisplayedStops } = appContextStore;
-	const { setHighlightedStop, resetHighlightedStop } = searchStore;
-
-
-	const fetchLinesRepr = async (stop: Stop): Promise<JSX.Element> => {
-		const lineIds = new Set(stop.lines);
-		const stops = stop.stops;
-		for (const stop of stops) {
-			stop.lines.forEach(lineIds.add, lineIds);
-		}
-
-		const byModeReprs: Record<string, ByTransportModeReprs> = {};
-		for (const lineId of lineIds) {
-			const line = await getLine(lineId);
-			if (line !== undefined) {
-				if (!(line.transportMode in byModeReprs)) {
-					byModeReprs[line.transportMode] = {
-						mode: <div class="transportMode">{renderLineTransportMode(line)}</div>,
-						lines: {}
-					};
-				}
-				byModeReprs[line.transportMode].lines[line.shortName] = renderLinePicto(line);
-			}
-		}
-
-		const sortedTransportModes = Object.keys(byModeReprs).sort((x, y) => TransportModeWeights[x] <
-			TransportModeWeights[y] ? 1 : -1);
-
-		return (
-			<div class="lineRepr">
-				<For each={sortedTransportModes}>{(transportMode) => {
-					const reprs = byModeReprs[transportMode];
-					const lineNames = Object.keys(reprs.lines).sort((x, y) => x.localeCompare(y));
-					return <>
-						{reprs.mode}
-						<div class="linesRepresentationMatrix">
-							<For each={lineNames}>{(lineName) => reprs.lines[lineName]}</For>
-						</div>
-					</>
-				}}
-				</For>
-			</div >
-		);
-	}
-	const [lineReprs] = createResource(props.stop, fetchLinesRepr);
-
-	return (
-		<div
-			class="stop"
-			onClick={() => setDisplayedStops([props.stop])}
-			onMouseEnter={() => setHighlightedStop(props.stop)}
-			onMouseLeave={resetHighlightedStop}
-		>
-			<div class="name" >
-				<ScrollingText height={fontSize} width={100} content={props.stop.name} />
-			</div>
-			{lineReprs()}
-		</div>
-	);
-}
-
-const StopsPanel: ParentComponent<{ stops: Stop[], show: boolean }> = (props) => {
-
-	return (
-		<div classList={{ "stopPanel": true, "displayed": props.show }}>
-			<For each={props.stops.sort((x, y) => x.name.localeCompare(y.name))}>
-				{(stop) => {
-					return <Show when={stop.stops !== undefined} fallback={<StopRepr stop={stop} />}>
-						<StopAreaRepr stop={stop} />
-					</Show>;
-				}}
-			</For>
-		</div>
-	);
-}
-
-const StopsPanels: ParentComponent<{ maxStopsPerPanel: number }> = (props) => {
-	const searchStore: SearchStore | undefined = useContext(SearchContext);
-
-	if (searchStore === undefined) {
-		return <div />;
-	}
-
-	const { getDisplayedPanelId, getFoundStops, getPanels, setDisplayedPanelId, setPanels } = searchStore;
-
-	let stopsPanelsRef: HTMLDivElement | undefined = undefined
-	const stopsPanelsScroll = createScrollPosition(() => stopsPanelsRef);
-	const yStopsPanelsScroll = () => stopsPanelsScroll.y;
-
-	createEffect(() => {
-		yStopsPanelsScroll();
-
-		for (const panel of getPanels()) {
-			const panelDiv = panel.panel();
-			const panelDivClientRect = panelDiv.getBoundingClientRect();
-			if (panelDivClientRect.y > 0) {
-				setDisplayedPanelId(panel.position);
-				break;
-			}
-		}
-	});
-
-	return (
-		<div ref={stopsPanelsRef} class="stopsPanels">
-			{() => {
-				setPanels([]);
-
-				let newPanels = [];
-				let positioneds: PositionedPanel[] = [];
-
-				let stops: Stop[] = [];
-
-				for (const stop of getFoundStops()) {
-					if (stops.length < props.maxStopsPerPanel) {
-						stops.push(stop);
-					}
-					else {
-						const panelId = newPanels.length;
-						const panel = <StopsPanel stops={stops} show={panelId == getDisplayedPanelId()} />;
-						newPanels.push(panel);
-						positioneds.push({ position: panelId, panel: panel });
-						stops = [stop];
-					}
-				}
-				if (stops.length) {
-					const panelId = newPanels.length;
-					const panel = <StopsPanel stops={stops} show={panelId == getDisplayedPanelId()} />;
-					newPanels.push(panel);
-					positioneds.push({ position: panelId, panel: panel });
-				}
-
-				setPanels(positioneds);
-
-				return newPanels;
-			}}
-		</div>
-	);
-}
-
-
-const StopPopup: ParentComponent<{ stop: Stop, show: boolean }> = (props) => {
-	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
-	if (businessDataStore === undefined)
-		return <div />;
-
-	const { getLine, getStopDestinations } = businessDataStore;
-
-	let popupDiv: HTMLDivElement | undefined = undefined;
-
-	const getDestinations = async (stop: Stop): Promise<{ lineId: string, destinations: string[] }[]> => {
-		let ret = [];
-
-		if (stop !== undefined) {
-			const result = await getStopDestinations(stop.id);
-			for (const [lineId, destinations] of Object.entries(result)) {
-				const line = await getLine(lineId);
-				const linePicto = renderLinePicto(line);
-				ret.push({ lineId: linePicto, destinations: destinations });
-			}
-		}
-
-		return ret;
-	}
-	const [destinations] = createResource(() => props.stop, getDestinations);
-
-	return (
-		<div ref={popupDiv} classList={{ "popup": true, "displayed": props.show }}>
-			<div class="header">{props.stop?.name}</div>
-			<div class="body">
-				<For each={destinations()}>
-					{(dst) => {
-						return <div class='line'>
-							{dst.lineId}
-							<div class="name">
-								<ScrollingText height={10} width={130} content={dst.destinations.join('/')} />
-							</div>
-						</div>;
-					}}
-				</For>
-			</div>
-		</div >
-	);
-}
-
-
-// TODO: Use boolean to set MapStop selected
-const MapStop: VoidComponent<{ stop: Stop, selected: Stop | undefined }> = (props) => {
-	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
-	const searchStore: SearchStore | undefined = useContext(SearchContext);
-	if (businessDataStore === undefined || searchStore === undefined)
-		return <div />;
-
-	const { getStopShape } = businessDataStore;
-	const { setMapFeature } = searchStore;
-
-	const stopStyle = new Style({
-		image: new Circle({
-			fill: undefined,
-			stroke: new Stroke({ color: '#3399CC', width: 1.5 }),
-			radius: 10,
-		}),
-	});
-
-	const selectedStopStyle = new Style({
-		image: new Circle({
-			fill: undefined,
-			stroke: new Stroke({ color: 'purple', width: 2 }),
-			radius: 10,
-		}),
-	});
-
-	const stopAreaStyle = new Style({
-		stroke: new Stroke({ color: 'red' }),
-		fill: new Fill({ color: 'rgba(255,255,255,0.2)' }),
-	});
-
-	const getShape = async (stopId: number): Promise<StopShape | undefined> => {
-		return await getStopShape(stopId);
-	};
-	const [shape] = createResource<StopShape | undefined, number>(props.stop.id, getShape);
-
-	createEffect(() => {
-		const shape_ = shape();
-
-		if (shape_ === undefined) {
-			return;
-		}
-
-		let feature = undefined;
-
-		if (props.stop.lat !== undefined && props.stop.lon !== undefined) {
-			const selectStopStyle = () => {
-				return (props.selected?.id === props.stop.id ? selectedStopStyle : stopStyle);
-			}
-
-			feature = new OlFeature({
-				geometry: new OlPoint(fromLonLat([props.stop.lon, props.stop.lat])),
-			});
-
-			feature.setStyle(selectStopStyle);
-		}
-
-		else {
-			let geometry = undefined;
-			const areaShape = shape();
-			if (areaShape !== undefined) {
-				const transformed = areaShape.points.map(point => fromLonLat(toLonLat(point, 'EPSG:2154')));
-				geometry = new OlPolygon([transformed.slice(0, -1)]);
-			}
-			else {
-				geometry = new OlPoint(fromLonLat([props.stop.lon, props.stop.lat]));
-			}
-			feature = new OlFeature({ geometry: geometry });
-			feature.setStyle(stopAreaStyle);
-		}
-		feature.setId(props.stop.id);
-
-		setMapFeature(props.stop.id, feature);
-	});
-
-	return <For each={props.stop.stops}>{stop => <MapStop stop={stop} selected={props.selected} />}</For>;
-}
-
-
-const Map: ParentComponent<{}> = () => {
-	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
-	const searchStore: SearchStore | undefined = useContext(SearchContext);
-	if (businessDataStore === undefined || searchStore === undefined)
-		return <div />;
-
-	const { getStop } = businessDataStore;
-	const { getAllMapFeatures, getFoundStops, getHighlightedStop } = searchStore;
-
-	const [selectedMapStop, setSelectedMapStop] = createSignal<Stop | undefined>(undefined);
-	const [isPopupDisplayed, setPopupDisplayed] = createSignal<boolean>(false);
-
-	const mapCenter = [260769.80336542107, 6250587.867330259]; // EPSG:3857
-	const fitDurationMs = 1500;
-	const flashDurationMs = 2000;
-	// TODO: Set padding according to the marker design.
-	const fitPointsPadding = [50, 50, 50, 50];
-
-	let mapDiv: HTMLDivElement | undefined = undefined;
-	let popup: StopPopup | undefined = undefined;
-
-	const stopVectorSource = new OlVectorSource({ features: [] });
-	const stopVectorLayer = new OlVectorLayer({ source: stopVectorSource });
-
-	let overlay: OlOverlay | undefined = undefined;
-	let map: OlMap | undefined = undefined;
-
-	const displayedFeatures: Record<number, OlFeature> = {};
-
-	const buildMap = (div: HTMLDivElement): void => {
-		overlay = new OlOverlay({
-			element: popup,
-			autoPan: {
-				animation: {
-					duration: 250,
-				},
-			},
-		});
-		map = new OlMap({
-			target: div,
-			controls: [], // remove controls
-			view: new OlView({
-				center: mapCenter,
-				zoom: 10,
-			}),
-			layers: [
-				new OlTileLayer({
-					source: new OlOSM(),
-				}),
-				stopVectorLayer,
-			],
-			overlays: [overlay],
-		});
-		map.on('singleclick', onClickedMap);
-	}
-
-	const onClickedMap = async (event): Promise<void> => {
-		const features = await stopVectorLayer.getFeatures(event.pixel);
-		// Handle only the first feature
-		if (features.length > 0) {
-			await onClickedFeature(features[0]);
-		}
-		else {
-			setPopupDisplayed(false);
-			setSelectedMapStop(undefined);
-		}
-	}
-
-	const onClickedFeature = async (feature: OlFeatureLike): Promise<void> => {
-		const stopId: number = feature.getId();
-		const stop = getStop(stopId);
-		// TODO: Handle StopArea (use center given by the backend)
-		if (stop?.lat !== undefined && stop?.lon !== undefined) {
-			setSelectedMapStop(stop);
-			map?.getView().animate(
-				{
-					center: fromLonLat([stop.lon, stop.lat]),
-					duration: 1000
-				},
-				// Display the popup once the animation finished
-				() => setPopupDisplayed(true)
-			);
-		}
-	}
-
-	onMount(() => buildMap(mapDiv));
-
-	// Filling the map with stops shape
-	createEffect(() => {
-		const stops = getFoundStops();
-		const foundStopIds = new Set();
-		for (const foundStop of stops) {
-			foundStopIds.add(foundStop.id);
-			foundStop.stops.forEach(s => foundStopIds.add(s.id));
-		}
-
-		for (const [stopIdStr, feature] of Object.entries(displayedFeatures)) {
-			const stopId = parseInt(stopIdStr);
-			if (!foundStopIds.has(stopId)) {
-				console.log(`Remove feature for ${stopId}`);
-				stopVectorSource.removeFeature(feature);
-				delete displayedFeatures[stopId];
-			}
-		}
-
-		const features = getAllMapFeatures();
-		for (const [stopIdStr, feature] of Object.entries(features)) {
-			const stopId = parseInt(stopIdStr);
-			if (foundStopIds.has(stopId) && !(stopId in displayedFeatures)) {
-				console.log(`Add feature for ${stopId}`);
-				stopVectorSource.addFeature(feature);
-				displayedFeatures[stopId] = feature;
-			}
-		}
-
-		const extend = stopVectorSource.getExtent();
-		if (map !== undefined && !isEmptyExtend(extend)) {
-			map.getView().fit(extend, { duration: fitDurationMs, padding: fitPointsPadding });
-		}
-	});
-
-	// Flashing effect
-	createEffect(() => {
-		const highlightedStopId = getHighlightedStop()?.id;
-		if (highlightedStopId !== undefined) {
-			const stop = getStop(highlightedStopId);
-			if (stop !== undefined) {
-				const stops = stop.stops ? stop.stops : [stop];
-				stops.forEach((s) => {
-					const feature = displayedFeatures[s.id];
-					if (feature !== undefined) {
-						flash(feature);
-					}
-				});
-			}
-		}
-	});
-
-	const flash = (feature: OlFeature) => {
-		const start = Date.now();
-		const flashGeom = feature.getGeometry()?.clone();
-		const listenerKey = stopVectorLayer.on('postrender', animate);
-
-		// Force postrender raising.
-		feature.changed();
-
-		function animate(event) {
-			const frameState = event.frameState;
-			const elapsed = frameState.time - start;
-			const vectorContext = getVectorContext(event);
-
-			if (elapsed >= flashDurationMs) {
-				unByKey(listenerKey);
-				return;
-			}
-
-			if (flashGeom !== undefined && map !== undefined) {
-				const elapsedRatio = elapsed / flashDurationMs;
-				// radius will be 5 at start and 30 at end.
-				const radius = easeOut(elapsedRatio) * 25 + 5;
-				const opacity = easeOut(1 - elapsedRatio);
-
-				const style = new Style({
-					image: new Circle({
-						radius: radius,
-						stroke: new Stroke({
-							color: `rgba(255, 0, 0, ${opacity})`,
-							width: 0.25 + opacity,
-						}),
-					}),
-				});
-
-				vectorContext.setStyle(style);
-				vectorContext.drawGeometry(flashGeom);
-
-				// tell OpenLayers to continue postrender animation
-				map.render();
-			}
-		}
-	}
-
-	return <>
-		<div ref={mapDiv} class="map">
-			<StopPopup ref={popup} stop={selectedMapStop()} show={isPopupDisplayed()} />
-		</div>
-		<For each={getFoundStops()}>{(stop) => <MapStop stop={stop} selected={selectedMapStop()} />}</For>
-	</>;
-}
-
-const Footer: VoidComponent<{}> = () => {
-
-	const searchStore: SearchStore | undefined = useContext(SearchContext);
-
-	if (searchStore === undefined) {
-		return <div />;
-	}
-
-	const { getDisplayedPanelId, getPanels } = searchStore;
-
-	return (
-		<div class="footer">
-			<For each={getPanels()}>
-				{(panel) => {
-					const position = panel.position;
-					return (
-						<div>
-							<svg viewBox="0 0 29 29">
-								<circle cx="50%" cy="50%" r="13" stroke="#ffffff" stroke-width="3"
-									style={{ fill: `var(--idfm-${position == getDisplayedPanelId() ? "white" : "black"})` }}
-								/>
-							</svg>
-						</div>
-					);
-				}}
-			</For>
-		</div>
-	);
-}
-
-export const StopsSearchMenu: VoidComponent = () => {
-
-	const maxStopsPerPanel = 5;
-
-	return (
-		<div class="stopSearchMenu">
-			<SearchProvider>
-				<Header title="Recherche de l'arrêt..." minCharsNb={4} />
-				<div class="body">
-					<StopsPanels maxStopsPerPanel={maxStopsPerPanel} />
-					<Map />
-				</div>
-				<Footer />
-			</SearchProvider>
-		</div>
-	);
-};

frontend/src/stopsSearchMenu/map.scss

@@ -0,0 +1,87 @@
+@use "../_common";
+@use "../_utils";
+
+
+.map {
+	position: relative;
+
+	height: 100%;
+	width: 50%;
+
+	.ol-viewport {
+		@extend %body;
+		position: absolute;
+		margin: 0;
+	}
+
+	.popup {
+		@extend %body;
+		margin: 0;
+
+		position: absolute;
+		width: 100%;
+		height: 35%;
+
+		border: solid var(--idfm-white) calc(0.2*1vh);
+
+		background-color: var(--idfm-black);
+
+		z-index: 1;
+		visibility: hidden;
+
+		.header {
+			@extend %header;
+
+			color: var(--idfm-white);
+		}
+
+		.body {
+			@extend %body;
+
+			scroll-snap-type: y mandatory;
+			overflow-y: scroll;
+
+			.line {
+				scroll-snap-align: center;
+
+				height: calc(100% / 3);
+				margin: 0 calc(10/1920*100%);
+
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+
+				font-family: IDFVoyageur-bold;
+
+				.busLinePicto {
+					@extend %busLinePicto;
+
+					height: 80%;
+					width: 30%;
+				}
+
+				.name {
+					width: 100%;
+					height: 60%;
+				}
+
+				div {
+					height: 100%;
+
+					svg {
+								max-width: 100%;
+								max-height: 100%;
+					}
+				}
+			}
+		}
+
+		.footer {
+			@extend %footer;
+		}
+	}
+
+	.displayed {
+		visibility: visible;
+	}
+}

frontend/src/stopsSearchMenu/map.tsx

@@ -0,0 +1,213 @@
+import { createEffect, createSignal, For, onMount, ParentComponent, useContext } from 'solid-js';
+import OlFeature from 'ol/Feature';
+import OlMap from 'ol/Map';
+import OlView from 'ol/View';
+import { isEmpty as isEmptyExtend } from 'ol/extent';
+import { FeatureLike as OlFeatureLike } from 'ol/Feature';
+import OlOSM from 'ol/source/OSM';
+import OlOverlay from 'ol/Overlay';
+import OlVectorSource from 'ol/source/Vector';
+import { Tile as OlTileLayer, Vector as OlVectorLayer } from 'ol/layer';
+import { Circle, Stroke, Style } from 'ol/style';
+import { easeOut } from 'ol/easing';
+import { getVectorContext } from 'ol/render';
+import { unByKey } from 'ol/Observable';
+
+import { Stop } from '../types';
+import { BusinessDataContext, BusinessDataStore } from "../businessData";
+import { SearchContext, SearchStore } from "./searchStore";
+import { MapStop } from "./mapStop";
+import { StopPopup } from "./stopPopup";
+
+
+import "./map.scss";
+
+
+export const Map: ParentComponent<{}> = () => {
+	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+	if (businessDataStore === undefined || searchStore === undefined)
+		return <div />;
+
+	const { getStop } = businessDataStore;
+	const { getAllMapFeatures, getFoundStops, getHighlightedStop } = searchStore;
+
+	const [selectedMapStop, setSelectedMapStop] = createSignal<Stop | undefined>(undefined);
+	const [isPopupDisplayed, setPopupDisplayed] = createSignal<boolean>(false);
+
+	const mapCenter = [260769.80336542107, 6250587.867330259]; // EPSG:3857
+	const fitDurationMs = 1500;
+	const flashDurationMs = 2000;
+	// TODO: Set padding according to the marker design.
+	const fitPointsPadding = [50, 50, 50, 50];
+
+	let mapDiv: HTMLDivElement | undefined = undefined;
+	let popup: StopPopup | undefined = undefined;
+
+	const stopVectorSource = new OlVectorSource({ features: [] });
+	const stopVectorLayer = new OlVectorLayer({ source: stopVectorSource });
+
+	let overlay: OlOverlay | undefined = undefined;
+	let map: OlMap | undefined = undefined;
+
+	const displayedFeatures: Record<number, OlFeature> = {};
+
+	const buildMap = (div: HTMLDivElement): void => {
+		overlay = new OlOverlay({
+			element: popup,
+			autoPan: {
+				animation: {
+					duration: 250,
+				},
+			},
+		});
+		map = new OlMap({
+			target: div,
+			controls: [], // remove controls
+			view: new OlView({
+				center: mapCenter,
+				zoom: 10,
+			}),
+			layers: [
+				new OlTileLayer({
+					source: new OlOSM(),
+				}),
+				stopVectorLayer,
+			],
+			overlays: [overlay],
+		});
+		map.on('singleclick', onClickedMap);
+	}
+
+	const onClickedMap = async (event): Promise<void> => {
+		const features = await stopVectorLayer.getFeatures(event.pixel);
+		// Handle only the first feature
+		if (features.length > 0) {
+			await onClickedFeature(features[0]);
+		}
+		else {
+			setPopupDisplayed(false);
+			setSelectedMapStop(undefined);
+		}
+	}
+
+	const onClickedFeature = async (feature: OlFeatureLike): Promise<void> => {
+		const stopId: number = feature.getId();
+		const stop = getStop(stopId);
+		// TODO: Handle StopArea (use center given by the backend)
+		if (stop?.epsg3857_x !== undefined && stop?.epsg3857_y !== undefined) {
+			setSelectedMapStop(stop);
+			map?.getView().animate(
+				{
+					center: [stop.epsg3857_x, stop.epsg3857_y],
+					duration: 1000
+				},
+				// Display the popup once the animation finished
+				() => setPopupDisplayed(true)
+			);
+		}
+	}
+
+	onMount(() => buildMap(mapDiv));
+
+	// Filling the map with stops shape
+	createEffect(() => {
+		const stops = getFoundStops();
+		const foundStopIds = new Set();
+		for (const foundStop of stops) {
+			foundStopIds.add(foundStop.id);
+			foundStop.stops.forEach(s => foundStopIds.add(s.id));
+		}
+
+		for (const [stopIdStr, feature] of Object.entries(displayedFeatures)) {
+			const stopId = parseInt(stopIdStr);
+			if (!foundStopIds.has(stopId)) {
+				console.log(`Remove feature for ${stopId}`);
+				stopVectorSource.removeFeature(feature);
+				delete displayedFeatures[stopId];
+			}
+		}
+
+		const features = getAllMapFeatures();
+		for (const [stopIdStr, feature] of Object.entries(features)) {
+			const stopId = parseInt(stopIdStr);
+			if (foundStopIds.has(stopId) && !(stopId in displayedFeatures)) {
+				console.log(`Add feature for ${stopId}`);
+				stopVectorSource.addFeature(feature);
+				displayedFeatures[stopId] = feature;
+			}
+		}
+
+		const extend = stopVectorSource.getExtent();
+		if (map !== undefined && !isEmptyExtend(extend)) {
+			map.getView().fit(extend, { duration: fitDurationMs, padding: fitPointsPadding });
+		}
+	});
+
+	// Flashing effect
+	createEffect(() => {
+		const highlightedStopId = getHighlightedStop()?.id;
+		if (highlightedStopId !== undefined) {
+			const stop = getStop(highlightedStopId);
+			if (stop !== undefined) {
+				const stops = stop.stops ? stop.stops : [stop];
+				stops.forEach((s) => {
+					const feature = displayedFeatures[s.id];
+					if (feature !== undefined) {
+						flash(feature);
+					}
+				});
+			}
+		}
+	});
+
+	const flash = (feature: OlFeature) => {
+		const start = Date.now();
+		const flashGeom = feature.getGeometry()?.clone();
+		const listenerKey = stopVectorLayer.on('postrender', animate);
+
+		// Force postrender raising.
+		feature.changed();
+
+		function animate(event) {
+			const frameState = event.frameState;
+			const elapsed = frameState.time - start;
+			const vectorContext = getVectorContext(event);
+
+			if (elapsed >= flashDurationMs) {
+				unByKey(listenerKey);
+				return;
+			}
+
+			if (flashGeom !== undefined && map !== undefined) {
+				const elapsedRatio = elapsed / flashDurationMs;
+				// radius will be 5 at start and 30 at end.
+				const radius = easeOut(elapsedRatio) * 25 + 5;
+				const opacity = easeOut(1 - elapsedRatio);
+
+				const style = new Style({
+					image: new Circle({
+						radius: radius,
+						stroke: new Stroke({
+							color: `rgba(255, 0, 0, ${opacity})`,
+							width: 0.25 + opacity,
+						}),
+					}),
+				});
+
+				vectorContext.setStyle(style);
+				vectorContext.drawGeometry(flashGeom);
+
+				// tell OpenLayers to continue postrender animation
+				map.render();
+			}
+		}
+	}
+
+	return <>
+		<div ref={mapDiv} class="map">
+			<StopPopup ref={popup} stop={selectedMapStop()} show={isPopupDisplayed()} />
+		</div>
+		<For each={getFoundStops()}>{(stop) => <MapStop stop={stop} selected={selectedMapStop()} />}</For>
+	</>;
+}

frontend/src/stopsSearchMenu/mapStop.tsx

@@ -0,0 +1,85 @@
+import { createEffect, createResource, For, useContext, VoidComponent } from 'solid-js';
+import { Circle, Fill, Stroke, Style } from 'ol/style';
+import OlFeature from 'ol/Feature';
+import OlPoint from 'ol/geom/Point';
+import OlPolygon from 'ol/geom/Polygon';
+
+import { Stop, StopShape } from '../types';
+import { BusinessDataContext, BusinessDataStore } from "../businessData";
+import { SearchContext, SearchStore } from "./searchStore";
+
+
+// TODO: Use boolean to set MapStop selected
+export const MapStop: VoidComponent<{ stop: Stop, selected: Stop | undefined }> = (props) => {
+	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+	if (businessDataStore === undefined || searchStore === undefined)
+		return <div />;
+
+	const { getStopShape } = businessDataStore;
+	const { setMapFeature } = searchStore;
+
+	const stopStyle = new Style({
+		image: new Circle({
+			fill: undefined,
+			stroke: new Stroke({ color: '#3399CC', width: 1.5 }),
+			radius: 10,
+		}),
+	});
+
+	const selectedStopStyle = new Style({
+		image: new Circle({
+			fill: undefined,
+			stroke: new Stroke({ color: 'purple', width: 2 }),
+			radius: 10,
+		}),
+	});
+
+	const stopAreaStyle = new Style({
+		stroke: new Stroke({ color: 'red' }),
+		fill: new Fill({ color: 'rgba(255,255,255,0.2)' }),
+	});
+
+	const getShape = async (stopId: number): Promise<StopShape | undefined> => {
+		return await getStopShape(stopId);
+	};
+	const [shape] = createResource<StopShape | undefined, number>(props.stop.id, getShape);
+
+	createEffect(() => {
+		const shape_ = shape();
+
+		if (shape_ === undefined) {
+			return;
+		}
+
+		let feature = undefined;
+
+		if (props.stop.epsg3857_x !== undefined && props.stop.epsg3857_y !== undefined) {
+			const selectStopStyle = () => {
+				return (props.selected?.id === props.stop.id ? selectedStopStyle : stopStyle);
+			}
+			feature = new OlFeature({
+				geometry: new OlPoint([props.stop.epsg3857_x, props.stop.epsg3857_y]),
+			});
+			feature.setStyle(selectStopStyle);
+		}
+
+		else {
+			let geometry = undefined;
+			const areaShape = shape();
+			if (areaShape !== undefined) {
+				geometry = new OlPolygon([areaShape.epsg3857_points.slice(0, -1)]);
+			}
+			else {
+				geometry = new OlPoint([props.stop.epsg3857_x, props.stop.epsg3857_y]);
+			}
+			feature = new OlFeature({ geometry: geometry });
+			feature.setStyle(stopAreaStyle);
+		}
+		feature.setId(props.stop.id);
+
+		setMapFeature(props.stop.id, feature);
+	});
+
+	return <For each={props.stop.stops}>{stop => <MapStop stop={stop} selected={props.selected} />}</For>;
+}

frontend/src/stopsSearchMenu/searchStore.tsx

@@ -0,0 +1,165 @@
+import { createContext, JSX } from 'solid-js';
+import { createStore } from "solid-js/store";
+import OlFeature from 'ol/Feature';
+import { BusinessDataStore } from "../businessData";
+
+import { Stop } from '../types';
+import { PositionedPanel } from '../utils';
+
+type ByStopIdMapFeatures = Record<number, OlFeature>;
+
+export interface SearchStore {
+
+	getSearchText: () => string;
+	setSearchText: (text: string, businessDataStore: BusinessDataStore) => Promise<void>;
+
+	getFoundStops: () => Stop[];
+	setFoundStops: (stops: Stop[]) => void;
+
+	getDisplayedPanelId: () => number;
+	setDisplayedPanelId: (panelId: number) => void;
+
+	getPanels: () => PositionedPanel[];
+	setPanels: (panels: PositionedPanel[]) => void;
+
+	getHighlightedStop: () => Stop | undefined;
+	setHighlightedStop: (stop: Stop) => void;
+	resetHighlightedStop: () => void;
+
+	enableMap: (enable: boolean) => void;
+	isMapEnabled: () => boolean;
+	getMapFeature: (stopId: number) => OlFeature | undefined;
+	getAllMapFeatures: () => ByStopIdMapFeatures;
+	setMapFeature: (stopId: number, feature: OlFeature) => void;
+};
+
+export const SearchContext = createContext<SearchStore>();
+
+
+export function SearchProvider(props: { children: JSX.Element }) {
+
+	const searchTextDelayMs = 1500;
+
+	type Store = {
+		searchText: string;
+		searchPromise: Promise<void> | undefined;
+		foundStops: Stop[];
+		displayedPanelId: number;
+		panels: PositionedPanel[];
+		highlightedStop: Stop | undefined;
+		mapEnabled: boolean;
+		mapFeatures: ByStopIdMapFeatures;
+	};
+
+	const [store, setStore] = createStore<Store>({
+		searchText: "",
+		searchPromise: undefined,
+		foundStops: [],
+		displayedPanelId: 0,
+		panels: [],
+		highlightedStop: undefined,
+		// mapEnabled: false,
+		mapFeatures: {},
+	});
+
+	const getSearchText = (): string => {
+		return store.searchText;
+	}
+
+	const debounce = async (fn: (...args: any[]) => Promise<void>, delayMs: number) => {
+		let timerId: number;
+		return new Promise((...args) => {
+			clearTimeout(timerId);
+			timerId = setTimeout(fn, delayMs, ...args);
+		});
+	}
+
+	const setSearchText = async (text: string, businessDataStore: BusinessDataStore): Promise<void> => {
+		setStore('searchText', text);
+
+		if (store.searchPromise === undefined) {
+			const { searchStopByName } = businessDataStore;
+			const promise: Promise<void> = debounce(async (onSuccess: () => void) => {
+				console.log(`Fetching data for "${store.searchText}" stop name`);
+				const stopsById = await searchStopByName(store.searchText);
+				console.log("stopsById=", stopsById);
+				setFoundStops(Object.values(stopsById));
+				onSuccess();
+			}, searchTextDelayMs).then(() => {
+				setStore('searchPromise', undefined);
+			});
+			setStore('searchPromise', promise);
+		}
+	}
+
+	const getFoundStops = (): Stop[] => {
+		return store.foundStops;
+	}
+
+	const setFoundStops = (stops: Stop[]): void => {
+		setStore('foundStops', stops);
+	}
+
+	const getDisplayedPanelId = (): number => {
+		return store.displayedPanelId;
+	}
+
+	const setDisplayedPanelId = (panelId: number): void => {
+		setStore('displayedPanelId', panelId);
+	}
+
+	const getPanels = (): PositionedPanel[] => {
+		return store.panels;
+	}
+
+	const setPanels = (panels: PositionedPanel[]): void => {
+		setStore('panels', panels);
+	}
+
+	const getHighlightedStop = (): Stop | undefined => {
+		return store.highlightedStop;
+	}
+
+	const setHighlightedStop = (stop: Stop): void => {
+		setStore('highlightedStop', stop);
+	}
+
+	const resetHighlightedStop = (): void => {
+		setStore('highlightedStop', undefined);
+	}
+
+
+	const enableMap = (enable: boolean): void => {
+		setStore("mapEnabled", enable);
+	}
+
+	const isMapEnabled = (): boolean => {
+		return store.mapEnabled;
+	}
+
+	const getAllMapFeatures = (): ByStopIdMapFeatures => {
+		return store.mapFeatures;
+	}
+
+	const getMapFeature = (stopId: number): OlFeature | undefined => {
+		return store.mapFeatures[stopId];
+	}
+
+	const setMapFeature = (stopId: number, feature: OlFeature): void => {
+		setStore('mapFeatures', stopId, feature);
+	};
+
+	return (
+		<SearchContext.Provider value={{
+			getSearchText, setSearchText,
+			getFoundStops, setFoundStops,
+			getDisplayedPanelId, setDisplayedPanelId,
+			getPanels, setPanels,
+			getHighlightedStop, setHighlightedStop, resetHighlightedStop,
+			enableMap, isMapEnabled,
+			getMapFeature, getAllMapFeatures, setMapFeature,
+		}}>
+			{props.children}
+		</SearchContext.Provider>
+	);
+}

frontend/src/stopsSearchMenu/stopPanel.scss

@@ -0,0 +1,100 @@
+@use "../_common";
+@use "../_utils";
+
+
+.stopPanel {
+	scroll-snap-align: center;
+
+	.stop {
+		width: calc(1880/1920*100%);
+		height: calc(100% / 5);
+		// margin: 0 calc(20/1920*100%);
+		margin: 0 calc(10/1920*100%);
+
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+
+		/* TODO: compute the border weight according to the parent height */
+		/* TODO: Disable border-bottom for the last .line  */
+		border-bottom: solid calc(2px);
+
+		cursor: default;
+		
+		.name {
+			margin-left: calc(40/1920*100%);
+			width: 60%;
+			aspect-ratio: 2.5;
+			
+			display: flex;
+			align-items: center;
+
+			font-family: IDFVoyageur-bold;
+		}
+
+		.lineRepr {
+			width: 40%;
+			aspect-ratio: 2.5;
+
+			display: flex;
+			flex-direction: row;
+			flex-wrap: wrap;
+			align-items: center;
+
+			.transportMode {
+				@extend %transportMode;
+
+				height: 50%;
+			}
+
+			.linesRepresentationMatrix {
+				@extend %busLinePicto; // Use the larger picto aspect-ratio
+				width: 75%;
+				aspect-ratio: 3;
+
+				display: flex;
+				flex-flow: row;
+				flex-wrap: wrap;
+
+ 				%picto {
+					margin-left: 1%;
+					align-self: center;
+					justify-self: center;
+				}
+
+				%singleLinePicto {
+					@extend %picto;
+
+					height: 80%;
+				}
+
+				.transportMode {
+					@extend %transportMode;
+					@extend %picto;
+				}
+
+				.tramLinePicto {
+					@extend %tramLinePicto;
+					@extend %singleLinePicto;
+				}
+
+				.trainLinePicto {
+					@extend %trainLinePicto;
+					@extend %singleLinePicto;
+				}
+
+				.metroLinePicto {
+					@extend %metroLinePicto;
+					@extend %singleLinePicto;
+				}
+
+				.busLinePicto {
+					@extend %busLinePicto;
+					@extend %picto;
+
+					height: 40%;
+				}
+			}
+		}
+	}
+}

frontend/src/stopsSearchMenu/stopPanel.tsx

@@ -0,0 +1,143 @@
+import { createResource, For, JSX, ParentComponent, Show, useContext, VoidComponent } from 'solid-js';
+
+import { Stop } from '../types';
+import { renderLineTransportMode, renderLinePicto, ScrollingText, TransportModeWeights } from '../utils';
+import { AppContextContext, AppContextStore } from "../appContext";
+import { BusinessDataContext, BusinessDataStore } from "../businessData";
+import { SearchContext, SearchStore } from "./searchStore";
+
+
+import "./stopPanel.scss";
+
+
+const StopRepr: VoidComponent<{ stop: Stop }> = (props) => {
+	const fontSize: number = 40;
+
+	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
+	if (businessDataStore === undefined)
+		return <div />;
+
+	const { getLine } = businessDataStore;
+
+	const fetchLinesRepr = async (lineIds: string[]): Promise<JSX.Element[]> => {
+		const reprs = [];
+		for (const lineId of lineIds) {
+			const line = await getLine(lineId);
+			if (line !== undefined) {
+				reprs.push(<div class="transportMode">{renderLineTransportMode(line)}</div>);
+				reprs.push(renderLinePicto(line));
+			}
+		}
+		return reprs;
+	}
+
+	const [lineReprs] = createResource<JSX.Element[], string[]>(props.stop.lines, fetchLinesRepr);
+
+	return (
+		<div class="stop">
+			<svg class="name" viewBox={`0 0 215 ${fontSize}`}>
+				<text
+					x="100%" y="55%"
+					dominant-baseline="middle" text-anchor="end"
+					font-size={fontSize}>
+					{props.stop.name}
+				</text>
+			</svg>
+			<For each={lineReprs()}>{(line: JSX.Element) => line}</For>
+		</div>
+	);
+}
+
+
+type ByTransportModeReprs = {
+	mode: JSX.Element | undefined;
+	lines: Record<string, JSX.Element | JSX.Element[] | undefined>;
+}
+
+
+const StopAreaRepr: VoidComponent<{ stop: Stop }> = (props) => {
+	const fontSize: number = 10;
+
+	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
+	const appContextStore: AppContextStore | undefined = useContext(AppContextContext);
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+
+	if (businessDataStore === undefined || appContextStore === undefined || searchStore === undefined)
+		return <div />;
+
+	const { getLine } = businessDataStore;
+	const { setDisplayedStops } = appContextStore;
+	const { setHighlightedStop, resetHighlightedStop } = searchStore;
+
+
+	const fetchLinesRepr = async (stop: Stop): Promise<JSX.Element> => {
+		const lineIds = new Set(stop.lines);
+		const stops = stop.stops;
+		for (const stop of stops) {
+			stop.lines.forEach(lineIds.add, lineIds);
+		}
+
+		const byModeReprs: Record<string, ByTransportModeReprs> = {};
+		for (const lineId of lineIds) {
+			const line = await getLine(lineId);
+			if (line !== undefined) {
+				if (!(line.transportMode in byModeReprs)) {
+					byModeReprs[line.transportMode] = {
+						mode: <div class="transportMode">{renderLineTransportMode(line)}</div>,
+						lines: {}
+					};
+				}
+				byModeReprs[line.transportMode].lines[line.shortName] = renderLinePicto(line);
+			}
+		}
+
+		const sortedTransportModes = Object.keys(byModeReprs).sort((x, y) => TransportModeWeights[x] <
+			TransportModeWeights[y] ? 1 : -1);
+
+		return (
+			<div class="lineRepr">
+				<For each={sortedTransportModes}>{(transportMode) => {
+					const reprs = byModeReprs[transportMode];
+					const lineNames = Object.keys(reprs.lines).sort((x, y) => x.localeCompare(y));
+					return <>
+						{reprs.mode}
+						<div class="linesRepresentationMatrix">
+							<For each={lineNames}>{(lineName) => reprs.lines[lineName]}</For>
+						</div>
+					</>
+				}}
+				</For>
+			</div >
+		);
+	}
+	const [lineReprs] = createResource(props.stop, fetchLinesRepr);
+
+	return (
+		<div
+			class="stop"
+			onClick={() => setDisplayedStops([props.stop])}
+			onMouseEnter={() => setHighlightedStop(props.stop)}
+			onMouseLeave={resetHighlightedStop}
+		>
+			<div class="name" >
+				<ScrollingText height={fontSize} width={100} content={props.stop.name} />
+			</div>
+			{lineReprs()}
+		</div>
+	);
+}
+
+export const StopsPanel: ParentComponent<{ stops: Stop[], show: boolean }> = (props) => {
+
+	return (
+		<div classList={{ "stopPanel": true, "displayed": props.show }}>
+			<For each={props.stops.sort((x, y) => x.name.localeCompare(y.name))}>
+				{(stop) => {
+					return <Show when={stop.stops !== undefined} fallback={<StopRepr stop={stop} />}>
+						<StopAreaRepr stop={stop} />
+					</Show>;
+				}}
+			</For>
+		</div>
+	);
+}

frontend/src/stopsSearchMenu/stopPopup.tsx

@@ -0,0 +1,49 @@
+import { createResource, For, ParentComponent, useContext } from 'solid-js';
+
+import { Stop } from '../types';
+import { BusinessDataContext, BusinessDataStore } from "../businessData";
+import { renderLinePicto, ScrollingText } from '../utils';
+
+export const StopPopup: ParentComponent<{ stop: Stop, show: boolean }> = (props) => {
+	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
+	if (businessDataStore === undefined)
+		return <div />;
+
+	const { getLine, getStopDestinations } = businessDataStore;
+
+	let popupDiv: HTMLDivElement | undefined = undefined;
+
+	const getDestinations = async (stop: Stop): Promise<{ lineId: string, destinations: string[] }[]> => {
+		let ret = [];
+
+		if (stop !== undefined) {
+			const result = await getStopDestinations(stop.id);
+			for (const [lineId, destinations] of Object.entries(result)) {
+				const line = await getLine(lineId);
+				const linePicto = renderLinePicto(line);
+				ret.push({ lineId: linePicto, destinations: destinations });
+			}
+		}
+
+		return ret;
+	}
+	const [destinations] = createResource(() => props.stop, getDestinations);
+
+	return (
+		<div ref={popupDiv} classList={{ "popup": true, "displayed": props.show }}>
+			<div class="header">{props.stop?.name}</div>
+			<div class="body">
+				<For each={destinations()}>
+					{(dst) => {
+						return <div class='line'>
+							{dst.lineId}
+							<div class="name">
+								<ScrollingText height={10} width={130} content={dst.destinations.join('/')} />
+							</div>
+						</div>;
+					}}
+				</For>
+			</div>
+		</div >
+	);
+}

frontend/src/stopsSearchMenu/stopsSearchMenu.scss

@@ -0,0 +1,85 @@
+@use "../_common";
+@use "../_utils";
+
+
+.mapPlaceholder {
+	--border-width: 0.1vh;
+
+	height: calc(100% - 2*var(--border-width));
+	width: 50%;
+
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	border: solid var(--neutral-color) var(--border-width);
+	border-radius: var(--border-radius);
+
+	background-color: var(--idfm-black);
+	font-family: IDFVoyageur-bold;
+	font-size: 2vh;
+	color: var(--idfm-white);
+}
+
+.stopNameInput {
+	width: 50%;
+	height: 60%;
+
+	display: flex;
+	flex-flow: row;
+
+	border: solid var(--neutral-color) calc(0.01vh);
+	border-radius: var(--border-radius);
+
+	background-color: transparent;
+
+	.leftAddon {
+		width: 17%;
+
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		background-color: var(--idfm-white);
+	}
+
+	input {
+		width: 83%;
+
+		padding-left: 3%;
+		padding-right: 3%;
+			
+		color: var(--idfm-white);
+		font-family: IDFVoyageur-regular;
+		background-color: transparent;
+	}
+}
+
+.title {
+	@extend %title;
+	
+	display: flex;
+	justify-content: center;
+}
+
+.stopSearchMenu {
+	@extend %widget;
+	
+	.body {
+		@extend %body;
+
+		flex-direction: row;
+
+		.stopsPanels {
+			width: 50%;
+			height: 100%;
+
+			scroll-snap-type: y mandatory;
+			overflow-y: scroll;
+
+			.displayed {
+				display: block;
+			}
+		}
+	}
+}

frontend/src/stopsSearchMenu/stopsSearchMenu.tsx

@@ -0,0 +1,200 @@
+import { createEffect, For, JSX, lazy, ParentComponent, useContext, Show, VoidComponent } from 'solid-js';
+import { lazily } from 'solidjs-lazily';
+import { createScrollPosition } from "@solid-primitives/scroll";
+
+import { Stop } from '../types';
+import { PositionedPanel } from '../utils';
+
+import { BusinessDataContext, BusinessDataStore } from "../businessData";
+import { SearchContext, SearchProvider, SearchStore } from "./searchStore";
+import { StopsPanel } from "./stopPanel";
+
+const { Map } = lazily(() => import("./map"));
+
+
+import "./stopsSearchMenu.scss";
+
+
+const StopNameInput: VoidComponent<{ onInput: JSX.EventHandler<HTMLInputElement, InputEvent>, leftAddon: string, placeholder: string }> = (props) => {
+	return (
+		<div class="stopNameInput">
+			<div class="leftAddon">{props.leftAddon}</div>
+			<input type="text" oninput={props.onInput} placeholder={props.placeholder} />
+		</div>);
+};
+
+
+const Header: VoidComponent<{ title: string, minCharsNb: number }> = (props) => {
+	const businessDataStore: BusinessDataStore | undefined = useContext(BusinessDataContext);
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+
+	if (businessDataStore === undefined || searchStore === undefined)
+		return <div />;
+
+	const { setSearchText } = searchStore;
+
+	const onStopNameInput: JSX.EventHandler<HTMLInputElement, InputEvent> = async (event): Promise<void> => {
+		const stopName = event.currentTarget.value;
+		if (stopName.length >= props.minCharsNb) {
+			await setSearchText(stopName, businessDataStore);
+		}
+	}
+
+	return (
+		<div class="header">
+			<div class="title">
+				<svg viewBox="0 0 1260 50">
+					<text x="0" y="50%" dominant-baseline="middle" font-size="50" style="fill: #ffffff">
+						{props.title}
+					</text>
+				</svg>
+			</div>
+			<StopNameInput onInput={onStopNameInput} leftAddon="🚉 🚏" placeholder="Stop name..." />
+		</div >
+	);
+};
+
+
+const StopsPanels: ParentComponent<{ maxStopsPerPanel: number }> = (props) => {
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+
+	if (searchStore === undefined) {
+		return <div />;
+	}
+
+	const { getDisplayedPanelId, getFoundStops, getPanels, setDisplayedPanelId, setPanels } = searchStore;
+	let stopsPanelsRef: HTMLDivElement | undefined = undefined
+	const stopsPanelsScroll = createScrollPosition(() => stopsPanelsRef);
+	const yStopsPanelsScroll = () => stopsPanelsScroll.y;
+
+	createEffect(() => {
+		yStopsPanelsScroll();
+
+		for (const panel of getPanels()) {
+			const panelDiv = panel.panel();
+			const panelDivClientRect = panelDiv.getBoundingClientRect();
+			if (panelDivClientRect.y > 0) {
+				setDisplayedPanelId(panel.position);
+				break;
+			}
+		}
+	});
+
+	return (
+		<div ref={stopsPanelsRef} class="stopsPanels">
+			{() => {
+				setPanels([]);
+
+				let newPanels = [];
+				let positioneds: PositionedPanel[] = [];
+
+				let stops: Stop[] = [];
+
+				for (const stop of getFoundStops()) {
+					if (stops.length < props.maxStopsPerPanel) {
+						stops.push(stop);
+					}
+					else {
+						const panelId = newPanels.length;
+						const panel = <StopsPanel stops={stops} show={panelId == getDisplayedPanelId()} />;
+						newPanels.push(panel);
+						positioneds.push({ position: panelId, panel: panel });
+						stops = [stop];
+					}
+				}
+				if (stops.length) {
+					const panelId = newPanels.length;
+					const panel = <StopsPanel stops={stops} show={panelId == getDisplayedPanelId()} />;
+					newPanels.push(panel);
+					positioneds.push({ position: panelId, panel: panel });
+				}
+
+				setPanels(positioneds);
+
+				return newPanels;
+			}}
+		</div>
+	);
+};
+
+
+const MapPlaceholder: VoidComponent<{}> = () => {
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+
+	if (searchStore === undefined) {
+		return <div />;
+	}
+
+	const { enableMap } = searchStore;
+
+	const onDoubleClick = (): void => {
+		console.log('!!! ON DOUBLE CLICK');
+		enableMap(true);
+	}
+
+	return <div
+		class="mapPlaceholder" ondblclick={() => onDoubleClick()}>
+		Double-clic pour activer la carte
+	</div>;
+};
+
+
+const Body: VoidComponent<{}> = () => {
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+	if (searchStore === undefined) {
+		return <div />;
+	}
+
+	const { isMapEnabled } = searchStore;
+
+	const maxStopsPerPanel = 5;
+
+	return <div class="body">
+		<StopsPanels maxStopsPerPanel={maxStopsPerPanel} />
+		<Show when={isMapEnabled()} fallback={<MapPlaceholder />}>
+			<Map />
+		</Show>
+	</div>;
+};
+
+
+const Footer: VoidComponent<{}> = () => {
+	const searchStore: SearchStore | undefined = useContext(SearchContext);
+	if (searchStore === undefined) {
+		return <div />;
+	}
+
+	const { getDisplayedPanelId, getPanels } = searchStore;
+
+	return (
+		<div class="footer">
+			<For each={getPanels()}>
+				{(panel) => {
+					const position = panel.position;
+					return (
+						<div>
+							<svg viewBox="0 0 29 29">
+								<circle cx="50%" cy="50%" r="13" stroke="#ffffff" stroke-width="3"
+									style={{ fill: `var(--idfm-${position == getDisplayedPanelId() ? "white" : "black"})` }}
+								/>
+							</svg>
+						</div>
+					);
+				}}
+			</For>
+		</div>
+	);
+};
+
+
+export const StopsSearchMenu: VoidComponent = () => {
+	return (
+		<div class="stopSearchMenu">
+			<SearchProvider>
+				<Header title="Recherche de l'arrêt..." minCharsNb={4} />
+				<Body />
+				<Footer />
+			</SearchProvider>
+		</div>
+	);
+};

frontend/src/types.tsx

@@ -42,17 +42,17 @@ export class Stop {
 	id: number;
 	name: string;
 	town: string;
-	lat: number;
-	lon: number;
+	epsg3857_x: number;
+	epsg3857_y: number;
 	stops: Stop[];
 	lines: string[];
 
-	constructor(id: number, name: string, town: string, lat: number, lon: number, stops: Stop[], lines: string[]) {
+	constructor(id: number, name: string, town: string, epsg3857_x: number, epsg3857_y: number, stops: Stop[], lines: string[]) {
 		this.id = id;
 		this.name = name;
 		this.town = town;
-		this.lat = lat;
-		this.lon = lon;
+		this.epsg3857_x = epsg3857_x;
+		this.epsg3857_y = epsg3857_y;
 		this.stops = stops;
 		this.lines = lines;
 		for (const stop of this.stops) {
@@ -68,14 +68,14 @@ export type Points = [number, number][];
 export class StopShape {
 	stop_id: number;
 	type_: number;
-	bounding_box: number[];
-	points: Points;
+	epsg3857_bbox: number[];
+	epsg3857_points: Points;
 
-	constructor(stop_id: number, type_: number, bounding_box: number[], points: Points) {
+	constructor(stop_id: number, type_: number, epsg3857_bbox: number[], epsg3857_points: Points) {
 		this.stop_id = stop_id;
 		this.type_ = type_;
-		this.bounding_box = bounding_box;
-		this.points = points;
+		this.epsg3857_bbox = epsg3857_bbox;
+		this.epsg3857_points = epsg3857_points;
 	}
 };