Use the new ngi-projector version 0.0.3 with new Projector.transform() method signature.

Author: josteinl

CHANGES.md

@@ -5,6 +5,7 @@ _2022-03-02_
 
 Add
 
+- Use new ngi-projector version 0.0.3. 
 - Add transformations.
 - Support for more methods. Complete list:        
    - RO: 2251

poetry.lock

@@ -28,7 +28,7 @@ secondary = true
 [tool.poetry.dependencies]
 python = "^3.9"
 pydantic = "^1.9.0"
-ngi-projector = "0.0.2.dev8131"
+ngi-projector = "^0.0.3"
 
 [tool.poetry.dev-dependencies]
 black = "*"

pyproject.toml

@@ -1,7 +1,6 @@
 """
 This is the parser service.
 """
-import logging
 from io import BytesIO
 from typing import List, Dict, Optional, Any
 import struct
@@ -91,7 +90,7 @@ def __init__(self):
         self.adminblock_unpacker = self.get_struct_unpacker(self.admin_block_specification, self.istart, self.iwidth)
         self.field_adminblock_indices = range(len(self.admin_block_specification))
         self.useEastNorthOrderAsDefault = True
-        self.file_srid = None
+        self.file_srid: Optional[int] = None
 
     def tema_code_to_method(self, code: str) -> Optional[str]:
 
@@ -130,9 +129,6 @@ def parse(self, filepath_or_buffer: Any, result_srid: int, file_srid: Optional[i
         is not passed or is `None`, then the coordinate system specified in the KOF file is used. If neither
         `file_srid` nor any coordinate system is specified in the KOF file, then the coordinate system is assumed to be
         in the `result_srid` coordinate system and no transformations are done.
-
-        For now result_srid and file_srid must be equal and no transformations are done. This limitation will change in
-        the future, when this package has the ability to do transformations.
         """
         if self._is_file_like(filepath_or_buffer):
             f = filepath_or_buffer
@@ -164,9 +160,10 @@ def _read_kof(self, file: BytesIO, result_srid: int, file_srid: Optional[int]) -
                 if not self.useEastNorthOrderAsDefault:
                     line_data["x"], line_data["y"] = line_data["y"], line_data["x"]
 
-                if result_srid != self.file_srid:
-                    transformer = projector.get_transformer(f"{self.file_srid}-{result_srid}")
-                    line_data["x"], line_data["y"] = projector.transform(transformer, line_data["x"], line_data["y"])
+                if self.file_srid and result_srid != self.file_srid:
+                    line_data["x"], line_data["y"] = projector.transform(
+                        self.file_srid, result_srid, line_data["x"], line_data["y"]
+                    )
 
                 locations[line_data["ID"]].point_easting = line_data["x"]
                 locations[line_data["ID"]].point_northing = line_data["y"]

src/ngi_kof_parser/parser.py

@@ -15,7 +15,7 @@ def test_parse(self):
             assert location.srid
 
     @pytest.mark.parametrize(
-        "file_name, ex_e, ex_n, ex_z,kof_srid,proj_srid",
+        "file_name, ex_e, ex_n, ex_z, kof_srid, proj_srid",
         [
             # No transformations
             ("tests/data/UTM32_EN.kof", 594137.802, 6589107.923, 0.000, 25832, 25832),