Skip to content

Commit dc43b24

Browse files
committed
fix tests
1 parent a6197f0 commit dc43b24

2 files changed

Lines changed: 24 additions & 11 deletions

File tree

geo_sampling/geo_roads.py

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,18 +244,31 @@ def _load_boundary_data(args):
244244
type_idx = None
245245
name_idx = None
246246
nl_name_idx = None
247+
country_idx = None
247248

248249
for field in reader.fields:
249-
if isinstance(field, list):
250-
if field[0] == f"ENGTYPE_{level}":
251-
engtype_idx = idx
252-
if field[0] == f"TYPE_{level}":
253-
type_idx = idx
254-
if field[0] == f"NAME_{level}":
255-
name_idx = idx
256-
if field[0] == f"NL_NAME_{level}":
257-
nl_name_idx = idx
258-
idx += 1
250+
field_name = (
251+
field.name
252+
if hasattr(field, "name")
253+
else (field[0] if isinstance(field, list) else str(field))
254+
)
255+
if field_name == f"ENGTYPE_{level}":
256+
engtype_idx = idx
257+
if field_name == f"TYPE_{level}":
258+
type_idx = idx
259+
if field_name == f"NAME_{level}":
260+
name_idx = idx
261+
if field_name == f"NL_NAME_{level}":
262+
nl_name_idx = idx
263+
if field_name == "COUNTRY":
264+
country_idx = idx
265+
idx += 1
266+
267+
# Fallback to COUNTRY field if NAME_{level} is not available or empty
268+
if name_idx is None or (
269+
shape_records and shape_records[0].record[name_idx] in ["NA", "", None]
270+
):
271+
name_idx = country_idx
259272
if shape_records:
260273
levels_engtype.append(
261274
shape_records[0].record[engtype_idx]

tests/test_010_geo_roads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from . import capture
1414

1515
COUNTRY_NAME = os.environ.get("COUNTRY_NAME", "Singapore")
16-
REGION_NAME = os.environ.get("REGION_NAME", "North")
16+
REGION_NAME = os.environ.get("REGION_NAME", "Central")
1717
ADM_LEVEL = os.environ.get("ADM_LEVEL", "1")
1818

1919

0 commit comments

Comments
 (0)