Skip to content

Commit 7e767a8

Browse files
minor fixes with versioning
1 parent 4cb8530 commit 7e767a8

File tree

3 files changed

+24
-45
lines changed

3 files changed

+24
-45
lines changed

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[project]
22
name = "fimserve"
3-
version = "0.1.88"
43
version = "0.1.89"
54
description = "Framework which is developed with the purpose of quickly generating Flood Inundation Maps (FIM) for emergency response and risk assessment. It is developed under Surface Dynamics Modeling Lab (SDML)."
65
authors = [{ name = "Supath Dhital", email = "[email protected]" }]

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ aiobotocore==2.15.2
88
# via s3fs
99
aiohappyeyeballs==2.6.1
1010
# via aiohttp
11-
aiohttp==3.10.8
11+
aiohttp>=3.12.14
1212
# via
1313
# fimserve (pyproject.toml)
1414
# aiobotocore
@@ -208,7 +208,7 @@ flask-restx==1.3.2
208208
# via localtileserver
209209
folium==0.20.0
210210
# via geemap
211-
fonttools==4.60.1
211+
fonttools>=4.60.2
212212
# via matplotlib
213213
fqdn==1.5.1
214214
# via jsonschema
@@ -959,7 +959,7 @@ uri-template==1.3.0
959959
# via jsonschema
960960
uritemplate==4.2.0
961961
# via google-api-python-client
962-
urllib3==2.5.0
962+
urllib3>=2.6.0
963963
# via
964964
# botocore
965965
# requests
@@ -983,7 +983,7 @@ websocket-client==1.8.0
983983
# via jupyter-server
984984
websockets==15.0.1
985985
# via sphinx-autobuild
986-
werkzeug==3.1.3
986+
werkzeug>=3.1.4
987987
# via
988988
# flask
989989
# flask-cors

tests/test_evalutionhandfim.py

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,30 @@
55
# Look for the benchmark FIM data for the HUC8 and event date
66
def test_bm_fimlookup():
77
out = fm.fim_lookup(
8-
<<<<<<< HEAD
9-
HUCID="10170203",
10-
date_input="2019-09-19 16:00:00", # If user is more specific then they can pass date (with hour if known) along with HUC8
11-
run_handfim=True, #It will look for the owp hand fim for the mentioned HUC8 and date, if not found it will download and generate the owp hand fim
12-
# file_name="PSS_1_0m_20190919T165541_963659W424518N_BM.tif", #If user pass the specific filename, it will download that and assume that this is the right benchmark, else based on exact match of date it will look for the benchmark
13-
# out_dir = None, # If user want to save the benchmark fim in specific directory
14-
=======
158
HUCID="07070005",
169
date_input="2019-05-30 23:00:00", # If user is more specific then they can pass date (with hour if known) along with HUC8
17-
run_handfim=True, #It will look for the owp hand fim for the mentioned HUC8 and date, if not found it will download and generate the owp hand fim
18-
file_name="S1A_9_6m_20190530T23573_910244W430506N_BM.tif", #If user pass the specific filename, it will download that and assume that this is the right benchmark, else based on exact match of date it will look for the benchmark
19-
out_dir = "./FIMserv/test", # If user want to save the benchmark fim in specific directory
20-
>>>>>>> devsd
21-
# start_date="2024-06-20", #If user is not sure of the exact date then they can pass a range of dates
10+
run_handfim=True, # It will look for the OWP HAND FIM for the mentioned HUC8 and date; if not found it will download and generate the OWP HAND FIM
11+
file_name="S1A_9_6m_20190530T23573_910244W430506N_BM.tif", # If user passes a specific filename, it will download that and assume it is the right benchmark
12+
out_dir="./FIMserv/test", # If user wants to save the benchmark FIM in a specific directory
13+
# start_date="2024-06-20", # If user is not sure of the exact date then they can pass a range of dates
2214
# end_date="2024-06-25",
2315
)
2416
print(out)
25-
26-
#After finalizing the benchmark FIM data user can run evaluation
17+
18+
19+
# After finalizing the benchmark FIM data user can run evaluation
2720
def test_run_fimeval():
2821
fm.run_evaluation(
29-
<<<<<<< HEAD
30-
Main_dir=None, #If user use their own input directory to where FIM outputs; basically out_dir in fim_lookup us Main_dir here
31-
output_dir= None, #Folder where evaluation results will be saved
32-
shapefile_path= None, #AOI shapefile or vector file used to clip data during evaluation. Internally used the geopackage within folder.
33-
PWB_dir= None, #Directory containing the Permanent Water Bodies.
34-
building_footprint= None, #Local building footprint dataset (GeoJSON/Shapefile) for building-level exposure evaluation.
35-
=======
36-
Main_dir="./FIMserv/test", #If user use their own input directory to where FIM outputs; basically out_dir in fim_lookup us Main_dir here
37-
output_dir= None, #Folder where evaluation results will be saved
38-
shapefile_path= None, #AOI shapefile or vector file used to clip data during evaluation. Internally used the geopackage within folder.
39-
PWB_dir= None, #Directory containing the Permanent Water Bodies.
40-
building_footprint= "./AOI/building_footprint.gpkg", #Local building footprint dataset (GeoJSON/Shapefile) for building-level exposure evaluation.
41-
>>>>>>> devsd
42-
target_crs= None, #CRS to reproject FIM rasters to (e.g., "EPSG:3857").
43-
target_resolution= None, #Output raster resolution (units depend on CRS).
44-
method_name= None, #By default it will use 'AOI' which is downloaded but incase user want to explore different method they can pass here
45-
countryISO= None, #ISO-3 country code used only when downloading footprints from GEE.
46-
geeprojectID= None, #Google Earth Engine project ID for footprint download (if no local file provided).
47-
<<<<<<< HEAD
48-
print_graphs= False, #If True, generates and saves contingency maps and evaluation metric plots.
49-
Evalwith_BF= False, #If user want to run evaluation with building footprint
50-
=======
51-
print_graphs= True, #If True, generates and saves contingency maps and evaluation metric plots.
52-
Evalwith_BF= True, #If user want to run evaluation with building footprint
53-
>>>>>>> devsd
54-
)
22+
Main_dir="./FIMserv/test", # If user uses their own input directory where FIM outputs; basically out_dir in fim_lookup is Main_dir here
23+
output_dir=None, # Folder where evaluation results will be saved
24+
shapefile_path=None, # AOI shapefile or vector file used to clip data during evaluation. Internally uses the geopackage within folder.
25+
PWB_dir=None, # Directory containing the Permanent Water Bodies.
26+
building_footprint="./AOI/building_footprint.gpkg", # Local building footprint dataset (GeoJSON/Shapefile) for building-level exposure evaluation.
27+
target_crs=None, # CRS to reproject FIM rasters to (e.g., "EPSG:3857").
28+
target_resolution=None, # Output raster resolution (units depend on CRS).
29+
method_name=None, # By default it will use 'AOI'; to explore different methods pass here
30+
countryISO=None, # ISO-3 country code used only when downloading footprints from GEE.
31+
geeprojectID=None, # Google Earth Engine project ID for footprint download (if no local file provided).
32+
print_graphs=True, # If True, generates and saves contingency maps and evaluation metric plots.
33+
Evalwith_BF=True, # If True, run evaluation with building footprint
34+
)

0 commit comments

Comments
 (0)