Merge pull request #691 from OpenTrafficCam/feature/8071-integrate-traffic-counts-plot-in-web-dashboard-prototype

Feature/8071 integrate traffic counts plot in web dashboard prototype

Author: briemla

OTAnalytics/application/analysis/traffic_counting.py

@@ -1015,13 +1015,15 @@ def __init__(
         create_events: CreateEvents,
         assigner: RoadUserAssigner,
         tagger_factory: TaggerFactory,
+        enable_event_creation: bool = True,
     ):
         self._event_repository = event_repository
         self._flow_repository = flow_repository
         self._get_sections_by_id = get_sections_by_id
         self._create_events = create_events
         self._assigner = assigner
         self._tagger_factory = tagger_factory
+        self._enable_event_creation = enable_event_creation
 
     def count(self, specification: CountingSpecificationDto) -> Count:
         """
@@ -1030,7 +1032,7 @@ def count(self, specification: CountingSpecificationDto) -> Count:
         Args:
             specification (CountingSpecificationDto): specification of the export
         """
-        if self._event_repository.is_empty():
+        if self._enable_event_creation and self._event_repository.is_empty():
             self._create_events()
 
         if specification.count_all_events:

OTAnalytics/domain/event.py

@@ -472,7 +472,7 @@ def add_all(
         for event in events:
             self.__do_add(event)
         for section in sections:
-            self._events.setdefault(section, dict())
+            self._events[section]
         self.__discard_duplicates(events)
         self.__sort(events)
         self._subject.notify(EventRepositoryEvent(events, []))

OTAnalytics/plugin_datastore/track_store.py

@@ -282,6 +282,14 @@ def classifications(self) -> frozenset[str]:
     def empty(self) -> bool:
         return self._dataset.empty
 
+    @property
+    def track_geometry_factory(self) -> TRACK_GEOMETRY_FACTORY:
+        return self._track_geometry_factory
+
+    @property
+    def calculator(self) -> PandasTrackClassificationCalculator:
+        return self._calculator
+
     def __init__(
         self,
         track_geometry_factory: TRACK_GEOMETRY_FACTORY,
@@ -296,8 +304,8 @@ def __init__(
         else:
             self._dataset = create_empty_dataframe()
 
-        self.calculator = calculator
-        self.track_geometry_factory = track_geometry_factory
+        self._calculator = calculator
+        self._track_geometry_factory = track_geometry_factory
         if geometry_datasets is None:
             self._geometry_datasets = dict[
                 RelativeOffsetCoordinate, TrackGeometryDataset
@@ -737,10 +745,15 @@ class FilteredPandasTrackDataset(
     FilteredTrackDataset, PandasTrackDataset, PandasDataFrameProvider
 ):
 
-    def __init__(
-        self,
-        other: PandasTrackDataset,
-    ) -> None:
+    @property
+    def track_geometry_factory(self) -> TRACK_GEOMETRY_FACTORY:
+        return self._other.track_geometry_factory
+
+    @property
+    def calculator(self) -> PandasTrackClassificationCalculator:
+        return self._other.calculator
+
+    def __init__(self, other: PandasTrackDataset) -> None:
         self._other = other
 
     def add_all(self, other: Iterable[Track]) -> PandasTrackDataset: