fix: Use geojson instead of json to read in the boundary file

hotosm · Nov 8, 2023 · 7de0f6a · 7de0f6a
1 parent b688408
commit 7de0f6a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/osm_fieldwork/basemapper.py b/osm_fieldwork/basemapper.py
@@ -20,7 +20,7 @@
 
 import argparse
 import concurrent.futures
-import json
+import geojson
 import logging
 import queue
 import re
@@ -292,10 +292,10 @@ def makeBbox(
 
         log.debug(f"Reading geojson file: {boundary}")
         with open(boundary, "r") as f:
-            poly = json.load(f)
+            poly = geojson.load(f)
         if "features" in poly:
             geometry = shape(poly["features"][0]["geometry"])
-        if "geometry" in poly:
+        elif "geometry" in poly:
             geometry = shape(poly["geometry"])
         else:
             geometry = shape(poly)

diff --git a/tests/test_basemap.py b/tests/test_basemap.py
@@ -29,7 +29,7 @@
 log = logging.getLogger(__name__)
 
 rootdir = os.path.dirname(os.path.abspath(__file__))
-infile = f"{rootdir}/testdata/Rollinsville.geojson"
+boundary = f"{rootdir}/testdata/Rollinsville.geojson"
 outfile = f"{rootdir}/testdata/rollinsville.mbtiles"
 base = "./tiles"
 # boundary = open(infile, "r")
@@ -45,7 +45,7 @@
 def test_create():
     """See if the file got loaded."""
     hits = 0
-    basemap = BaseMapper(infile, base, "topo", False)
+    basemap = BaseMapper(boundary, base, "topo", False)
     tiles = list()
     for level in [8, 9, 10, 11, 12]:
         basemap.getTiles(level)
@@ -65,6 +65,5 @@ def test_create():
 
     assert hits == 2
 
-
 if __name__ == "__main__":
     test_create()