Merge pull request #3 from joshuasundance-swca/restgdf

geospatial-data-converter/app.py

@@ -1,11 +1,28 @@
+import asyncio
 import os
 
+import geopandas as gpd
 import streamlit as st
+from aiohttp import ClientSession
+from restgdf import Rest
 
 from utils import read_file, convert, output_format_dict
 
 __version__ = "0.0.3"
 
+
+def st_init_null(*variable_names) -> None:
+    for variable_name in variable_names:
+        if variable_name not in st.session_state:
+            st.session_state[variable_name] = None
+
+
+st_init_null(
+    "fn_without_extension",
+    "gdf",
+)
+
+
 # --- Initialization ---
 st.set_page_config(
     page_title=f"geospatial-data-converter v{__version__}",
@@ -13,7 +30,15 @@ st.set_page_config(
 )
 
 
-# Upload the file
+# Enter a URL
+st.text_input(
+    "Enter a URL to an ArcGIS featurelayer",
+    key="arcgis_url",
+    placeholder="https://maps1.vcgov.org/arcgis/rest/services/Beaches/MapServer/6",
+)
+
+
+# Or upload a file
 st.file_uploader(
     "Choose a geospatial file",
     key="uploaded_file",
@@ -21,13 +46,30 @@ st.file_uploader(
 )
 
 
-if st.session_state.uploaded_file is not None:
-    fn_without_extension, _ = os.path.splitext(
+async def get_arcgis_data(url: str) -> tuple[str, gpd.GeoDataFrame]:
+    """Get data from an ArcGIS featurelayer"""
+    async with ClientSession() as session:
+        rest = await Rest.from_url(url, session=session)
+        name = rest.name
+        gdf = await rest.getgdf()
+    return name, gdf
+
+
+if st.session_state.arcgis_url:
+    st.session_state.fn_without_extension, gdf = asyncio.run(
+        get_arcgis_data(st.session_state.arcgis_url),
+    )
+
+    st.session_state.gdf = gdf
+
+elif st.session_state.uploaded_file is not None:
+    st.session_state.fn_without_extension, _ = os.path.splitext(
         os.path.basename(st.session_state.uploaded_file.name),
     )
 
     st.session_state.gdf = read_file(st.session_state.uploaded_file)
 
+if st.session_state.gdf is not None:
     st.selectbox(
         "Select output format",
         output_format_dict.keys(),
@@ -37,8 +79,8 @@ if st.session_state.uploaded_file is not None:
 
     if st.button("Convert"):
         file_ext, dl_ext, mimetype = output_format_dict[st.session_state.output_format]
-        output_fn = f"{fn_without_extension}.{file_ext}"
-        dl_fn = f"{fn_without_extension}.{dl_ext}"
+        output_fn = f"{st.session_state.fn_without_extension}.{file_ext}"
+        dl_fn = f"{st.session_state.fn_without_extension}.{dl_ext}"
 
         st.session_state.converted_data = convert(
             gdf=st.session_state.gdf,
@@ -55,7 +97,7 @@ if st.session_state.uploaded_file is not None:
 
     st.markdown(
         "---\n"
-        f"## {fn_without_extension}\n"
+        f"## {st.session_state.fn_without_extension}\n"
         f"### CRS: *{st.session_state.gdf.crs}*\n"
         f"### Shape: *{st.session_state.gdf.shape}*\n"
         "*(geometry omitted for display purposes)*",

requirements.txt

@@ -1,5 +1,7 @@
+aiohttp==3.8.6
 beautifulsoup4==4.12.2
 geopandas==0.14.0
 lxml==4.9.3
 pyogrio==0.6.0
+restgdf==0.0.13
 streamlit==1.27.2