Merge pull request #87 from gboeing/1.9.3

updates for v1.9.3
gboeing · May 2, 2024 · e45af2c · e45af2c
2 parents 7beebac + 03cb49f
commit e45af2c
Show file tree

Hide file tree

Showing 23 changed files with 103 additions and 121 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,6 +5,7 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v4.5.0"
+    rev: "v4.6.0"
     hooks:
       - id: check-added-large-files
         args: [--maxkb=50]

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016–2024 Geoff Boeing https://geoffboeing.com/
+Copyright (c) 2016-2024 Geoff Boeing https://geoffboeing.com/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,18 +1,17 @@
+# OSMnx Examples Gallery
+
 [![GitHub tag](https://img.shields.io/github/v/tag/gboeing/osmnx-examples?label=Uses+OSMnx)](https://github.com/gboeing/osmnx)
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/gboeing/osmnx-examples/main?urlpath=lab)
 [![Build Status](https://github.com/gboeing/osmnx-examples/workflows/tests/badge.svg?branch=main)](https://github.com/gboeing/osmnx-examples/actions?query=workflow%3Atests)
 
-# OSMnx Examples Gallery
-
-OSMnx 2.0 is coming soon: read the [migration guide](https://github.com/gboeing/osmnx/issues/1123).
+OSMnx 2.0 is in beta: read the [migration guide](https://github.com/gboeing/osmnx/issues/1123).
 
-[OSMnx](https://github.com/gboeing/osmnx) is a Python package to download, model, analyze, and visualize street networks and other geospatial features from [OpenStreetMap](https://www.openstreetmap.org/copyright/). You can download and model walking, driving, or biking networks with a single line of code then easily analyze and visualize them. You can just as easily work with urban amenities/points of interest, building footprints, transit stops, elevation data, street orientations, speed/travel time, and routing.
+[OSMnx](https://github.com/gboeing/osmnx) is a Python package to easily download, model, analyze, and visualize street networks and other geospatial features from OpenStreetMap. You can download and model walking, driving, or biking networks with a single line of code then analyze and visualize them. You can just as easily work with urban amenities/points of interest, building footprints, transit stops, elevation data, street orientations, speed/travel time, and routing.
 
 This gallery contains step-by-step usage tutorials and feature demonstrations as Jupyter notebooks. You can run these notebooks interactively online with [Binder](https://mybinder.org/v2/gh/gboeing/osmnx-examples/main?urlpath=lab) or locally with the official OSMnx [Docker image](https://hub.docker.com/r/gboeing/osmnx). All of the examples are in this repo's [notebooks](notebooks) folder. Note that this repo's main branch generally tracks the functionality of the OSMnx repo's main branch. For examples corresponding to previously released versions of OSMnx, use this repo's tags to browse by release.
 
 ### More info:
 
-- [Overview of OSMnx](https://geoffboeing.com/2016/11/osmnx-python-street-networks/)
-- [OSMnx repo](https://github.com/gboeing/osmnx)
 - [Documentation](https://osmnx.readthedocs.io/)
-- [Journal article and citation info](https://geoffboeing.com/publications/osmnx-complex-street-networks/)
+- [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)
+- [Code repository](https://github.com/gboeing/osmnx)
diff --git a/environment.yml b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - jupyterlab
-  - osmnx=1.9.2
+  - osmnx=1.9.3
   - pillow
   - pre-commit
   - python=3.11.*

diff --git a/notebooks/00-osmnx-features-demo.ipynb b/notebooks/00-osmnx-features-demo.ipynb
@@ -8,15 +8,14 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "Get street networks and other spatial data anywhere in the world from OpenStreetMap then analyze and visualize them.\n",
+    "Model street networks and other geospatial features anywhere in the world from OpenStreetMap then analyze and visualize them.\n",
     "\n",
     "More info:\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [Documentation and install instructions](https://osmnx.readthedocs.io)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Journal article and citation info](http://geoffboeing.com/publications/osmnx-complex-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)\n",
     "  \n",
     "This notebook provides a quick tour of some of OSMnx's key features including how to:\n",
     "\n",
@@ -455,7 +454,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/01-overview-osmnx.ipynb b/notebooks/01-overview-osmnx.ipynb
@@ -8,11 +8,10 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)\n",
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)\n",
     "  \n",
     "Once you've perused the [features demo notebook](00-osmnx-features-demo.ipynb), this notebook demonstrates more details on querying for place boundaries and street networks, visualizing, and saving models to disk."
    ]
@@ -485,7 +484,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/02-routing-speed-time.ipynb b/notebooks/02-routing-speed-time.ipynb
@@ -10,11 +10,10 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -227,8 +226,8 @@
    "source": [
     "# compare the two routes\n",
     "route1_length = int(sum(ox.routing.route_to_gdf(G, route1, weight=\"length\")[\"length\"]))\n",
-    "route2_length = int(sum(ox.routing.route_to_gdf(G, route2, weight=\"length\")[\"length\"]))\n",
-    "route1_time = int(sum(ox.routing.route_to_gdf(G, route1, weight=\"travel_time\")[\"travel_time\"]))\n",
+    "route2_length = int(sum(ox.routing.route_to_gdf(G, route2, weight=\"travel_time\")[\"length\"]))\n",
+    "route1_time = int(sum(ox.routing.route_to_gdf(G, route1, weight=\"length\")[\"travel_time\"]))\n",
     "route2_time = int(sum(ox.routing.route_to_gdf(G, route2, weight=\"travel_time\")[\"travel_time\"]))\n",
     "print(\"Route 1 is\", route1_length, \"meters and takes\", route1_time, \"seconds.\")\n",
     "print(\"Route 2 is\", route2_length, \"meters and takes\", route2_time, \"seconds.\")"
@@ -395,7 +394,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/03-graph-place-queries.ipynb b/notebooks/03-graph-place-queries.ipynb
@@ -8,11 +8,10 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)\n",
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)\n",
     "  \n",
     "Once you've perused the features demo and overview notebooks, this notebook provides further demonstration of querying by place name with OSMnx."
    ]
@@ -343,7 +342,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/04-simplify-graph-consolidate-nodes.ipynb b/notebooks/04-simplify-graph-consolidate-nodes.ipynb
@@ -8,11 +8,10 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -234,7 +233,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/05-save-load-networks.ipynb b/notebooks/05-save-load-networks.ipynb
@@ -8,11 +8,10 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)\n",
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)\n",
     "  \n",
     "This notebook demonstrates how to save networks to disk as GeoPackages, GraphML files, and .osm formatted XML, and how to load an OSMnx-created network from a GraphML file."
    ]
@@ -183,7 +182,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/06-stats-indicators-centrality.ipynb b/notebooks/06-stats-indicators-centrality.ipynb
@@ -8,11 +8,10 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -193,7 +192,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/07-plot-graph-over-shape.ipynb b/notebooks/07-plot-graph-over-shape.ipynb
@@ -10,11 +10,10 @@
     "\n",
     "This example uses Portland, Maine - a city with several islands within its municipal boundaries. Thus, we set `retain_all=True` when getting the network so that we keep all the graph components, not just the largest connected component.\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -115,7 +114,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/08-custom-filters-infrastructure.ipynb b/notebooks/08-custom-filters-infrastructure.ipynb
@@ -10,11 +10,10 @@
     "\n",
     "Use OSMnx to download and visualize a power line network and a subway system.\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -138,7 +137,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/09-example-figure-ground.ipynb b/notebooks/09-example-figure-ground.ipynb
@@ -10,11 +10,10 @@
     "\n",
     "Use OSMnx to download square-mile city street networks and visualize them as figure-ground diagrams. Discussed in this [blog post](http://geoffboeing.com/2017/01/square-mile-street-network-visualization/).\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -384,7 +383,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/10-building-footprints.ipynb b/notebooks/10-building-footprints.ipynb
@@ -10,11 +10,10 @@
     "\n",
     "Use OSMnx to download OpenStreetMap building footprints and visualize them as figure-ground diagrams.\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -277,7 +276,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/11-interactive-web-mapping.ipynb b/notebooks/11-interactive-web-mapping.ipynb
@@ -10,11 +10,10 @@
     "\n",
     "Use OSMnx to download a street network, calculate a route between two points, and create a Leaflet web map using GeoPandas [explore](https://geopandas.org/en/stable/docs/reference/api/geopandas.GeoDataFrame.explore.html). See the GeoPandas documentation for more style details.\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)"
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)"
    ]
   },
   {
@@ -287,7 +286,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/12-node-elevations-edge-grades.ipynb b/notebooks/12-node-elevations-edge-grades.ipynb
@@ -8,11 +8,10 @@
     "\n",
     "Author: [Geoff Boeing](https://geoffboeing.com/)\n",
     "\n",
-    "  - [Overview of OSMnx](http://geoffboeing.com/2016/11/osmnx-python-street-networks/)\n",
-    "  - [GitHub repo](https://github.com/gboeing/osmnx)\n",
-    "  - [Examples, demos, tutorials](https://github.com/gboeing/osmnx-examples)\n",
-    "  - [Documentation](https://osmnx.readthedocs.io/en/stable/)\n",
-    "  - [Journal article/citation](http://geoffboeing.com/publications/osmnx-complex-street-networks/)\n",
+    "  - [Documentation](https://osmnx.readthedocs.io/)\n",
+    "  - [Journal article and citation info](https://geoffboeing.com/publications/osmnx-paper/)\n",
+    "  - [Code repository](https://github.com/gboeing/osmnx)\n",
+    "  - [Examples gallery](https://github.com/gboeing/osmnx-examples)\n",
     "\n",
     "OSMnx allows you to automatically add elevation attributes to your graph's nodes with the `elevation` module, using either local raster files or the Google Maps Elevation API as the elevation data source. If you use the Google API, you will need an API key. Once your nodes have elevation values, OSMnx can automatically calculate your edges' grades (inclines)."
    ]
@@ -359,7 +358,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,