datex2-xml2json 0.0.1__tar.gz → 0.0.4__tar.gz

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datex2-xml2json
-Version: 0.0.1
+Version: 0.0.4
 Summary: PoC converting DATEX2 v2 (situation) publications to various output formats.
 Keywords: DATEX2,roadworks,road closures,GeoJSON,Geoparquet,WAZE-CIFS
 Author: Holger Bruch
@@ -12,12 +12,12 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: File Formats
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Dist: jsonschema>=4.26.0
-Requires-Dist: check-jsonschema>=0.38.2
-Requires-Dist: jsonata-python>=0.7.0
-Requires-Dist: geoparquet-io>=1.6.0
-Requires-Dist: pyarrow>=26.0.0
-Requires-Dist: rs-xml2json>=0.2.0
+Requires-Dist: jsonschema>=4.26,<5
+Requires-Dist: check-jsonschema>=0.38,<1
+Requires-Dist: jsonata-python>=0.7.0,<1
+Requires-Dist: geoparquet-io>=1.7,<2
+Requires-Dist: pyarrow>=26,<27
+Requires-Dist: rs-xml2json~=0.2.0
 Requires-Python: >=3.12
 Project-URL: Homepage, https://github.com/datex2-tools/datex2-xml2json
 Project-URL: Issues, https://github.com/datex2-tools/datex2-xml2json/issues
@@ -163,8 +163,8 @@ Easiest way to learn about it, is starting with an existing transformation using
 
 E.g. you could start with the following to example transformations (which might not exactly reflect the latest code version of this project):
 
-* https://try.jsonata.org/Gk5r-kLek: Mapping DATEX3.7LiteJSON to DATEX2MostlyFlatGeoJSON (Current JSONata expression is in datex2_xml2json/transform/jsonata_transformer.py)
-* https://try.jsonata.org/QEnqmItyF: Mapping DATEX2MostlyFlatGeoJSON to (mostly) WAZE CIFS (Current JSONata expression is in datex2_xml2json/transform/cifs_transformer.py)
+* https://try.jsonata.org/Gk5r-kLek: Mapping DATEX3.7LiteJSON to DATEX2MostlyFlatGeoJSON (Current JSONata expression is in `src/datex2_xml2json/transform/jsonata_transformer.py`)
+* https://try.jsonata.org/QEnqmItyF: Mapping DATEX2MostlyFlatGeoJSON to (mostly) WAZE CIFS (Current JSONata expression is in `src/datex2_xml2json/transform/cifs_transformer.py`)
 
 ### Running tests
 

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/README.md

@@ -138,8 +138,8 @@ Easiest way to learn about it, is starting with an existing transformation using
 
 E.g. you could start with the following to example transformations (which might not exactly reflect the latest code version of this project):
 
-* https://try.jsonata.org/Gk5r-kLek: Mapping DATEX3.7LiteJSON to DATEX2MostlyFlatGeoJSON (Current JSONata expression is in datex2_xml2json/transform/jsonata_transformer.py)
-* https://try.jsonata.org/QEnqmItyF: Mapping DATEX2MostlyFlatGeoJSON to (mostly) WAZE CIFS (Current JSONata expression is in datex2_xml2json/transform/cifs_transformer.py)
+* https://try.jsonata.org/Gk5r-kLek: Mapping DATEX3.7LiteJSON to DATEX2MostlyFlatGeoJSON (Current JSONata expression is in `src/datex2_xml2json/transform/jsonata_transformer.py`)
+* https://try.jsonata.org/QEnqmItyF: Mapping DATEX2MostlyFlatGeoJSON to (mostly) WAZE CIFS (Current JSONata expression is in `src/datex2_xml2json/transform/cifs_transformer.py`)
 
 ### Running tests
 

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/pyproject.toml

@@ -1,56 +1,9 @@
 [build-system]
-requires = ["uv_build >= 0.12.19"]
+requires = ["uv_build >= 0.12.19, <1"]
 build-backend = "uv_build"
 
-[project]
-name = "datex2-xml2json"
-version = "0.0.1"
-description = "PoC converting DATEX2 v2 (situation) publications to various output formats."
-readme = "README.md"
-keywords = [
-    "DATEX2",
-    "roadworks",
-    "road closures",
-    "GeoJSON",
-    "Geoparquet",
-    "WAZE-CIFS",
-]
-requires-python = ">=3.12"
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Intended Audience :: Developers",
-    "Topic :: File Formats",
-    "Programming Language :: Python :: 3",
-    "Operating System :: OS Independent",
-]
-license = "EUPL-1.2"
-license-files = ["LICENSE.md"]
-dependencies = [
-    "jsonschema>=4.26.0",
-    "check-jsonschema>=0.38.2",
-    "jsonata-python>=0.7.0",
-    "geoparquet-io>=1.6.0",
-    "pyarrow>=26.0.0",
-    "rs-xml2json>=0.2.0",
-]
-
-[[project.authors]]
-name = "Holger Bruch"
-email = "hb@mfdz.de"
-
-[project.urls]
-Homepage = "https://github.com/datex2-tools/datex2-xml2json"
-Issues = "https://github.com/datex2-tools/datex2-xml2json/issues"
-
-[dependency-groups]
-dev = [
-    "pytest~=9.1.1",
-    "ruff~=0.17.2",
-    "mypy~=2.3.1",
-    "pre-commit>=4.3.0",
-    "types-shapely~=2.1.0.20260728",
-    "pyarrow-stubs~=20.0.0.20260819",
-]
+[tool.uv.build-backend]
+source-exclude = [".DS_Store"]
 
 [tool.ruff]
 line-length = 140
@@ -174,6 +127,7 @@ testpaths = ["tests"]
 
 [tool.mypy]
 python_version = "3.12"
+strict = true
 
 [[tool.mypy.overrides]]
 module = [
@@ -188,6 +142,54 @@ module = [
     "geoparquet_io",
     "rs_xml2json",
     "pyarrow",
-    "shapely.geometry",
+    "pyarrow.parquet",
 ]
 ignore_missing_imports = true
+
+[project]
+name = "datex2-xml2json"
+version = "0.0.4"
+description = "PoC converting DATEX2 v2 (situation) publications to various output formats."
+readme = "README.md"
+keywords = [
+    "DATEX2",
+    "roadworks",
+    "road closures",
+    "GeoJSON",
+    "Geoparquet",
+    "WAZE-CIFS",
+]
+requires-python = ">=3.12"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "Topic :: File Formats",
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
+license = "EUPL-1.2"
+license-files = ["LICENSE.md"]
+dependencies = [
+    "jsonschema>=4.26,<5",
+    "check-jsonschema>=0.38,<1",
+    "jsonata-python>=0.7.0,<1",
+    "geoparquet-io>=1.7,<2",
+    "pyarrow>=26,<27",
+    "rs-xml2json~=0.2.0",
+]
+
+[[project.authors]]
+name = "Holger Bruch"
+email = "hb@mfdz.de"
+
+[project.urls]
+Homepage = "https://github.com/datex2-tools/datex2-xml2json"
+Issues = "https://github.com/datex2-tools/datex2-xml2json/issues"
+
+[dependency-groups]
+dev = [
+    "pytest>=9.1.1,<10",
+    "ruff~=0.17.2",
+    "mypy~=2.3.1",
+    "pre-commit>=4.3.0,<5",
+]

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/pyproject.toml.orig

@@ -1,10 +1,14 @@
 [build-system]
-requires = ["uv_build >= 0.12.19"]
+requires = ["uv_build >= 0.12.19, <1"]
 build-backend = "uv_build"
 
+[tool.uv.build-backend]
+source-exclude = [".DS_Store"]
+
 [project]
 name = "datex2-xml2json"
-version = "0.0.1"
+# The version is bumped from the git tag in CI via `uv version` on release; see .github/workflows/test_build_and_publish.yml
+version = "0.0.4"
 authors = [
   { name="Holger Bruch", email="hb@mfdz.de" },
 ]
@@ -23,23 +27,21 @@ license = "EUPL-1.2"
 license-files = ["LICENSE.md"]
 
 dependencies = [
-    "jsonschema>=4.26.0",
-    "check-jsonschema>=0.38.2",
-    "jsonata-python>=0.7.0",
-    "geoparquet-io>=1.6.0",
-    "pyarrow>=26.0.0",
-    "rs-xml2json>=0.2.0"
+    "jsonschema>=4.26,<5",
+    "check-jsonschema>=0.38,<1",
+    "jsonata-python>=0.7.0,<1",
+    "geoparquet-io>=1.7,<2",
+    "pyarrow>=26,<27",
+    "rs-xml2json~=0.2.0"
 ]
 
 # Development and test dependencies (PEP 735 dependency group, installed by `uv sync`).
 [dependency-groups]
 dev = [
-    "pytest~=9.1.1",
+    "pytest>=9.1.1,<10",
     "ruff~=0.17.2",
     "mypy~=2.3.1",
-    "pre-commit>=4.3.0",
-    "types-shapely~=2.1.0.20260728",
-    "pyarrow-stubs~=20.0.0.20260819",
+    "pre-commit>=4.3.0,<5"
 ]
 
 [project.urls]
@@ -129,6 +131,7 @@ testpaths = ["tests"]
 
 [tool.mypy]
 python_version = "3.12"
+strict = true
 
 [[tool.mypy.overrides]]
 module = [
@@ -143,6 +146,6 @@ module = [
     "geoparquet_io",
     "rs_xml2json",
     "pyarrow",
-    "shapely.geometry",
+    "pyarrow.parquet",
 ]
 ignore_missing_imports = true

datex2_xml2json-0.0.4/src/datex2_xml2json/_version.py

@@ -0,0 +1 @@
+__version__ = '0.0.4'

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/src/datex2_xml2json/json_validator.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 from check_jsonschema.checker import SchemaChecker
 from check_jsonschema.file_wrapper import BinaryFileInput
 from check_jsonschema.formats import FormatOptions
@@ -8,7 +10,7 @@ from check_jsonschema.schema_loader import SchemaLoader
 
 
 class JsonValidator:
-    def __init__(self, schema_path):
+    def __init__(self, schema_path: str) -> None:
         self.schema_loader = SchemaLoader(
             schema_path,
             disable_cache=False,
@@ -20,7 +22,7 @@ class JsonValidator:
         cls = REPORTER_BY_NAME[output_format]
         return cls(verbosity=verbosity)
 
-    def validate(self, filename):
+    def validate(self, filename: str | Path) -> int:
         checker = SchemaChecker(
             schema_loader=self.schema_loader,
             instance_loader=InstanceLoader([BinaryFileInput(filename)]),
@@ -33,4 +35,5 @@ class JsonValidator:
             regex_impl=RegexImplementation(RegexVariantName.default),
         )
 
-        return checker.run()
+        result: int = checker.run()
+        return result

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/src/datex2_xml2json/transform/__init__.py

@@ -1,4 +1,5 @@
 from .base import (
+    AbstractTransformer as AbstractTransformer,
     TransformerPipeline as TransformerPipeline,
     RulesTransformer as RulesTransformer,
 )
@@ -9,5 +10,5 @@ from .geojson_geometry_transformer import (
     GeoJSONGeometryTransformer as GeoJSONGeometryTransformer,
 )
 from .geoparquet_transformer import GeoparquetRenderer as GeoparquetRenderer
-from .cifs_transformer import CifsTransformer
-from .source_setter import SourceSetter
+from .cifs_transformer import CifsTransformer as CifsTransformer
+from .source_setter import SourceSetter as SourceSetter

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/src/datex2_xml2json/transform/base.py

@@ -1,22 +1,24 @@
-from datex2_xml2json.util import replace, xpath_dict
+from typing import Self
+
+from datex2_xml2json.util import JsonDict, replace, xpath_dict
 
 from .transformation_rules import TransformationRules
 
 
 class AbstractTransformer:
-    def transform(self, a_dict: dict) -> dict:
+    def transform(self, a_dict: JsonDict) -> JsonDict:
         return a_dict
 
 
 class TransformerPipeline(AbstractTransformer):
-    def __init__(self, transformers: list[AbstractTransformer]):
+    def __init__(self, transformers: list[AbstractTransformer]) -> None:
         self.transformers = list(transformers)
 
-    def add_transformer(self, transformer: AbstractTransformer):
+    def add_transformer(self, transformer: AbstractTransformer) -> Self:
         self.transformers.append(transformer)
         return self
 
-    def transform(self, a_dict: dict) -> dict:
+    def transform(self, a_dict: JsonDict) -> JsonDict:
         result = a_dict
         for t in self.transformers:
             result = t.transform(result)
@@ -28,7 +30,7 @@ class RulesTransformer(AbstractTransformer):
     def __init__(self, rules: TransformationRules):
         self.rules = rules
 
-    def transform(self, a_dict: dict) -> dict:
+    def transform(self, a_dict: JsonDict) -> JsonDict:
         # Transforms the result of xml2json transformation into DATEXIIv3 json.
         # This includes:
         # * renamings of certain properties according to v2 to v3 name changes
@@ -36,7 +38,7 @@ class RulesTransformer(AbstractTransformer):
         # * casts values of certain properties to intended types
         # * ...
 
-        return replace(
+        result: JsonDict = replace(
             a_dict,
             None,
             self.rules.renamings,
@@ -46,29 +48,31 @@ class RulesTransformer(AbstractTransformer):
             self.rules.keys_to_pull_up,
         )
 
+        return result
+
 
 class ProcessingTransformer(AbstractTransformer):
-    def __init__(self, xpath: str):
+    def __init__(self, xpath: str) -> None:
         self.xpath = xpath
 
-    def transform(self, a_dict: dict) -> dict:
+    def transform(self, a_dict: JsonDict) -> JsonDict:
         for elem in xpath_dict(a_dict, self.xpath):
             self.process(elem)
 
         return a_dict
 
-    def process(self, a_dict: dict):
+    def process(self, a_dict: JsonDict) -> None:
         pass
 
 
 class SituationRecordTransformer(ProcessingTransformer):
-    def __init__(self, xpath: str):
+    def __init__(self, xpath: str) -> None:
         super().__init__(xpath)
 
-    def process_situation_record(self, situation_record: dict) -> None:
+    def process_situation_record(self, situation_record: JsonDict) -> None:
         pass
 
-    def process(self, situation_record_wrapper: dict) -> None:
+    def process(self, situation_record_wrapper: JsonDict) -> None:
         if isinstance(situation_record_wrapper, dict) and len(situation_record_wrapper) == 1:
             situation_record = situation_record_wrapper.get(next(iter(situation_record_wrapper.keys())))
         else:

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/src/datex2_xml2json/transform/cifs_transformer.py

@@ -2,6 +2,8 @@ import copy
 import logging
 import re
 
+from datex2_xml2json.util import JsonDict
+
 from .jsonata_transformer import JsonataTransformer
 
 logger = logging.getLogger(__name__)
@@ -58,7 +60,7 @@ cifs_expression = """
                 "DisturbanceActivity": "CHIT_CHAT",
                 "TransitInformation": "CHIT_CHAT"
                 };
-            $lookup($typeBySubtypeLookup , properties.situationRecordSubtype)?:$lookup($typeLookup , properties.type)?:"TODO"),
+            $lookup($typeBySubtypeLookup , properties.situationRecordSubtype)?:$lookup($typeLookup , properties.type)?:"HAZARD"),
         "subtype": (
             $subtypeByTypeLookup := {
                 /* Accident (no subtypes, as DATEXII does not provide accident severity) */
@@ -134,6 +136,12 @@ cifs_expression = """
 }
 """
 
+# In case multiple incidents describe the same situation, usually because of an caused/effect relation,
+# we pick the incident, whose type/subtype are ranked highest (most informative/important)
+DEFAULT_INCIDENT_PRIORITY = 1
+TYPE_PRIORITIES = {'ROAD_CLOSED': 10, 'ACCIDENT': 9, 'JAM': 8, 'HAZARD': 7, 'POLICE': 2, 'CHIT_CHAT': 1}
+SUBTYPE_PRIORITIES = {'ROAD_CLOSED': 10, 'ACCIDENT': 9, 'JAM': 8, 'HAZARD': 7, 'POLICE': 2, 'CHIT_CHAT': 1}
+
 
 class CifsTransformer(JsonataTransformer):
     # This pattern is used to exract the common ID prefix of all situation records which
@@ -143,11 +151,11 @@ class CifsTransformer(JsonataTransformer):
     # 2. Any string/char prefix followed by dot + number
     situation_record_group_prefix_regexp = r'^(\d+-\d\d\d\dV\d+)$|^(\d+-\d+-\d+-\d+-gegen).*|^(\d+-\d+-\d+-\d+).*|^(.*)\.\d+$'
 
-    def __init__(self, **kwargs):
+    def __init__(self) -> None:
         super().__init__(cifs_expression)
 
-    def _group_by_common_situation_record_id_substring(self, incidents, pattern):
-        grouped_incidents = {}
+    def _group_by_common_situation_record_id_substring(self, incidents: list[JsonDict], pattern: str) -> dict[str, list[JsonDict]]:
+        grouped_incidents: dict[str, list[JsonDict]] = {}
         p = re.compile(pattern)
 
         for incident in incidents:
@@ -163,19 +171,13 @@ class CifsTransformer(JsonataTransformer):
 
         return grouped_incidents
 
-    def _get_type_sub_type_prio(self, incident):
-        if incident.get('type') == 'ROAD_CLOSED':
-            return 10
-        if incident.get('subtype') == 'HAZARD_ON_ROAD_LANE_CLOSED':
-            return 4
-        if incident.get('subtype') == 'HAZARD_ON_ROAD_CONSTRUCTION':
-            return 3
-        if incident.get('subtype') == 'HAZARD_ON_ROAD' or incident.get('type') in ['CHIT_CHAT']:
-            return 1
-        else:
-            return 2
+    def _get_type_sub_type_prio(self, incident: JsonDict) -> int:
+        return max(
+            TYPE_PRIORITIES.get(str(incident.get('type')), DEFAULT_INCIDENT_PRIORITY),
+            SUBTYPE_PRIORITIES.get(str(incident.get('subtype')), DEFAULT_INCIDENT_PRIORITY),
+        )
 
-    def _merge_incident_group(self, incident_group):
+    def _merge_incident_group(self, incident_group: list[JsonDict]) -> JsonDict:
         # Assumptions: besides type and subtype, all properties are assumed to be equals
         # (TODO: we might check this explicitly)
         #
@@ -184,30 +186,33 @@ class CifsTransformer(JsonataTransformer):
         # * highest priority subtype/type wins
         # TODO: subtype for road_closed to be set according to other incidents
         # TODO: should jam be communicated in addition?
+        if not incident_group:
+            raise ValueError('incident_group must not be empty')
+
         highest_prio = None
         highest_prio_type = None
         highest_prio_subtype = None
-        highest_prio_incident = None
+        highest_prio_incident: JsonDict = incident_group[0]
 
         for incident in incident_group:
             current_prio = self._get_type_sub_type_prio(incident)
             if highest_prio is None or current_prio > highest_prio:
                 logger.debug(
                     f'For {incident["id"]}, replace {highest_prio} {highest_prio_type} {highest_prio_subtype}'
-                    f' by {incident["type"]} {incident.get("subtype")}'
+                    f' by {incident.get("type")} {incident.get("subtype")}'
                 )
                 highest_prio = current_prio
-                highest_prio_type = incident['type']
+                highest_prio_type = incident.get('type')
                 highest_prio_subtype = incident.get('subtype')
                 highest_prio_incident = incident
             else:
                 logger.debug(
                     f'For {incident["id"]}, do not replace {highest_prio} {highest_prio_type} {highest_prio_subtype}'
-                    f' by {incident["type"]} {incident.get("subtype")}'
+                    f' by {incident.get("type")} {incident.get("subtype")}'
                 )
         return highest_prio_incident
 
-    def _transform_polyline_geom(self, linestring_coordinates) -> str:
+    def _transform_polyline_geom(self, linestring_coordinates: list[list[float]]) -> str:
         """
         Converts GeoJSON linestring coordinates array into CIFS polyline string.
         The list of lon/lat coords (like [[10.0, 49.0], [11.0, 49.0]]) is converted into a
@@ -215,7 +220,7 @@ class CifsTransformer(JsonataTransformer):
         """
         return ' '.join([f'{coords[1]} {coords[0]}' for coords in linestring_coordinates])
 
-    def _transform_incident_geometry(self, incident: dict) -> list[dict]:
+    def _transform_incident_geometry(self, incident: JsonDict) -> list[JsonDict]:
         """
         Converts GeoJSON geometry of incident into a CIFS polyline.
         As the GeoJSON geometry might be a MultiLineString, we return an array
@@ -248,7 +253,7 @@ class CifsTransformer(JsonataTransformer):
 
         return [incident]
 
-    def _merge_grouped_incidents_and_handle_geometry(self, grouped_incidents):
+    def _merge_grouped_incidents_and_handle_geometry(self, grouped_incidents: dict[str, list[JsonDict]]) -> list[JsonDict]:
         incidents = []
         for key in grouped_incidents:
             try:
@@ -260,7 +265,7 @@ class CifsTransformer(JsonataTransformer):
 
         return incidents
 
-    def post_transform(self, a_dict: dict) -> dict:
+    def post_transform(self, a_dict: JsonDict) -> JsonDict:
         """
         Retains the most expressive incident of a group of incidents describing
         the same situation.

{datex2_xml2json-0.0.1 → datex2_xml2json-0.0.4}/src/datex2_xml2json/transform/geojson_geometry_transformer.py

@@ -1,5 +1,7 @@
 import logging
 
+from datex2_xml2json.util import JsonDict
+
 from .base import SituationRecordTransformer
 
 logger = logging.getLogger(__name__)
@@ -14,7 +16,7 @@ class GeoJSONGeometryTransformer(SituationRecordTransformer):
         super().__init__(situation_record_json_pointer)
         self.geom_container_element_json_point = geom_container_element_json_point
 
-    def _extract_coordinates_from_gmlLineString(self, gmlLineString: dict) -> list:
+    def _extract_coordinates_from_gmlLineString(self, gmlLineString: JsonDict) -> list[list[float]]:
         # Coordinate Order Confusion
         # There is often some confusion regarding the correct ordering of coordinate values.
         # While EPSG:4326 usually uses lat,lon ordering, and CRS84 (and GeoJSON) use lon/lat,
@@ -38,7 +40,7 @@ class GeoJSONGeometryTransformer(SituationRecordTransformer):
         else:
             return [[lon, lat] for lon, lat in zipped_coords]
 
-    def _extract_line_geom(self, linearExtended: dict) -> None | dict:
+    def _extract_line_geom(self, linearExtended: JsonDict) -> None | JsonDict:
         gmlLineString = linearExtended.get('gmlLineString')
         if gmlLineString is None:
             logger.warning('No linearExtended/gmlLineString')
@@ -50,7 +52,7 @@ class GeoJSONGeometryTransformer(SituationRecordTransformer):
             }
             return geometry
 
-    def _extract_point_geom(self, pointCoordinates: dict | None) -> dict | None:
+    def _extract_point_geom(self, pointCoordinates: JsonDict | None) -> JsonDict | None:
         if pointCoordinates is None:
             logger.warning('No pointCoordinates')
             return None
@@ -64,7 +66,7 @@ class GeoJSONGeometryTransformer(SituationRecordTransformer):
             }
             return geometry
 
-    def _extract_multi_line_string(self, locationReference: dict) -> dict:
+    def _extract_multi_line_string(self, locationReference: JsonDict) -> JsonDict:
         locations = locationReference.get('locationContainedInGroup', {})
 
         lineStrings = []
@@ -82,7 +84,7 @@ class GeoJSONGeometryTransformer(SituationRecordTransformer):
 
         return {'type': 'MultiLineString', 'coordinates': lineStrings}
 
-    def _extract_extendedLinear_geom(self, locationReference: dict) -> dict:
+    def _extract_extendedLinear_geom(self, locationReference: JsonDict) -> JsonDict:
         """
         Some publications use a custom extension extendedLinear to provide linear geometries using a verbose
         xml encoding.
@@ -119,7 +121,7 @@ class GeoJSONGeometryTransformer(SituationRecordTransformer):
 
         return {'type': 'LineString', 'coordinates': coordinates}
 
-    def process_situation_record(self, situation_record: dict) -> None:
+    def process_situation_record(self, situation_record: JsonDict) -> None:
         locationReference = situation_record.get('locationReference')
         if locationReference is None:
             return
@@ -147,7 +149,7 @@ class GeoJSONGeometryTransformer(SituationRecordTransformer):
 
 
 class GeoJSONGeometryTransformer_DATEXII_3_7(GeoJSONGeometryTransformer):
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__(
             'payload/sitSituationPublication/situation/situationRecord',
             'linearExtended',
@@ -155,5 +157,5 @@ class GeoJSONGeometryTransformer_DATEXII_3_7(GeoJSONGeometryTransformer):
 
 
 class GeoJSONGeometryTransformer_Simplified(GeoJSONGeometryTransformer):
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__('payload/situation/situationRecord', None)