Merge pull request #9 from norwegian-geotechnical-institute/fix/crash_if_misssing_coordinate_system

Fix crash if trying to write a kof file with unknown coordinate system

Author: josteinl

.github/workflows/branch.yaml

@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9']
-        poetry-version: ['1.2.1']
+        poetry-version: ['1.2.2']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9']
-        poetry-version: ['1.2.1']
+        poetry-version: ['1.2.2']
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

CHANGES.md

@@ -1,4 +1,15 @@
-# NGI Python KOF Parser Package
+# Python KOF Parser Package
+
+## Version 0.0.12
+_2022-11-02_
+
+Add
+
+- Add missing srid/epsg 3857 and SOSI code 300 for WGS84 Web Mercator / Pseudo-Mercator.  
+
+Fix
+
+- Crash in KOF writer if target srid/epsg has no SOSI definition.
 
 ## Version 0.0.11
 _2022-10-21_

poetry.lock

@@ -15,7 +15,7 @@ exclude = '''
 
 [tool.poetry]
 name = "kof-parser"
-version = "0.0.11"
+version = "0.0.12"
 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]>"]

pyproject.toml

@@ -50,6 +50,7 @@ UTM sone 35 basert på ED50; EPSG 23035;35;23035
 UTM sone 35 basert på EUREF89;Ref INSPIRE Req 7 (ETRS89-TM35))  EPSG 25835;25;25835
 UTM sone 36 basert på ED50; EPSG 23036;36;23036
 UTM sone 36 basert på EUREF89;Ref INSPIRE Req 7 (ETRS89-TM36))  EPSG 25836;26;25836
+Web Mercator / Pseudo-Mercator;Spherical Mercator. Mye brukt projeksjon for webkart, blant annet for Google-maps, OpenStreetMap, Bing, ArcGIS, ESRI. Tidligere bruk benyttet en EPSG:900913.;300;3857
 WGS84 Geografisk 2d;WGS84 Geografisk 2d, ingen projeksjon, EPSG 4326;184;4326
 WGS84 UTM 29 2d;UTM Sone 29 basert på WGS84,2d (horisontal), EPSG 32629;59;32629
 WGS84 UTM 30 2d;UTM Sone 30 basert på WGS84,2d (horisontal), EPSG 32630;60;32630

src/kof_parser/KoordSys.csv

@@ -28,7 +28,13 @@ def __init__(self):
         self.code_to_srid_mapping = _code_to_srid_mapping
 
     def get_srid(self, code: int) -> Optional[int]:
+        """
+        Get srid/epsg from SOSI code
+        """
         return self.code_to_srid_mapping.get(code)
 
     def get_code(self, srid: int) -> Optional[int]:
+        """
+        Get SOSI code from srid/epsg
+        """
         return self.srid_to_code_mapping.get(srid)

src/kof_parser/kof.py

@@ -39,7 +39,7 @@ def create_admin_block(self, project_name: str, srid: int, swap_easting_northing
         """
         date = datetime.utcnow().strftime("%d%m%Y")
         version = "1"
-        code = self.get_code(srid=srid)
+        sosi_code = self.get_code(srid=srid) or ""
         municipality = ""
         if swap_easting_northing:
             units = "$21100000000"
@@ -50,7 +50,7 @@ def create_admin_block(self, project_name: str, srid: int, swap_easting_northing
         #             "-01 OOOOOOOOOOOO DDMMYYYY VVV KKKKKKK KKKK $RVAllllllll OOOOOOOOOOOO"
         admin_block = " 00 Oppdrag      Dato     Ver K.sys   Komm $21100000000 Observer    \n"
         admin_block += (
-            f" 01 {project_name[:12]:<12} {date[:8]:>8} {version[:3]:>3} {code:>7} "
+            f" 01 {project_name[:12]:<12} {date[:8]:>8} {version[:3]:>3} {sosi_code:>7} "
             f"{municipality:>4} {units[:12]:<12} {observer[:12]:<12}\n"
         )
         return admin_block