diff --git a/README.md b/README.md index 712b182..aeb5e77 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ from prettymapp.osm import get_osm_geometries from prettymapp.plotting import Plot from prettymapp.settings import STYLES -aoi = get_aoi(address="Brandenburger Tor, Berlin", distance=500, rectangular=True) +aoi = get_aoi(address="Praça Ferreira do Amaral, Macau", radius=1100, rectangular=False) df = get_osm_geometries(aoi=aoi) fig = Plot( diff --git a/prettymapp/geo.py b/prettymapp/geo.py index 4950003..dbd62c1 100644 --- a/prettymapp/geo.py +++ b/prettymapp/geo.py @@ -22,7 +22,7 @@ def validate_coordinates(lat: float, lon: float) -> None: def get_aoi( address: Optional[str] = None, coordinates: Optional[Tuple[float, float]] = None, - distance: int = 1000, + radius: int = 1000, rectangular: bool = False, ) -> Polygon: """ @@ -31,7 +31,7 @@ def get_aoi( Args: address: Address string coordinates: lat, lon - distance: Radius in meter + radius: Radius in meter rectangular: Optionally return aoi as rectangular polygon, default False. Returns: @@ -56,7 +56,7 @@ def get_aoi( ) utm_crs = df.estimate_utm_crs() df = df.to_crs(utm_crs) - df.geometry = df.geometry.buffer(distance) + df.geometry = df.geometry.buffer(radius) df = df.to_crs(crs=4326) poly = df.iloc[0].geometry diff --git a/setup.py b/setup.py index 11a3005..913e3e9 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name="prettymapp", - version="0.0.1", + version="0.0.3", author="Christoph Rieke", author_email="christoph.k.rieke@gmail.com", description="", @@ -13,7 +13,7 @@ long_description_content_type="text/markdown", url="https://github.com/chrieke/prettymapp", license="MIT", - packages=find_packages(exclude=("tests", "streamlit-prettymapp")), + packages=find_packages(exclude=("prettymapp/tests", "streamlit-prettymapp", "cache")), package_data={"": ["fonts/PermanentMarker-Regular.ttf"]}, data_files=[ ("", ["requirements.txt"]), diff --git a/streamlit-prettymapp/app.py b/streamlit-prettymapp/app.py index b2ba193..71f9ead 100644 --- a/streamlit-prettymapp/app.py +++ b/streamlit-prettymapp/app.py @@ -160,7 +160,7 @@ with st.spinner("Creating map... (may take up to a minute)"): rectangular = shape != "circle" try: - aoi = get_aoi(address=address, distance=radius, rectangular=rectangular) + aoi = get_aoi(address=address, radius=radius, rectangular=rectangular) except GeoCodingError as e: st.error(f"ERROR: {str(e)}") st.stop()