bcdata 0.12.2__tar.gz → 0.12.3__tar.gz

{bcdata-0.12.2 → bcdata-0.12.3}/CHANGES.txt

@@ -1,6 +1,11 @@
 Changes
 =======
 
+0.12.3 (2024-11-12)
+------------------
+- ensure --geometry_type option is used correctly (#198)
+- handle WHSE_ADMIN_BOUNDARIES.ADM_NR_DISTRICTS_SPG/WHSE_ADMIN_BOUNDARIES.ADM_NR_DISTRICTS_SP (#200)
+
 0.12.2 (2024-08-15)
 ------------------
 - fix error where incorrect schema returned for datasets with multiple resources (#196)

{bcdata-0.12.2/bcdata.egg-info → bcdata-0.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcdata
-Version: 0.12.2
+Version: 0.12.3
 Summary: Python tools for quick access to DataBC geo-data available via WFS
 Home-page: https://github.com/smnorris/bcdata
 Author: Simon Norris

{bcdata-0.12.2 → bcdata-0.12.3}/bcdata/__init__.py

@@ -27,4 +27,4 @@ else:
     raise Exception(f"Failed to download primary key database at {PRIMARY_KEY_DB_URL}")
     primary_keys = {}
 
-__version__ = "0.12.2"
+__version__ = "0.12.3"

{bcdata-0.12.2 → bcdata-0.12.3}/bcdata/bc2pg.py

@@ -62,6 +62,16 @@ def bc2pg(  # noqa: C901
     if table:
         table_name = table.lower()
 
+    # take note if geometry type is specified as option
+    geometry_type_opt = geometry_type
+
+    # do not promote to multi if singlepart specified,
+    # otherwise default to always promoting to multipart in case mixed types are returned
+    if geometry_type_opt and geometry_type_opt.upper() in ["POINT", "LINE", "POLYGON"]:
+        promote_to_multi = False
+    else:
+        promote_to_multi = True
+
     # connect to target db
     db = Database(db_url)
 
@@ -152,6 +162,7 @@ def bc2pg(  # noqa: C901
             table_name,
             table_definition["schema"],
             geometry_type,
+            promote_to_multi,
             table_definition["comments"],
             primary_key,
         )
@@ -187,20 +198,22 @@ def bc2pg(  # noqa: C901
             # cast to everything multipart because responses can have mixed types
             # geopandas does not have a built in function:
             # https://gis.stackexchange.com/questions/311320/casting-geometry-to-multi-using-geopandas
-            df["geom"] = [
-                MultiPoint([feature]) if isinstance(feature, Point) else feature
-                for feature in df["geom"]
-            ]
-            df["geom"] = [
-                MultiLineString([feature])
-                if isinstance(feature, LineString)
-                else feature
-                for feature in df["geom"]
-            ]
-            df["geom"] = [
-                MultiPolygon([feature]) if isinstance(feature, Polygon) else feature
-                for feature in df["geom"]
-            ]
+            # (but only cast if geometry_type is not specified to be singlepart)
+            if promote_to_multi:
+                df["geom"] = [
+                    MultiPoint([feature]) if isinstance(feature, Point) else feature
+                    for feature in df["geom"]
+                ]
+                df["geom"] = [
+                    MultiLineString([feature])
+                    if isinstance(feature, LineString)
+                    else feature
+                    for feature in df["geom"]
+                ]
+                df["geom"] = [
+                    MultiPolygon([feature]) if isinstance(feature, Polygon) else feature
+                    for feature in df["geom"]
+                ]
 
             # run the load in two parts, one with geoms, one with no geoms
             log.info(f"Writing {dataset} to database as {schema_name}.{table_name}")

{bcdata-0.12.2 → bcdata-0.12.3}/bcdata/bcdc.py

@@ -95,7 +95,7 @@ def get_table_definition(table_name):
     # if there are no matching results, let the user know
     if r.json()["result"]["count"] == 0:
         log.warning(
-            f"BC Data Catalouge API search provides no results for: {table_name}"
+            f"BC Data Catalogue API search provides no results for: {table_name}"
         )
     else:
         # iterate through results of search (packages)
@@ -111,7 +111,16 @@ def get_table_definition(table_name):
                 ):
                     # confirm that object name matches table name and schema is present
                     if (
-                        resource["object_name"] == table_name
+                        (
+                            table_name == resource["object_name"]
+                            # hack to handle object name / table name mismatch for NR Districts
+                            or (
+                                table_name
+                                == "WHSE_ADMIN_BOUNDARIES.ADM_NR_DISTRICTS_SPG"
+                                and resource["object_name"]
+                                == "WHSE_ADMIN_BOUNDARIES.ADM_NR_DISTRICTS_SP"
+                            )
+                        )
                         and "details" in resource.keys()
                         and resource["details"] != ""
                     ):
@@ -129,6 +138,8 @@ def get_table_definition(table_name):
 
     # add primary key if present in bcdata.primary_keys
     if table_name.lower() in bcdata.primary_keys:
-        table_definition["primary_key"] = bcdata.primary_keys[table_name.lower()]
+        table_definition["primary_key"] = bcdata.primary_keys[
+            table_name.lower()
+        ].upper()
 
     return table_definition

{bcdata-0.12.2 → bcdata-0.12.3}/bcdata/database.py

@@ -134,6 +134,7 @@ class Database(object):
         table_name,
         table_details,
         geom_type,
+        promote_to_multi=True,
         table_comments=None,
         primary_key=None,
     ):
@@ -181,7 +182,7 @@ class Database(object):
 
         # make everything multipart
         # (some datasets have mixed singlepart/multipart geometries)
-        if geom_type[:5] != "MULTI":
+        if promote_to_multi and geom_type[:5] != "MULTI":
             geom_type = "MULTI" + geom_type
         columns.append(Column("geom", Geometry(geom_type, srid=3005)))
         metadata_obj = MetaData()

{bcdata-0.12.2 → bcdata-0.12.3/bcdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcdata
-Version: 0.12.2
+Version: 0.12.3
 Summary: Python tools for quick access to DataBC geo-data available via WFS
 Home-page: https://github.com/smnorris/bcdata
 Author: Simon Norris

{bcdata-0.12.2 → bcdata-0.12.3}/bcdata.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ bcdata.egg-info/entry_points.txt
 bcdata.egg-info/not-zip-safe
 bcdata.egg-info/requires.txt
 bcdata.egg-info/top_level.txt
+tests/t.py
 tests/test_bc2pg.py
 tests/test_bcdc.py
 tests/test_cli.py

bcdata-0.12.3/tests/t.py

@@ -0,0 +1,3 @@
+from bcdata import bcdc
+
+table_definition = bcdc.get_table_definition("WHSE_ADMIN_BOUNDARIES.ADM_NR_DISTRICTS_SPG")

{bcdata-0.12.2 → bcdata-0.12.3}/tests/test_bc2pg.py

@@ -19,6 +19,13 @@ STREAMS_TABLE = "whse_basemapping.fwa_stream_networks_sp"
 def test_bc2pg():
     bcdata.bc2pg(AIRPORTS_TABLE, DB_URL)
     assert AIRPORTS_TABLE in DB_CONNECTION.tables
+    # ensure the data is defaulting to multipart
+    r = DB_CONNECTION.query(
+        """
+        SELECT ST_geometrytype(geom) from whse_imagery_and_base_maps.gsr_airports_svw limit 1
+        """
+    )
+    assert r[0][0] == "ST_MultiPoint"
     DB_CONNECTION.execute("drop table " + AIRPORTS_TABLE)
 
 
@@ -74,7 +81,12 @@ def test_bc2pg_schema():
 
 def test_bc2pg_geometry_type():
     bcdata.bc2pg(AIRPORTS_TABLE, DB_URL, count=10, geometry_type="POINT")
-    assert AIRPORTS_TABLE in DB_CONNECTION.tables
+    r = DB_CONNECTION.query(
+        """
+        SELECT ST_geometrytype(geom) from whse_imagery_and_base_maps.gsr_airports_svw limit 1
+        """
+    )
+    assert r[0][0] == "ST_Point"
     DB_CONNECTION.execute("drop table " + AIRPORTS_TABLE)
 
 

{bcdata-0.12.2 → bcdata-0.12.3}/tests/test_bcdc.py

@@ -75,3 +75,12 @@ def test_get_table_definition_format_oracle_sde():
     assert table_definition["description"]
     assert table_definition["comments"]
     assert table_definition["schema"]
+
+
+def test_get_table_definition_nr_districts():
+    table_definition = bcdc.get_table_definition(
+        "WHSE_ADMIN_BOUNDARIES.ADM_NR_DISTRICTS_SPG"
+    )
+    assert table_definition["description"]
+    assert table_definition["comments"]
+    assert table_definition["schema"]