Skip to content

Commit 03cabed

Browse files
added testcase for dfmt.interpolate_bndpli() (#871)
* added testcase for dfmt.interpolate_bndpli() * fixed indexing
1 parent f75ed84 commit 03cabed

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

dfm_tools/meshkernel_helpers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,6 @@ def interpolate_bndpli(bnd_gdf,res):
423423
if len(bnd_ls_interp_points)==1: #no change if interp results in only one point
424424
continue
425425
bnd_ls_interp = LineString(bnd_ls_interp_points)
426-
bnd_gdf_interp['geometry'][irow] = bnd_ls_interp
426+
bnd_gdf_interp.loc[irow,'geometry'] = bnd_ls_interp
427427
return bnd_gdf_interp
428428

tests/test_meshkernel_helpers.py

+18-2
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ def test_generate_bndpli_cutland():
316316
[-68.31, -68.27, 12.10, 12.21, 2, 5]]
317317

318318
dxy = 0.02
319-
319+
crs = 4326
320320
for params in params_all:
321321
lon_min, lon_max, lat_min, lat_max, len_gdf, len_linestr0 = params
322322

323-
mk_object = dfmt.make_basegrid(lon_min, lon_max, lat_min, lat_max, dx=dxy, dy=dxy, crs=4326)
323+
mk_object = dfmt.make_basegrid(lon_min, lon_max, lat_min, lat_max, dx=dxy, dy=dxy, crs=crs)
324324
bnd_gdf = dfmt.generate_bndpli_cutland(mk=mk_object, res='h', buffer=0.01)
325325

326326
# fig, ax = plt.subplots()
@@ -330,3 +330,19 @@ def test_generate_bndpli_cutland():
330330

331331
assert len(bnd_gdf) == len_gdf
332332
assert len(bnd_gdf.geometry[0].xy[0]) == len_linestr0
333+
334+
335+
@pytest.mark.unittest
336+
def test_interpolate_bndpli():
337+
dxy = 0.02
338+
crs = 4326
339+
lon_min, lon_max, lat_min, lat_max = -68.55, -68.05, 11.95, 12.4
340+
341+
mk_object = dfmt.make_basegrid(lon_min, lon_max, lat_min, lat_max, dx=dxy, dy=dxy, crs=crs)
342+
bnd_gdf = dfmt.generate_bndpli_cutland(mk=mk_object, res='h', buffer=0.01)
343+
bnd_gdf_ref = dfmt.interpolate_bndpli(bnd_gdf, res=0.00511)
344+
345+
assert len(bnd_gdf) == 1
346+
assert len(bnd_gdf.geometry[0].xy[0]) == 99
347+
assert len(bnd_gdf_ref) == 1
348+
assert len(bnd_gdf_ref.geometry[0].xy[0]) == 377

0 commit comments

Comments
 (0)