Merge pull request #37 from geoCML/def-spatial-refs

Set spatial reference for layers

Author: TristanDamron

src/db_connector.py

@@ -109,6 +109,11 @@ def get_triggers_for_table(self, table: str) -> set[str]:
         return {trigger[0] for trigger in self.cursor.fetchall()}
 
 
+    def get_srid_for_table(self, schema: str, table: str) -> str:
+        self.cursor.execute(f"""SELECT Find_SRID('{schema}', '{table}', 'geom');""")
+        return self.cursor.fetchone()[0]
+
+
     def execute_commit_query(self, query: str) -> None:
         self.cursor.execute(query)
         self.connection.commit()

src/tabor.py

@@ -69,6 +69,9 @@ def write(file_path: str, db: str, username: str, password: str, host: str, port
             geom_type = db_connector.get_geometry_type_for_table(schema, table_name)
             if geom_type:
                 data[table]["geometry"] = geom_type
+                srid = db_connector.get_srid_for_table(schema, table_name)
+                if srid:
+                    data[table]["srid"] = srid
 
             data[table]["owner"] = username
 

src/tabor_file.py

@@ -35,13 +35,17 @@ def __init__(self, path: str, psql_data: dict | None = None) -> None:
                             pass
 
 
-                        group = ""
                         try:
                             group = layer["group"]
                         except KeyError:
-                            pass
+                            group = None
+
+                        try:
+                            srid = layer["srid"]
+                        except KeyError:
+                            srid = None
 
-                        self.add_layer(layer["name"], layer["schema"], geometry, layer["owner"], layer["fields"], constraints, group)
+                        self.add_layer(layer["name"], layer["schema"], geometry, layer["owner"], layer["fields"], constraints, group, srid)
 
             except FileNotFoundError:
                 raise Exception(f"Failed to read .tabor file at {self.path}, does that path exist?")
@@ -54,6 +58,11 @@ def __init__(self, path: str, psql_data: dict | None = None) -> None:
                 except KeyError:
                     geom = None
 
+                try:
+                    srid = values["srid"]
+                except KeyError:
+                    srid = None
+
                 derived_constraints: list[dict] = []
                 try:
                     for trigger in values["constraints"]:
@@ -66,11 +75,12 @@ def __init__(self, path: str, psql_data: dict | None = None) -> None:
                     derived_group = values["group"]
                 except KeyError:
                     pass
-                self.add_layer(table.split(".")[1], table.split(".")[0], geom, values["owner"], values["fields"], derived_constraints, derived_group)
+
+                self.add_layer(table.split(".")[1], table.split(".")[0], geom, values["owner"], values["fields"], derived_constraints, derived_group, srid)
 
 
-    def add_layer(self, name: str, schema: str, geometry: str | None, owner: str, fields: dict, constraints: list[dict], group: str | None) -> TaborLayer:
-        layer = TaborLayer(name, schema, geometry, owner, fields, constraints, group)
+    def add_layer(self, name: str, schema: str, geometry: str | None, owner: str, fields: dict, constraints: list[dict], group: str | None, srid: str | None) -> TaborLayer:
+        layer = TaborLayer(name, schema, geometry, owner, fields, constraints, group, srid)
         if group:
             feature_group = self.add_or_get_group(group)
             feature_group.add_layer(layer)
@@ -114,7 +124,10 @@ def to_psql(self) -> dict:
                 result["layers"][layer.name]["constraints"].append(str(constraint))
 
             if layer.geometry:
-                result["layers"][layer.name]["geometry"] = f"""ALTER TABLE "{layer.schema}"."{layer.name}" ALTER COLUMN geom TYPE Geometry({layer.derive_geometry_type()});"""
+                if layer.srid:
+                    result["layers"][layer.name]["geometry"] = f"""ALTER TABLE "{layer.schema}"."{layer.name}" ALTER COLUMN geom TYPE Geometry({layer.derive_geometry_type()}, {layer.srid});"""
+                else:
+                    result["layers"][layer.name]["geometry"] = f"""ALTER TABLE "{layer.schema}"."{layer.name}" ALTER COLUMN geom TYPE Geometry({layer.derive_geometry_type()});"""
 
         result["groups"] = {}
         for group in self.groups:

src/tabor_layer.py

@@ -5,20 +5,17 @@
 
 
 class TaborLayer(object):
-    def __init__(self, name: str, schema: str, geometry: str | None, owner: str, fields: dict, constraints: list[dict], group: str | None) -> None:
+    def __init__(self, name: str, schema: str, geometry: str | None, owner: str, fields: dict, constraints: list[dict], group: str | None, srid: str | None) -> None:
         self.name = name
         self.schema = schema
+        self.srid = srid
+        self.group = group
 
         if geometry:
             self.geometry = GeometryType(geometry)
         else:
             self.geometry = None
 
-        if group:
-            self.group = group
-        else:
-            self.group = None
-
         self.constraints: list[Constraint] = []
         if constraints:
             for constraint in constraints:
@@ -72,6 +69,9 @@ def as_dict(self) -> dict:
         if self.group:
             var_dict["group"] = self.group
 
+        if self.srid:
+            var_dict["srid"] = self.srid
+
         return var_dict