Merge branch 'develop' into main

HakaiInstitute · Dec 6, 2022 · 0bd7cda · 0bd7cda
2 parents 0d0a05e + 4ca7290
commit 0bd7cda
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/las_trx/config.py b/las_trx/config.py
@@ -35,6 +35,8 @@ class TransformConfig(BaseModel):
     def t_crs(self) -> CRS:
         if self.t_ref_frame == enums.Reference.NAD83CSRS:
             geodetic_crs = GeographicCRS.from_epsg(4617)
+        elif self.t_ref_frame == enums.Reference.ITRF20:
+            geodetic_crs = GeographicCRS.from_epsg(9989)
         elif self.t_ref_frame == enums.Reference.ITRF14:
             geodetic_crs = GeographicCRS.from_epsg(9000)
         elif self.t_ref_frame == enums.Reference.ITRF08:

diff --git a/las_trx/resources/mainwindow.ui b/las_trx/resources/mainwindow.ui
@@ -203,6 +203,11 @@
              <string>WGS84</string>
             </property>
            </item>
+           <item>
+            <property name="text">
+             <string>ITRF2020</string>
+            </property>
+           </item>
            <item>
             <property name="text">
              <string>ITRF2014</string>
@@ -477,6 +482,11 @@
              <string>WGS84</string>
             </property>
            </item>
+           <item>
+            <property name="text">
+             <string>ITRF2020</string>
+            </property>
+           </item>
            <item>
             <property name="text">
              <string>ITRF2014</string>

diff --git a/las_trx/utils.py b/las_trx/utils.py
@@ -36,6 +36,7 @@ def date_to_decimal_year(d: T) -> T:
 REFERENCE_LOOKUP = {
     "NAD83(CSRS)": Reference.NAD83CSRS,
     "WGS84": Reference.WGS84,
+    "ITRF2020": Reference.ITRF20,
     "ITRF2014": Reference.ITRF14,
     "ITRF2008": Reference.ITRF08,
     "ITRF2005": Reference.ITRF05,

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ laspy = "^2.3.0"
 laszip = "^0.1.0"
 pydantic = "^1.10.2"
 pyproj = "^3.4.0"
-csrspy = "^0.3.1"
+csrspy = "^0.4.0"
 pyqt6 = "^6.4.0"
 
 [tool.poetry.dev-dependencies]