Merge pull request #19 from josteinl/f/support_several_character_set_encodings

Update the lock file

Author: josteinl

.github/workflows/branch.yaml

@@ -6,8 +6,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
-        poetry-version: ['1.6.1']
+        python-version: ['3.11', '3.12', '3.13']
+        poetry-version: ['2.0.1']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -29,8 +29,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
-        poetry-version: ['1.6.1']
+        python-version: ['3.11', '3.12', '3.13']
+        poetry-version: ['2.0.1']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -44,17 +44,13 @@ jobs:
           poetry-version: ${{ matrix.poetry-version }}
       - name: Install dependencies
         run: poetry install
-      - name: Run black
-        run: poetry run black . --check
-#      - name: Run isort
-#        run: poetry run isort . --check-only --profile black
-#      - name: Run flake8
-#        run: poetry run flake8 .
+      - name: Run ruff
+        run: poetry run ruff format --check
       - name: Run mypy
         run: poetry run mypy .
       - name: Run bandit
         run: poetry run bandit .
       - name: Run safety
         run: poetry run safety check
       - name: Check for acceptable licenses
-        run: poetry run pip-licenses --allow-only="MIT License;BSD License;Python Software Foundation License;Apache Software License;Mozilla Public License 2.0 (MPL 2.0)"
+        run: poetry run pip-licenses --allow-only="MIT License;BSD License;Python Software Foundation License;Apache Software License;Mozilla Public License 2.0 (MPL 2.0);The Unlicense (Unlicense);ISC License (ISCL)"

.github/workflows/release.yaml

@@ -9,8 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.11']
-        poetry-version: ['1.6.1']
+        python-version: ['3.13']
+        poetry-version: ['2.0.1']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

CHANGES.md

@@ -1,5 +1,12 @@
 # Python KOF Parser Package
 
+## Version 0.1.2
+_2025-01-17_
+
+Add
+
+- Add support for all EPSG SRIDs (that the coordinate-projector package supports).
+
 ## Version 0.1.1
 _2023-11-09_
 

README.md

@@ -2,9 +2,9 @@
 
 [![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)
 [![security: safety](https://img.shields.io/badge/security-safety-yellow.svg)](https://github.com/pyupio/safety)
-[![code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
+[![code style](https://img.shields.io/badge/style-ruff-41B5BE)](https://github.com/astral-sh/ruff)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
-[![python](https://img.shields.io/badge/Python-3.11-3776AB.svg?style=flat&logo=python&logoColor=white)](https://www.python.org)
+[![python](https://img.shields.io/badge/Python-3.12-3776AB.svg?style=flat&logo=python&logoColor=white)](https://www.python.org)
 
 
 Python package for parsing and generating KOF files.
@@ -90,9 +90,9 @@ print(kof_string)
 
 Before you start, install:
 
-   - Python 3.9 or higher
-   - Poetry 1.6.1
-   - black code formatter
+   - Python 3.11 or higher
+   - Poetry 2
+   - Ruff formatter
 
 ## Clone this repository
 

poetry.lock

@@ -19,7 +19,7 @@ src = ["src", "tests"]
 
 [tool.poetry]
 name = "kof-parser"
-version = "0.1.1"
+version = "0.1.2"
 description = "A KOF file parser. Follows Norkart's KOF 2.0 specification from 2005."
 license = "MIT"
 authors = ["Magnus Mariero <[email protected]>", "Jostein Leira <[email protected]>"]
@@ -38,13 +38,12 @@ packages = [
 
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4"
-pydantic = "^2.4.2"
-coordinate-projector = ">=0.0.9"
+python = ">=3.11,<4"
+pydantic = "^2.10"
+coordinate-projector = "^0.0.11"
 charset-normalizer = "*"
 
 [tool.poetry.group.dev.dependencies]
-black = "*"
 pytest = "*"
 pytest-cov = "*"
 mypy = "*"

pyproject.toml

@@ -1,6 +1,7 @@
 """
 Common super class for the KOFReader() and KOFWriter() classes
 """
+
 import csv
 from pathlib import Path
 from typing import Dict, Optional

src/kof_parser/kof.py

@@ -1,12 +1,13 @@
-from typing import Optional
-
 from pydantic import BaseModel, Field
 
 
 class Location(BaseModel):
     name: str = ""
-    methods: list[str] = []
-    point_easting: Optional[float] = None
-    point_northing: Optional[float] = None
-    point_z: Optional[float] = Field(None, ge=-10000, le=10000)
-    srid: Optional[int] = None
+    methods: list[str] = Field(default_factory=list)
+    point_easting: float | None = None
+    point_northing: float | None = None
+    point_z: float | None = Field(None, ge=-10000, le=10000)
+    srid: int | None = None
+
+    def __repr__(self):
+        return f"<{self.__class__.__name__} {self.name} ({self.point_easting}, {self.point_northing}, {self.point_z})>"

src/kof_parser/model.py

@@ -1,6 +1,7 @@
 """
 This is the parser service.
 """
+
 from io import BytesIO, TextIOWrapper
 from typing import Optional, Any
 

src/kof_parser/parser.py

@@ -1,5 +1,5 @@
 from typing import List, Optional
-from datetime import datetime
+from datetime import datetime, UTC
 from uuid import UUID
 
 from kof_parser import Kof
@@ -36,7 +36,7 @@ def create_admin_block(self, project_name: str, srid: int, swap_easting_northing
         # 00 Oppdrag Dato Ver K.sys Komm $11100000000 Observatør
         # 01 EXP          31012022   2      22 0000 $22100000000           NN
         """
-        date = datetime.utcnow().strftime("%d%m%Y")
+        date = datetime.now(UTC).strftime("%d%m%Y")
         version = "1"
         sosi_code = self.get_code(srid=srid) or ""
         municipality = ""
@@ -73,7 +73,7 @@ def create_kof_header_lines(project_id: UUID, project_name, srid: int) -> str:
         header = " 00 KOF Export from NGI Field Manager\n"
         header += f" 00 Project: {project_id}. Name: {project_name}\n"
         header += f" 00 Spatial Reference ID (SRID): {srid}\n"
-        header += f" 00 Export date (UTC): {datetime.utcnow()}\n"
+        header += f" 00 Export date (UTC): {datetime.now(UTC)}\n"
 
         return header
 

src/kof_parser/writer.py

@@ -15,7 +15,7 @@ def test_parse(self):
             assert location.srid
 
     @pytest.mark.parametrize(
-        "file_name, number_of_locations, ex_e, ex_n, ex_z, kof_srid, proj_srid",
+        "file_name, number_of_locations, expected_easting, expected_northing, expected_z, kof_srid, proj_srid",
         [
             # No transformations
             ("tests/data/UTM32_EN.kof", 1, 594137.802, 6589107.923, 0.000, 25832, 25832),
@@ -39,15 +39,17 @@ def test_parse(self):
             # Transformation from the source data ETRS89/UTM 32N -> UTM 33 (SRID 25833, SOSI 23)
             ("tests/data/Innmålt_UTM32.kof", 1, 5696353.09, 535410.87, 50.029, None, 25833),
             ("tests/data/Innmålt_UTM32.kof", 1, 5696353.09, 535410.87, 50.029, 25832, 25833),
-            # Transformation from the source data ETRS89/UTM 32N -> ED50 UTM 31 (SRID 23031, SOSI 31)
-            ("tests/data/Innmålt_UTM32.kof", 1, 7712335.00, 680539.85, 50.029, None, 23031),
-            ("tests/data/Innmålt_UTM32.kof", 1, 7712335.00, 680539.85, 50.029, 25832, 23031),
+            # Transformation from the source data ETRS89/UTM 32N -> ED50 UTM 31 (SRID 23031, SOSI 31 NB: 10 m accuracy)
+            ("tests/data/Innmålt_UTM32.kof", 1, 7712388.471459307, 680330.5913208205, 50.029, None, 23031),
+            ("tests/data/Innmålt_UTM32.kof", 1, 7712388.471459307, 680330.5913208205, 50.029, 25832, 23031),
             ("tests/data/15-5-18-Fossegata_linux.kof", 6, 6569635.303, 624579.208, 73.838, None, 23031),
             ("tests/data/15-5-18-Fossegata_windows.kof", 6, 6569635.303, 624579.208, 73.838, None, 23031),
             ("tests/data/KOF_from_ArcGIS.kof", 131, 83711.914, 1193605.427, 5, 5110, 5110),
         ],
     )
-    def test_upload_kof_with_proj_and_meta(self, file_name, number_of_locations, ex_e, ex_n, ex_z, kof_srid, proj_srid):
+    def test_upload_kof_with_proj_and_meta(
+        self, file_name, number_of_locations, expected_easting, expected_northing, expected_z, kof_srid, proj_srid
+    ):
         """
         Test uploading kof file
 
@@ -61,9 +63,9 @@ def test_upload_kof_with_proj_and_meta(self, file_name, number_of_locations, ex_
         assert len(locations) == number_of_locations
 
         location = locations[0]
-        assert location.point_easting == pytest.approx(ex_e)
-        assert location.point_northing == pytest.approx(ex_n)
-        assert location.point_z == ex_z
+        assert location.point_easting == pytest.approx(expected_easting)
+        assert location.point_northing == pytest.approx(expected_northing)
+        assert location.point_z == expected_z
         assert location.srid == proj_srid
 
     @pytest.mark.parametrize("file", ["tests/data/import_template.kof", open("tests/data/import_template.kof", "rb")])
@@ -105,7 +107,6 @@ def test_upload_kof(self, file):
             assert method == MethodType.PZ.value
 
     def test_err_file_containing_tabs(self):
-
         srid = 5110
         parser = KOFParser()
 

tests/test_parse.py

@@ -55,6 +55,6 @@ def test_write_all_method_types(self):
         [location1, location2] = locations
         assert len(location1.methods) == 0
         assert len(location2.methods) == len(MethodType) + 3 - 7
-        assert (
-            len([method for method in location2.methods if method == "OTHER"]) == 0
-        ), "There are seven methods we do not have a tema code for and are therefore mapped to 2430 OTHER"
+        assert len([method for method in location2.methods if method == "OTHER"]) == 0, (
+            "There are seven methods we do not have a tema code for and are therefore mapped to 2430 OTHER"
+        )