Merge pull request #17 from connorsutton/main

geospatial-data-converter/app.py

@@ -4,7 +4,7 @@ import os
 import geopandas as gpd
 import streamlit as st
 from aiohttp import ClientSession
-from restgdf import Rest
+from restgdf import FeatureLayer
 
 from utils import read_file, convert, output_format_dict
 
@@ -49,7 +49,7 @@ st.file_uploader(
 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)
+ rest = await FeatureLayer.from_url(url, session=session)
  name = rest.name
  gdf = await rest.getgdf()
  return name, gdf
@@ -63,11 +63,13 @@ if st.session_state.arcgis_url:
  st.session_state.gdf = gdf
 
 elif st.session_state.uploaded_file is not None:
+ # try:
  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)
+ # except AttributeError:
+ # pass # there is a lingering file from the previous instance, but it can be ignored
 
 if st.session_state.gdf is not None:
  st.selectbox(
@@ -103,6 +105,8 @@ if st.session_state.gdf is not None:
  "*(geometry omitted for display purposes)*",
  )
 
- display_df = st.session_state.gdf.drop(columns=["geometry"])
+ display_df = st.session_state.gdf.drop(columns=["geometry"]).to_dict(
+ orient="records",
+ )
 
  st.dataframe(display_df)

geospatial-data-converter/kml_tricks.py

@@ -89,7 +89,9 @@ def extract_data_from_kml_code(kml_code: str) -> pd.DataFrame:
  # Create a generator that yields a dictionary for each row, containing the Placemark name and each SimpleData field
  row_dicts = (
  {
- "Placemark_name": tag.parent.parent.find("name").text,
+ "Placemark_name": tag.parent.parent.find("name").text
+ if tag.parent.parent.find("name")
+ else "[no name]",
  **{field.get("name"): field.text for field in tag.find_all("simpledata")},
  }
  for tag in schema_data_tags

requirements.txt

@@ -1,7 +1,7 @@
-aiohttp==3.8.6
+aiohttp==3.9.0
 beautifulsoup4==4.12.2
-geopandas==0.14.0
+geopandas==0.14.1
 lxml==4.9.3
 pyogrio==0.7.2
-restgdf==0.0.13
-streamlit==1.28.1
+restgdf==0.9.7
+streamlit==1.28.2