Merge pull request #14 from josteinl/fix/output-format

Fix a bug in the KOF writer format (output)

Author: josteinl

.github/workflows/branch.yaml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         poetry-version: ['1.6.1']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         poetry-version: ['1.6.1']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}

CHANGES.md

@@ -1,5 +1,12 @@
 # Python KOF Parser Package
 
+## Version 0.0.19
+_2023-10-04_
+
+Fix
+
+- Fix a bug in the KOF writer format (output). Now right align the coordinate numbers in the coordinate block (05).
+
 ## Version 0.0.18
 _2023-08-24_
 

README.md

@@ -4,7 +4,7 @@
 [![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)
 [![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
-[![python](https://img.shields.io/badge/Python-3.9-3776AB.svg?style=flat&logo=python&logoColor=white)](https://www.python.org)
+[![python](https://img.shields.io/badge/Python-3.11-3776AB.svg?style=flat&logo=python&logoColor=white)](https://www.python.org)
 
 
 Python package for parsing and generating KOF files.
@@ -91,7 +91,7 @@ print(kof_string)
 Before you start, install:
 
    - Python 3.9 or higher
-   - Poetry 1.4.2
+   - Poetry 1.6.1
    - black code formatter
 
 ## Clone this repository

poetry.lock

@@ -19,11 +19,11 @@ src = ["src", "tests"]
 
 [tool.poetry]
 name = "kof-parser"
-version = "0.0.18"
+version = "0.0.19"
 description = "A KOF file parser. Follows Norkart's KOF 2.0 specification from 2005."
 license = "MIT"
 authors = ["Magnus Mariero <magnus@neate.no>", "Jostein Leira <jostein@leira.net>"]
-maintainers = ["Jostein Leira <jostein@leira.net>", "Magnus Mariero <magnus@neate.no>"]
+maintainers = ["Jostein Leira <jostein@leira.net>"]
 readme = "README.md"
 homepage = "https://github.com/norwegian-geotechnical-institute/kof-parser"
 repository = "https://github.com/norwegian-geotechnical-institute/kof-parser"

pyproject.toml

@@ -56,8 +56,16 @@ def create_admin_block(self, project_name: str, srid: int, swap_easting_northing
 
     @staticmethod
     def create_kof_coordinate_block(id: str, temakode: str, x: float, y: float, z: float) -> str:
-        coord_block = f" 05 {id[0:10]:<10} {temakode:<8} {y:<12.3f} {x:<11.3f} {z:<8.3f} "
+        """
+        Example:
+
+        -05 PPPPPPPPPP KKKKKKKK XXXXXXXX.XXX YYYYYYY.YYY ZZZZ.ZZZ Bk MMMMMMM
+
+        Some equipment is depending on the coordinates (X, Y and Z) to be right aligned.
+        """
+        coord_block = f" 05 {id[0:10]:<10} {temakode:<8} {y:>12.3f} {x:>11.3f} {z:>8.3f} "
         coord_block = f"{coord_block:<70}\n"
+
         return coord_block
 
     @staticmethod

src/kof_parser/writer.py

@@ -21,7 +21,7 @@ def test_write(self):
 
         assert "\n 01 " in kof_string, "Administration block present"
         assert "\n 05 " in kof_string, "Coordinate block present"
-        assert "05 SMPLOC2    2418     1217079.460  112893.150  2.000" in kof_string
+        assert " 05 SMPLOC2    2418      1217079.460  112893.150    2.000             " in kof_string
 
         kof_string = KOFWriter().writeKOF(
             project_id=uuid.uuid4(),
@@ -30,7 +30,7 @@ def test_write(self):
             srid=srid,
             swap_easting_northing=True,
         )
-        assert "05 SMPLOC2    2418     112893.150   1217079.460 2.000" in kof_string
+        assert " 05 SMPLOC2    2418       112893.150 1217079.460    2.000             " in kof_string
 
     def test_write_all_method_types(self):
         """