Skip to content

Commit 32652d6

Browse files
committed
Make the test run on the Bedrock GI API
1 parent 299607f commit 32652d6

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

examples/hk_kaitak_ags3/hk_kaitak_ags3_to_brgi_geodb.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -512,14 +512,9 @@ def _(mo):
512512
def _(brgi_geodb, mo, platform, write_brgi_db_to_file):
513513
output = None
514514
if platform.system() != "Emscripten":
515-
del brgi_geodb.InSituTests["LEGD"]
516-
del brgi_geodb.Other["STCN"]
517515
write_brgi_db_to_file(
518516
brgi_geodb, mo.notebook_dir() / "kaitak_gi.gpkg", driver="GPKG"
519517
)
520-
# write_gi_db_to_gpkg(
521-
# brgi_geodb_old, mo.notebook_dir() / "kaitak_gi.gpkg"
522-
# )
523518
else:
524519
output = mo.md(
525520
"Writing a GeoPackage from WebAssembly (marimo playground) causes geopandas to think that the GeoDataFrames in the `brgi_geodb` don't have a geometry column. You can [download the GeoPackage from GitHub](https://github.com/bedrock-engineer/bedrock-ge/blob/main/examples/hk_kaitak_ags3/kaitak_gi.gpkg)"
18.8 MB
Binary file not shown.

src/bedrock_ge/gi/io_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def brgi_db_to_dfs(
210210
if brgi_db.Sample is not None:
211211
dict_of_dfs["Sample"] = brgi_db.Sample
212212

213-
insitu_dfs = {f"InSitu_{k}": v for k, v in brgi_db.InSituTests.items()}
213+
insitu_dfs = {k: v for k, v in brgi_db.InSituTests.items()}
214214
lab_dfs = {k: v for k, v in brgi_db.LabTests.items()}
215215
other_dfs = {k: v for k, v in brgi_db.Other.items()}
216216

tests/test_examples/test_hk_kaitak_ags3_to_brgi_geodb.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ def test_kaitak_ags3_notebook_runs_and_creates_gpkg(examples_dir):
109109
"no_rows": 15_873,
110110
},
111111
{
112-
"table_name": "InSitu_GEOL",
112+
"table_name": "GEOL",
113113
"no_rows": 7_238,
114114
},
115115
{
116-
"table_name": "InSitu_ISPT",
116+
"table_name": "ISPT",
117117
"no_rows": 3_544,
118118
},
119119
{
120-
"table_name": "InSitu_WETH",
120+
"table_name": "WETH",
121121
"no_rows": 3_370,
122122
},
123123
]

0 commit comments

Comments
 (0)