bcdata 0.12.1__tar.gz → 0.12.2__tar.gz

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

@@ -1,6 +1,10 @@
 Changes
 =======
 
+0.12.2 (2024-08-15)
+------------------
+- fix error where incorrect schema returned for datasets with multiple resources (#196)
+
 0.12.1 (2024-08-15)
 ------------------
 - fix syntax error

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcdata
-Version: 0.12.1
+Version: 0.12.2
 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.1 → bcdata-0.12.2}/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.1"
+__version__ = "0.12.2"

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

@@ -104,14 +104,23 @@ def get_table_definition(table_name):
             table_definition["description"] = result["notes"]
             # iterate through resources associated with each package
             for resource in result["resources"]:
-                # presume description and details are the same for all resources
-                # (below only retains the final schema/comments if there is more than one
-                # package with this information)
-                if "details" in resource.keys() and resource["details"] != "":
-                    table_definition["schema"] = json.loads(resource["details"])
-                    # look for comments only if details/schema is present
-                    if "object_table_comments" in resource.keys():
-                        table_definition["comments"] = resource["object_table_comments"]
+                # only examine geographic resources with object name key
+                if (
+                    "object_name" in resource.keys()
+                    and resource["bcdc_type"] == "geographic"
+                ):
+                    # confirm that object name matches table name and schema is present
+                    if (
+                        resource["object_name"] == table_name
+                        and "details" in resource.keys()
+                        and resource["details"] != ""
+                    ):
+                        table_definition["schema"] = json.loads(resource["details"])
+                        # look for comments only if details/schema was found
+                        if "object_table_comments" in resource.keys():
+                            table_definition["comments"] = resource[
+                                "object_table_comments"
+                            ]
 
     if not table_definition["schema"]:
         log.warning(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bcdata
-Version: 0.12.1
+Version: 0.12.2
 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.1 → bcdata-0.12.2}/tests/test_bcdc.py

@@ -2,6 +2,7 @@ import json
 
 import pytest
 
+import bcdata
 from bcdata import bcdc
 
 AIRPORTS_PACKAGE = "bc-airports"
@@ -40,6 +41,13 @@ def test_get_table_definition_format_multi():
     assert table_definition["description"]
     assert table_definition["comments"]
     assert table_definition["schema"]
+    columns = [c["column_name"] for c in table_definition["schema"]]
+    assert (
+        bcdata.primary_keys[
+            "whse_forest_vegetation.ogsr_priority_def_area_cur_sp"
+        ].upper()
+        in columns
+    )
 
 
 def test_get_table_definition_format_multi_nopreview():