Merge pull request #40 from chrieke/upgrade_dependencies

Upgrade dependencies

prettymapp/osm.py

@@ -1,4 +1,4 @@
-from osmnx.geometries import geometries_from_polygon
+from osmnx.features import features_from_polygon
 from osmnx import settings
 from geopandas import clip, GeoDataFrame
 from shapely.geometry import Polygon
@@ -19,7 +19,7 @@ def get_osm_geometries(aoi: Polygon) -> GeoDataFrame:
             except TypeError:  # e.g. "building": True
                 tags[k] = v
 
-    df = geometries_from_polygon(polygon=aoi, tags=tags)
+    df = features_from_polygon(polygon=aoi, tags=tags)
     df = df.droplevel(level=0)
     df = df[~df.geometry.geom_type.isin(["Point", "MultiPoint"])]
 

requirements.txt

@@ -1,4 +1,4 @@
-pandas==1.5.2 #osmnx subdependecies are partially unpinned
-numpy==1.23.5
-matplotlib==3.6.2
-osmnx==1.2.3
+pandas==2.0.3 #osmnx subdependecies are partially unpinned
+numpy==1.25.2
+osmnx==1.6.0
+matplotlib==3.7.2

streamlit-prettymapp/requirements.txt

@@ -1,3 +1,3 @@
-streamlit==1.25.0
+streamlit==1.26.0
 streamlit-image-select==0.6.0
 -e ../prettymapp

streamlit-prettymapp/utils.py

@@ -4,17 +4,19 @@
 import re
 from typing import Any
 import io
+import json
 
 from matplotlib.pyplot import figure
 import streamlit as st
 from geopandas import GeoDataFrame
+from shapely.geometry import Polygon
 
 from prettymapp.plotting import Plot
 from prettymapp.osm import get_osm_geometries
 from prettymapp.settings import STYLES
 
 
-@st.cache_data(show_spinner=False)
+@st.cache_data(show_spinner=False, hash_funcs={Polygon: lambda x: json.dumps(x.__geo_interface__)})
 def st_get_osm_geometries(aoi):
     """Wrapper to enable streamlit caching for package function"""
     df = get_osm_geometries(aoi=aoi)