refactor: streamline geojson handling by centralizing file reading logic (#1336)

* refactor: streamline geojson handling by centralizing file reading logic

Updated the handling of GeoJSON inputs across multiple files to utilize the new `geojson_to_gdf` function. This change improves code consistency and simplifies the process of reading GeoJSON data from both local files and URLs. Adjustments made in `common.py`, `foliumap.py`, `leafmap.py`, and `maplibregl.py` to replace direct calls to `gpd.read_file` with the new function.

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* chore: update Python version in CI workflows to 3.13

Updated the Python version in multiple GitHub Actions workflows to 3.13, ensuring compatibility with the latest features and improvements. Changes made in docs.yml, installation.yml, macos.yml, ubuntu.yml, and windows.yml.

* Address CodeRabbit review feedback

- Remove redundant HTTP/file branching at three call sites in maplibregl.py
  (add_vector/add_geojson path, add_symbol, DateFilterWidget.__init__) since
  geojson_to_gdf() now internally branches on http URLs vs local files

* Pin pyproj>=3.7 to fix Python 3.13 CI

- uv was resolving the transitive pyproj (via geopandas) to 3.6.1, which
  has no cp313 wheel and fails to build from source (PROJ not found),
  breaking the 3.13 installation workflows on Linux/macOS/Windows
- pyproj 3.7+ ships prebuilt cp313 wheels

* Scope pyproj>=3.7 pin to Python 3.13 only

- Unconditional pyproj>=3.7 conflicts with requires-python>=3.9 since
  pyproj 3.7+ requires Python>=3.10, making resolution unsatisfiable for
  3.9-3.12
- Add an environment marker so the pin only applies on Python 3.13, where
  the missing cp313 wheel for pyproj 3.6.1 is the actual problem

* Fix Python 3.13 CI: run installed venv instead of re-resolving with uv run

The pyproj>=3.7 pin (reverted here) could not work: leafmap declares
requires-python>=3.9, and `uv run` resolves the whole version range at once
(universal resolution), so pyproj is forced to 3.6.1 (the only version that
supports 3.9) — which has no cp313 wheel and fails to build from source.

Instead, `uv pip install .` already resolves per-interpreter and correctly
installs pyproj 3.7.x (with a cp313 wheel) on Python 3.13. The failure was
only the subsequent `uv run` step re-resolving universally. Run the installed
.venv's python/pytest directly so no re-resolution happens.

- Remove pyproj pin from requirements.txt
- installation/macos/windows/ubuntu workflows: replace `uv run` in the
  Test import and pytest steps with the .venv interpreter

* Keep uv run for ubuntu pytest workflow

Reverting ubuntu.yml to `uv run`: switching to the per-interpreter .venv
pulls in numpy>=2.1, which breaks map JSON serialization in the test suite
(29 tests fail with "ndarray is not JSON serializable"). The install-only
workflows (installation/macos/windows) keep the .venv fix since they only
do an import check and are unaffected.

* Fix numpy>=2.1 GeoJSON serialization, support Python 3.14, add 3.14 to CI

Root-cause fixes for the CI failures and Python 3.14 support:

- sanitize_geojson (common.py): recursively convert NumPy arrays/scalars in
  GeoJSON to native Python types. Newer geopandas/numpy read list-valued
  feature properties (e.g. a "coordinates" property) back as ndarrays, which
  are not JSON serializable and broke ipyleaflet/folium widget serialization
  ("Object of type ndarray is not JSON serializable") across ~30 tests.
  Applied in Map.add_geojson for both leafmap.py and foliumap.py.

- fit_bounds (leafmap.py): override ipyleaflet's fit_bounds to ensure an
  asyncio event loop exists first. Python 3.14 no longer provides an implicit
  current loop outside a running loop, so ipyleaflet's
  asyncio.ensure_future(self._fit_bounds(...)) raised RuntimeError.

- Make fiona optional (leafmap.py, foliumap.py, common.py): fiona has no
  Python 3.14 wheel. It was only used to register the KML driver; the default
  pyogrio engine reads KML natively, so import it lazily and fall back.

- requirements_dev.txt: fiona only on Python < 3.14 (no cp314 wheel yet).

- CI: add Python 3.14 to the ubuntu/macOS/windows/installation matrices.
  ubuntu.yml now runs the installed .venv interpreter for the import check and
  pytest instead of `uv run`, which re-resolves universally under
  requires-python>=3.9 and pins pyproj to 3.6.1 (no cp313/cp314 wheel).

Verified locally: full test suite (80 tests) passes on Python 3.14.

* Remove stray us_states.kml test artifact

* Use latest uv in CI so Python 3.14 can be installed

The pinned uv 0.4.16 predates Python 3.14 and has no download for it
("No download found for request: cpython-3.14-..."). Bump the setup-uv
version to "latest" in the workflows that test 3.14.

* Bump docs-build CI to Python 3.13

docs.yml already uses 3.13; align docs-build.yml (was 3.12).

* Fix docs CI on Python 3.13: run installed venv instead of uv run

Bumping docs-build to 3.13 exposed the same universal-resolution trap: `uv run`
re-resolves under requires-python>=3.9 and pins pyproj to 3.6.1, which has no
cp313 wheel and fails to build (proj not found). Use the installed .venv
interpreter for the import, pytest, and mkdocs steps in both docs.yml and
docs-build.yml.

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Author: giswqs

.github/workflows/docs-build.yml

@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.12"]
+                python-version: ["3.13"]
 
         env:
             PLANET_API_KEY: ${{ secrets.PLANET_API_KEY }}
@@ -51,18 +51,18 @@ jobs:
 
             - name: Test import
               run: |
-                  uv run python -c "import leafmap; print('leafmap import successful')"
-              #   uv run python -c "from osgeo import gdal; print('gdal import successful')"
-              #   uv run gdalinfo --version
+                  .venv/bin/python -c "import leafmap; print('leafmap import successful')"
+              #   .venv/bin/python -c "from osgeo import gdal; print('gdal import successful')"
+              #   .venv/bin/gdalinfo --version
 
             - name: Running pytest
               run: |
-                  uv run pytest . --verbose
+                  .venv/bin/pytest . --verbose
 
             - name: Install mkdocs
               run: |
                   uv pip install -r requirements_docs.txt
-                  uv run mkdocs build
+                  .venv/bin/mkdocs build
 
             - name: Deploy to Netlify
               uses: nwtgck/actions-netlify@v4.0

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: ["3.12"]
+                python-version: ["3.13"]
 
         env:
             PLANET_API_KEY: ${{ secrets.PLANET_API_KEY }}
@@ -50,15 +50,15 @@ jobs:
 
             - name: Test import
               run: |
-                  uv run python -c "import leafmap; print('leafmap import successful')"
-              #   uv run python -c "from osgeo import gdal; print('gdal import successful')"
-              #   uv run gdalinfo --version
+                  .venv/bin/python -c "import leafmap; print('leafmap import successful')"
+              #   .venv/bin/python -c "from osgeo import gdal; print('gdal import successful')"
+              #   .venv/bin/gdalinfo --version
 
             - name: Running pytest
               run: |
-                  uv run pytest . --verbose
+                  .venv/bin/pytest . --verbose
 
             - name: Install mkdocs
               run: |
                   uv pip install -r requirements_docs.txt
-                  uv run mkdocs gh-deploy --force
+                  .venv/bin/mkdocs gh-deploy --force

.github/workflows/installation.yml

@@ -13,14 +13,14 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                python-version: ["3.12"]
+                python-version: ["3.13", "3.14"]
         steps:
             - uses: actions/checkout@v7
 
             - name: Install uv
               uses: astral-sh/setup-uv@v7
               with:
-                  version: "0.4.16"
+                  version: "latest"
                   # enable-cache: true
 
             - name: Set up Python ${{ matrix.python-version }}
@@ -32,4 +32,4 @@ jobs:
                   uv pip install .
 
             - name: Test import
-              run: uv run python -c "import leafmap; print('leafmap import successful')"
+              run: .venv/bin/python -c "import leafmap; print('leafmap import successful')"

.github/workflows/macos.yml

@@ -15,7 +15,8 @@ jobs:
             fail-fast: false
             matrix:
                 config:
-                    - { os: macOS-latest, py: "3.12" }
+                    - { os: macOS-latest, py: "3.13" }
+                    - { os: macOS-latest, py: "3.14" }
         env:
             SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
         steps:
@@ -24,7 +25,7 @@ jobs:
             - name: Install uv
               uses: astral-sh/setup-uv@v7
               with:
-                  version: "0.4.16"
+                  version: "latest"
                   #   enable-cache: true
 
             - name: Set up Python ${{ matrix.config.py }}
@@ -37,4 +38,4 @@ jobs:
 
             - name: Test import
               run: |
-                  uv run python -c "import leafmap; print('leafmap import successful')"
+                  .venv/bin/python -c "import leafmap; print('leafmap import successful')"

.github/workflows/ubuntu.yml

@@ -13,7 +13,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                python-version: ["3.9", "3.10", "3.11", "3.12"]
+                python-version: ["3.11", "3.12", "3.13", "3.14"]
 
         env:
             PLANET_API_KEY: ${{ secrets.PLANET_API_KEY }}
@@ -33,7 +33,7 @@ jobs:
             - name: Install uv
               uses: astral-sh/setup-uv@v7
               with:
-                  version: "0.4.16"
+                  version: "latest"
                   # enable-cache: true
 
             - name: Set up Python ${{ matrix.python-version }}
@@ -52,10 +52,10 @@ jobs:
 
             - name: Test import
               run: |
-                  uv run python -c "import leafmap; print('leafmap import successful')"
-              #   uv run python -c "from osgeo import gdal; print('gdal import successful')"
-              #   uv run gdalinfo --version
+                  .venv/bin/python -c "import leafmap; print('leafmap import successful')"
+              #   .venv/bin/python -c "from osgeo import gdal; print('gdal import successful')"
+              #   .venv/bin/gdalinfo --version
 
             - name: Running pytest
               run: |
-                  uv run pytest . --verbose
+                  .venv/bin/pytest . --verbose

.github/workflows/windows.yml

@@ -12,7 +12,7 @@ jobs:
         runs-on: windows-latest
         strategy:
             matrix:
-                python-version: ["3.12"]
+                python-version: ["3.13", "3.14"]
 
         env:
             PLANET_API_KEY: ${{ secrets.PLANET_API_KEY }}
@@ -29,7 +29,7 @@ jobs:
             - name: Install uv
               uses: astral-sh/setup-uv@v7
               with:
-                  version: "0.4.16"
+                  version: "latest"
                   #   enable-cache: true
 
             - name: Set up Python ${{ matrix.python-version }}
@@ -42,4 +42,4 @@ jobs:
 
             - name: Test import
               run: |
-                  uv run python -c "import leafmap; print('leafmap import successful')"
+                  .venv\Scripts\python -c "import leafmap; print('leafmap import successful')"

leafmap/common.py

@@ -1516,11 +1516,15 @@ def kml_to_shp(in_kml, out_shp):
 
     check_package(name="geopandas", URL="https://geopandas.org")
 
-    import fiona
     import geopandas as gpd
 
-    # print(fiona.supported_drivers)
-    fiona.drvsupport.supported_drivers["KML"] = "rw"
+    try:
+        import fiona
+
+        fiona.drvsupport.supported_drivers["KML"] = "rw"
+    except ImportError:
+        # fiona is optional; the default pyogrio engine reads KML natively.
+        pass
     df = gpd.read_file(in_kml, driver="KML")
     df.to_file(out_shp)
 
@@ -1555,12 +1559,15 @@ def kml_to_geojson(in_kml, out_geojson=None):
 
     check_package(name="geopandas", URL="https://geopandas.org")
 
-    import fiona
     import geopandas as gpd
 
-    # import fiona
-    # print(fiona.supported_drivers)
-    fiona.drvsupport.supported_drivers["KML"] = "rw"
+    try:
+        import fiona
+
+        fiona.drvsupport.supported_drivers["KML"] = "rw"
+    except ImportError:
+        # fiona is optional; the default pyogrio engine reads KML natively.
+        pass
     gdf = gpd.read_file(in_kml, driver="KML")
 
     if out_geojson is not None:
@@ -1693,7 +1700,6 @@ def vector_to_geojson(
 
     warnings.filterwarnings("ignore")
     check_package(name="geopandas", URL="https://geopandas.org")
-    import fiona
     import geopandas as gpd
 
     if not filename.startswith("http"):
@@ -1702,7 +1708,13 @@ def vector_to_geojson(
             filename = "zip://" + filename
     ext = os.path.splitext(filename)[1].lower()
     if ext == ".kml":
-        fiona.drvsupport.supported_drivers["KML"] = "rw"
+        try:
+            import fiona
+
+            fiona.drvsupport.supported_drivers["KML"] = "rw"
+        except ImportError:
+            # fiona is optional; the default pyogrio engine reads KML natively.
+            pass
         df = gpd.read_file(
             filename,
             bbox=bbox,
@@ -3950,11 +3962,47 @@ def geojson_to_gdf(in_geojson, encoding="utf-8", **kwargs: Any):
         with open(out_file, "w") as f:
             json.dump(in_geojson, f)
             in_geojson = out_file
+    elif isinstance(in_geojson, str) and in_geojson.startswith("http"):
+        try:
+            return gpd.read_file(in_geojson, encoding=encoding, **kwargs)
+        except Exception:
+            response = requests.get(in_geojson, timeout=30)
+            response.raise_for_status()
+            data = response.json()
+            if isinstance(data, dict) and data.get("type") == "Feature":
+                return gpd.GeoDataFrame.from_features([data], **kwargs)
+            return gpd.GeoDataFrame.from_features(data, **kwargs)
 
     gdf = gpd.read_file(in_geojson, encoding=encoding, **kwargs)
     return gdf
 
 
+def sanitize_geojson(obj: Any) -> Any:
+    """Recursively converts NumPy types in a GeoJSON-like object to native Python types.
+
+    GeoDataFrame.__geo_interface__ can leave NumPy arrays/scalars in feature
+    properties (e.g. list-valued columns are read back as ndarrays), which are
+    not JSON serializable and break widget serialization. This makes the object
+    safe for ``json.dumps``.
+
+    Args:
+        obj (Any): A GeoJSON dict, list, or scalar that may contain NumPy types.
+
+    Returns:
+        Any: The same structure with NumPy arrays converted to lists and NumPy
+        scalars to native Python types.
+    """
+    if isinstance(obj, np.ndarray):
+        return obj.tolist()
+    elif isinstance(obj, np.generic):
+        return obj.item()
+    elif isinstance(obj, dict):
+        return {key: sanitize_geojson(value) for key, value in obj.items()}
+    elif isinstance(obj, (list, tuple)):
+        return [sanitize_geojson(value) for value in obj]
+    return obj
+
+
 def geojson_to_df(in_geojson, encoding="utf-8", drop_geometry=True):
     """Converts a GeoJSON object to a pandas DataFrame.
 

leafmap/foliumap.py

@@ -2046,10 +2046,10 @@ def add_geojson(
                         with open(output, "r") as fd:
                             data = json.load(fd)
                     else:
-                        gdf = gpd.read_file(in_geojson, encoding=encoding)
+                        gdf = geojson_to_gdf(in_geojson, encoding=encoding)
 
                 else:
-                    gdf = gpd.read_file(in_geojson, encoding=encoding)
+                    gdf = geojson_to_gdf(in_geojson, encoding=encoding)
 
             elif isinstance(in_geojson, dict):
                 gdf = gpd.GeoDataFrame.from_features(in_geojson)
@@ -2067,7 +2067,7 @@ def add_geojson(
             gdf.crs = "EPSG:4326"
         elif gdf.crs != "EPSG:4326":
             gdf = gdf.to_crs("EPSG:4326")
-        data = gdf.__geo_interface__
+        data = common.sanitize_geojson(gdf.__geo_interface__)
 
         # interchangeable parameters between ipyleaflet and folium.
 
@@ -2411,11 +2411,16 @@ def add_vector(
             opacity (float, optional): The opacity of the layer. Defaults to 1.0.
 
         """
-        import fiona
         import geopandas as gpd
 
         if isinstance(filename, str) and filename.endswith(".kml"):
-            fiona.drvsupport.supported_drivers["KML"] = "rw"
+            try:
+                import fiona
+
+                fiona.drvsupport.supported_drivers["KML"] = "rw"
+            except ImportError:
+                # fiona is optional; the default pyogrio engine reads KML natively.
+                pass
             gdf = gpd.read_file(
                 filename,
                 bbox=bbox,