very minimalvp

.env_template

@@ -0,0 +1,2 @@
+gfm_username=your-gfm-username
+gfm_password=your-gfm-password

.gitignore

@@ -1,3 +1,5 @@
+.env
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

README.md

@@ -1,3 +1,17 @@
 # Flood Mapping Tool
-TODO: New documentation. For now its kept on python 3.10 like original Mapaction app and packages have not yet been updated.
-Just create venv and pip install requirements
+
+## Installation & Running
+### GFM account
+To run the app you will need a (free) GFM account. To get one register at https://portal.gfm.eodc.eu/login . Once you have an account create a file `.env` with the content of `.env_template` where you will need to fill out your GFM username and password. The `.env` file will be gitignored.
+
+### Python
+For now kept on python 3.10 like original Mapaction app. Create and activate your python3.10 venv in your preferred way, then:
+```
+pip install -r requirements.txt
+streamlit run app/Home.py
+```
+For now its kept on python 3.10 like original Mapaction app and packages have not yet been updated.
+Just create venv and pip install requirements. Then `streamlit run app/Home.py`
+
+## Project
+TODO: Add more complete documentation. 

app/pages/1_🌍_Flood_extent_analysis.py

@@ -1,21 +1,16 @@
 """Flood extent analysis page for Streamlit app."""
 
-import datetime as dt
-
 import folium
-import geemap.foliumap as geemap
-import requests
 import streamlit as st
-import streamlit_ext as ste
 from folium.plugins import Draw, Geocoder, MiniMap
 from src.config_parameters import params
+from src.gfm import download_stuff, visualise_stuff
 from src.utils import (
     add_about,
     add_logo,
     set_tool_page_style,
     toggle_menu_button,
 )
-from src.utils_flood_analysis import derive_flood_extents
 from streamlit_folium import st_folium
 
 # Page configuration
@@ -37,14 +32,14 @@ set_tool_page_style()
 # Output_created is useful to decide whether the bottom panel with the
 # output map should be visualised or not
 if "output_created" not in st.session_state:
-    st.session_state.output_created = False
+    st.session_state.output_created = True
 
 
 # Function to be used to hide bottom panel (when setting parameters for a
 # new analysis)
 def callback():
     """Set output created to zero: reset tool."""
-    st.session_state.output_created = False
+    st.session_state.output_created = True
 
 
 # Create two rows: top and bottom panel
@@ -119,6 +114,7 @@ if submitted:
                 coords = output["all_drawings"][-1]["geometry"]["coordinates"][0]
                 print(f"Coords: {coords}")
                 # Create geometry from coordinates
+                download_stuff(coords)
                 st.session_state.output_created = True
 
 # If computation was successful, create output map in bottom panel
@@ -126,60 +122,4 @@ if st.session_state.output_created:
     with row2:
         # Add collapsable container for output map
         with st.expander("Output map", expanded=True):
-            st.success("Calc complete")
-            # # Export Map2 to streamlit
-            # st.session_state.Map2.to_streamlit()
-            # # Create button to export to file
-            # submitted2 = st.button("Export to file")
-            # # What happens if button is clicked on?
-            # if submitted2:
-            #     # Add output for computation
-            #     with st.spinner("Computing... Please wait..."):
-            #         try:
-            #             # Get download url for raster data
-            #             raster = st.session_state.detected_flood_raster
-            #             url_r = raster.getDownloadUrl(
-            #                 {
-            #                     "region": st.session_state.ee_geom_region,
-            #                     "scale": 30,
-            #                     "format": "GEO_TIFF",
-            #                 }
-            #             )
-            #         except Exception:
-            #             st.error(
-            #                 """
-            #                 The image size is too big for the image to
-            #                 be exported to file. Select a smaller area
-            #                 of interest (side <~ 150km) and repeat the
-            #                 analysis.
-            #                 """
-            #             )
-            #         else:
-            #             response_r = requests.get(url_r)
-            #             # Get download url for raster data
-            #             vector = st.session_state.detected_flood_vector
-            #             url_v = vector.getDownloadUrl("GEOJSON")
-            #             response_v = requests.get(url_v)
-            #             filename = "flood_extent"
-            #             timestamp = dt.datetime.now().strftime("%Y-%m-%d_%H-%M")
-            #             with row2:
-            #                 # Create download buttons for raster and vector
-            #                 # data
-            #                 with open("flood_extent.tif", "wb"):
-            #                     ste.download_button(
-            #                         label="Download Raster Extent",
-            #                         data=response_r.content,
-            #                         file_name=(f"{filename}_raster_{timestamp}.tif"),
-            #                         mime="image/tif",
-            #                     )
-            #                 with open("flood_extent.geojson", "wb"):
-            #                     ste.download_button(
-            #                         label="Download Vector Extent",
-            #                         data=response_v.content,
-            #                         file_name=(
-            #                             f"{filename}_vector_{timestamp}.geojson"
-            #                         ),
-            #                         mime="text/json",
-            #                     )
-            #             # Output for computation complete
-            #             st.success("Computation complete")
+            visualise_stuff()

app/src/gfm.py

@@ -0,0 +1,85 @@
+import io
+import json
+import os
+import zipfile
+from pathlib import Path
+
+import folium
+import requests
+from dotenv import load_dotenv
+from streamlit_folium import st_folium
+
+load_dotenv()
+
+
+def download_stuff(coordinates):
+    username = os.environ["gfm_username"]
+    password = os.environ["gfm_password"]
+    base_url = "https://api.gfm.eodc.eu/v1"
+
+    # Get token, setup header
+    token_url = f"{base_url}/auth/login"
+
+    payload = {"email": username, "password": password}
+
+    response = requests.post(token_url, json=payload)
+    user_id = response.json()["client_id"]
+    access_token = response.json()["access_token"]
+    header = {"Authorization": f"bearer {access_token}"}
+    print("logged in")
+
+    # Create area of impact
+    create_aoi_url = f"{base_url}/aoi/create"
+
+    payload = {
+        "aoi_name": "new_area",
+        "description": "new_area",
+        "user_id": user_id,
+        "geoJSON": {"type": "Polygon", "coordinates": [coordinates]},
+    }
+
+    r = requests.post(url=create_aoi_url, json=payload, headers=header)
+    print(r.text)
+    print("Posted new AOI")
+    # Get Area of Impact
+    aoi_url = f"{base_url}/aoi/user/{user_id}"
+
+    response = requests.get(aoi_url, headers=header)
+    for aoi in response.json()["aois"]:
+        if aoi["aoi_name"] == "new_area":
+            aoi_id = aoi["aoi_id"]
+            break
+
+    # Get product id
+    prod_url = f"{base_url}/aoi/{aoi_id}/products"
+    response = requests.get(prod_url, headers=header)
+    product_id = response.json()["products"][0]["product_id"]
+    print(f"got product_id {product_id}")
+
+    # Get download link
+    download_url = f"{base_url}/download/product/{product_id}"
+    response = requests.get(download_url, headers=header)
+    download_link = response.json()["download_link"]
+    print("Got download link")
+
+    # Download and unzip file
+    for f in Path("./output").glob("*"):
+        f.unlink()
+    r = requests.get(download_link)
+    z = zipfile.ZipFile(io.BytesIO(r.content))
+    z.extractall("./output")
+
+
+def visualise_stuff():
+    # get geosjon with floods
+    for f in Path("./output").glob("*"):
+        if "FLOOD" in str(f) and "geojson" in str(f):
+            geojson_path = f
+
+    # Create map
+    flood_geojson = json.load(open(geojson_path))
+
+    m = folium.Map([54, -2], zoom_start=7)
+    folium.GeoJson(flood_geojson, name="geojson").add_to(m)
+    m
+    st_folium(m, width=800, height=450, returned_objects=[])

requirements.txt

@@ -5,4 +5,5 @@ streamlit==1.14.1
 streamlit_ext==0.1.4
 streamlit-folium==0.7.0
 pre-commit==2.18.1
-altair<5
+altair<5
+python-dotenv==1.0.1