-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updating the env_fix branch with changes from main (#182) #257
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update README.rst Removed outdated license text * Update pyproject.toml Update license * Modifications made after Frederique's review Modifications made after Frederique's review. Hydromt sfincs functions are out of hydromt fiat now. Every dataset required for hydromt fiat can be done in advace with hydromt sfincs. * update directory path * Making hazard functions explicits after Dirk review Makin hazard function explicit after Dirk review * Change of .rio for .raster hyndromt core function Change of .rio for .raster hyndromt core function * Adding parameter geom when reading raster data Adding parameter geom when reading raster data. It requires that self.region is always available. * Removing test using sfincs_map.nc Removing test using sfincs_map.nc. They are not processed anymore through hydromt fiat. * Updated building footprints code and test, added assert statements * Added to gitignore * Cleaned folder structure * inner merge to not discard values * add check that original and new exposure have same length * Update, function does not yet work * Added example to update the ground floor height and finalized code and test * Added polygons to overlay * Deleted output files * split the get_table_and_metadata function into two functions * Update the geoms and table properties of the FiatModel now only when writing the model, not before. * Updated settings.toml configuration file output * Update docs.yml * update by copying from hydromt * test docs * changed hydromt to hydromt-fiat-docs * test * added aggregation zones example * test docs workflow * update * another try * update * try again * Update paths * update paths * Fixed small bugs in example * Start of integration into the code base * Added Sarah as author * Bug fixes and update in fiat.py to read from the correct config variable * implemented empty functions for the roads and changed name of setup_exposure_vector function to setup_exposure_buildings * spelling mistake * removed docs branch in workflow * setting up functions * function for hazared and fraction values, create test for function * Update * update test * add unit test road * update function and test * update, roads test passed succesfully * update test roads * Tested and complete for now * Update LICENSE * add roadnotebook * update road notebook * Small update * update notebook roads * finalize road notebook * update file paths * update dictionary aggregation * Updated logo * update configuration.yaml and road notebook * update aggregation notebook and config * Updating the Z-score method (small change) * Update on view model * update * update notebook, config and gitignore * update notebook, add 2nd config * create 2 config files. Clean up notebook * added to gitignore * add check that polygons dont overlap * remove unused package * add notebook output files to gitignore * update absolute to relative path * writing a model is now possible from the GUI * added ground floor height (found_ht) * getting ground floor height from NSI data and setting geometry in a different way * Enable taking the GFH from the NSI immediately * update examples data * Update settings file and git ignore file Update settings file and git ignore file * Update gitignore Update gitignore * Changing .gpkg files Changing .gpkg files * Fixing integration hazard test, removing use on data catalog Fixing integration hazard test, removing use on data catalog * Remove path to area of interest and define it as geojson in the test files Remove path to area of interest and define it as geojson in the test files * fix issue of the vulnerability curves with the same name but different damage types * small update * Formatted cell * Implementation of setup ground elevation function including test Implementation of setup ground elevation function including test * Data produced in the runs Data produced in the runs, this data must be included in the .gitignore file * Change gitignore to avoid conflicts Change gitignore to avoid conflicts * Update gitignore Update gitignore * update gitignore update gitignore * Update git ignore Update git ignore * update test * Changes in names and more setup functions in the view model * visual damage curve, distinguish data input/output * Changed default road types to all road types * Update index.rst * Fixes examples for documentation * added aggregation areas to view model * fixing documentation errors * make aggregation areas and roads optional to build the config and run hydromt_fiat * small bug * remove roads from yaml standard * Changed types * Create hazus_iwr_occupancy_classes.csv * update datatypes aggregation Union(List, strings) * assert no polygons overlap * remove "aggregation Label": Label name... * update docstring * correct error message of overlapping polygons * Update hydromt_fiat_catalog_USA.yml * Adding changes to update maximum potential damage and ground elevation in new developed areas Adding changes to update maximum potential damage and ground elevation in new developed areas * formatting of the data catalog * Changes to merges branch with #145 Changes to merges branch with #145 * Update gitignore to merge branch with #145 Update gitignore to merge branch with #145 * update default road types * Added missing class descriptions * Fixed issues #190 , #165 , #204 & #163 - Finished the correct standardization procedure for the SVI #190 - Created extra column in exposure data with the highest scoring domain #165 - Automated the process of downloading block group shapefiles on the county scale and linking them to the block group data and removing having to download the shapefiles manually #204 - Created the set up to grab equity data, save that data with geometry data + created a test * Update hydromt_fiat/fiat.py Co-authored-by: frederique-hub <72015981+frederique-hub@users.noreply.github.com> * Update hydromt_fiat/workflows/equity_data.py Co-authored-by: frederique-hub <72015981+frederique-hub@users.noreply.github.com> * Update hydromt_fiat/workflows/equity_data.py Co-authored-by: frederique-hub <72015981+frederique-hub@users.noreply.github.com> * Update hydromt_fiat/workflows/equity_data.py Co-authored-by: frederique-hub <72015981+frederique-hub@users.noreply.github.com> * Changed function name to match the equity data * Added the SVI View Model * no changes * no changes * small changes * Change ground elevation test data Change ground elevation test data * Data required for tests Data required for tests * Update test data Update test data * Made it possible to just make a FIAT model with roads and some minor bug fixes in vulnerability.py * Small bug fix * Integrate ground elevation from a digital elevation model into the writing function Integrate ground elevation from a digital elevation model into the writing function * Added list of states and counties in the US * Update gitignore * Fix bug with step function threshold = 1 * Update vulnerability curves replacing * Update xarray-spatial in environment and project .toml Update xarray-spatial in environment and project .toml * Improvement of tests for assigning ground elevation and maximun potential damage from users data Improvement of tests for assigning ground elevation and maximun potential damage from users data * Updating ground elevation test, and updating maximum potential damage with user data test Updating ground elevation test, and updating maximum potential damage with user data test * Update test vulnerability exposure with dem data Update test vulnerability exposure with dem data * remove comented lines that were remplazed with ground_elevation_from_dem() function remove comented lines that were remplazed with ground_elevation_from_dem() function * take the right function * Update tests/test_setup_new_composite_areas_ground_elevation.py * Update hydromt_fiat/workflows/exposure_vector.py * Adding again the missing options * fix bugs, all tests running green now * Added geopy as dependency * added the us states and counties csv * Implemented automatic geolocating, for the state and county of the exposure data * Updating tests, cleaning data, adding different folders in the output * Changed names of columns * Delete the index_right column * updated according to deprication warning * bugfix * avoiding double downloading * Added ground floor height and part of damages connection in API * Adding separate function for the ground floor height and max potential damage updates * Bug fix for finding counties and parishes (are there other names for counties?) * api update, separated the update functions * create output folder with aggregation areas/additional attributes * create Building_footprints output folder * update single BF input to multiple. Add BF folder to exposure folder. * create add. attributes in root folder * update path (fix) add. attributes folder in root * deleted redundant code * Removed unnecessary lines * Implemented road damage to be set to 1 for road outages * Added ground elevation function to fiat.py and updated, still to be added to the api * small update fixing hazard map input * Updates according to bugfixing after failing tests * Added output from testdata to the gitignore * Updated path to equity data * Updating examples * Update hydromt_fiat/fiat.py Co-authored-by: frederique-hub <72015981+frederique-hub@users.noreply.github.com> * Update hydromt_fiat/fiat.py Co-authored-by: frederique-hub <72015981+frederique-hub@users.noreply.github.com> * Implemented that the SVI and equity shapefiles are saved in the right folder * Change of folder * The data was saved in the fiat folder where the model was read and not in the output. I moved the script to the write function to write it to the correct folder * Added additional assert for correctly saving the files * aligning with floodadapt needs * allow to directly provide a DataArray for the hazard raster * Added census block aggregation area in the exposure data when using setup_equity * Adding aggregation areas to new composite area * add self.svi variable * All good for the aggregation areas and ground elevation in new development areas * create variable of updated exposure df from run_hydromt() * reverse svi changes * update self.buildings with model output * #235 #237 #239 * update in hazard band naming * corrected unit conversion --------- Co-authored-by: Mares2022 <mario.fuentesmonjaraz@deltares.nl> Co-authored-by: sarah.rautenbach <sarah.rautenbach@deltares.nl> Co-authored-by: Santonia27 <145111392+Santonia27@users.noreply.github.com> Co-authored-by: LiekeMeijer <lieke.meijer@deltares.nl> Co-authored-by: Mares2022 <117270047+Mares2022@users.noreply.github.com> Co-authored-by: luisrodriguezgalvez <77997772+luisrodriguezgalvez@users.noreply.github.com> Co-authored-by: LiekeMeijer <112695332+LiekeMeijer@users.noreply.github.com> Co-authored-by: Panos Athanasiou <Panos.Athanasiou@deltares.nl> Co-authored-by: LuukBlom <153174893+LuukBlom@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removed outdated license text
Update license
Modifications made after Frederique's review. Hydromt sfincs functions are out of hydromt fiat now. Every dataset required for hydromt fiat can be done in advace with hydromt sfincs.
update directory path
Making hazard functions explicits after Dirk review
Makin hazard function explicit after Dirk review
Change of .rio for .raster hyndromt core function
Adding parameter geom when reading raster data. It requires that self.region is always available.
Removing test using sfincs_map.nc. They are not processed anymore through hydromt fiat.
Updated building footprints code and test, added assert statements
Added to gitignore
Cleaned folder structure
inner merge to not discard values
add check that original and new exposure have same length
Update, function does not yet work
Added example to update the ground floor height and finalized code and test
Added polygons to overlay
Deleted output files
split the get_table_and_metadata function into two functions
Update the geoms and table properties of the FiatModel now only when writing the model, not before.
Updated settings.toml configuration file output
Update docs.yml
update by copying from hydromt
test docs
changed hydromt to hydromt-fiat-docs
test
added aggregation zones example
test docs workflow
update
another try
update
try again
Update paths
update paths
Fixed small bugs in example
Start of integration into the code base
Added Sarah as author
Bug fixes and update in fiat.py to read from the correct config variable
implemented empty functions for the roads and changed name of setup_exposure_vector function to setup_exposure_buildings
spelling mistake
removed docs branch in workflow
setting up functions
function for hazared and fraction values, create test for function
Update
update test
add unit test road
update function and test
update, roads test passed succesfully
update test roads
Tested and complete for now
Update LICENSE
add roadnotebook
update road notebook
Small update
update notebook roads
finalize road notebook
update file paths
update dictionary aggregation
Updated logo
update configuration.yaml and road notebook
update aggregation notebook and config
Updating the Z-score method (small change)
Update on view model
update
update notebook, config and gitignore
update notebook, add 2nd config
create 2 config files. Clean up notebook
added to gitignore
add check that polygons dont overlap
remove unused package
add notebook output files to gitignore
update absolute to relative path
writing a model is now possible from the GUI
added ground floor height (found_ht)
getting ground floor height from NSI data and setting geometry in a different way
Enable taking the GFH from the NSI immediately
update examples data
Update settings file and git ignore file
Update settings file and git ignore file
Update gitignore
Changing .gpkg files
Fixing integration hazard test, removing use on data catalog
Remove path to area of interest and define it as geojson in the test files
fix issue of the vulnerability curves with the same name but different damage types
small update
Formatted cell
Implementation of setup ground elevation function including test
Implementation of setup ground elevation function including test
Data produced in the runs, this data must be included in the .gitignore file
Change gitignore to avoid conflicts
Update gitignore
update gitignore
Update git ignore
update test
Changes in names and more setup functions in the view model
visual damage curve, distinguish data input/output
Changed default road types to all road types
Update index.rst
Fixes examples for documentation
added aggregation areas to view model
fixing documentation errors
make aggregation areas and roads optional to build the config and run hydromt_fiat
small bug
remove roads from yaml standard
Changed types
Create hazus_iwr_occupancy_classes.csv
update datatypes aggregation Union(List, strings)
assert no polygons overlap
remove "aggregation Label": Label name...
update docstring
correct error message of overlapping polygons
Update hydromt_fiat_catalog_USA.yml
Adding changes to update maximum potential damage and ground elevation in new developed areas
Adding changes to update maximum potential damage and ground elevation in new developed areas
formatting of the data catalog
Changes to merges branch with Update maximum potential damages with user-input data #145
Changes to merges branch with #145
Update gitignore to merge branch with #145
update default road types
Added missing class descriptions
Fixed issues Correct standardization procedure SVI #190 , Create an extra column in the exposure data with the highest scoring domain #165 , Automating downloading of the block group shapefiles in SVI procedure #204 & Set up new function to grab the income and population data from the Census data #163
Update hydromt_fiat/fiat.py
Update hydromt_fiat/workflows/equity_data.py
Update hydromt_fiat/workflows/equity_data.py
Update hydromt_fiat/workflows/equity_data.py
Changed function name to match the equity data
Added the SVI View Model
no changes
no changes
small changes
Change ground elevation test data
Change ground elevation test data
Data required for tests
Update test data
Made it possible to just make a FIAT model with roads and some minor bug fixes in vulnerability.py
Small bug fix
Integrate ground elevation from a digital elevation model into the writing function
Integrate ground elevation from a digital elevation model into the writing function
Added list of states and counties in the US
Update gitignore
Fix bug with step function threshold = 1
Update vulnerability curves replacing
Update xarray-spatial in environment and project .toml
Update xarray-spatial in environment and project .toml
Improvement of tests for assigning ground elevation and maximun potential damage from users data
Updating ground elevation test, and updating maximum potential damage with user data test
Update test vulnerability exposure with dem data
remove comented lines that were remplazed with ground_elevation_from_dem() function
take the right function
Update tests/test_setup_new_composite_areas_ground_elevation.py
Update hydromt_fiat/workflows/exposure_vector.py
Adding again the missing options
fix bugs, all tests running green now
Added geopy as dependency
added the us states and counties csv
Implemented automatic geolocating, for the state and county of the exposure data
Updating tests, cleaning data, adding different folders in the output
Changed names of columns
Delete the index_right column
updated according to deprication warning
bugfix
avoiding double downloading
Added ground floor height and part of damages connection in API
Adding separate function for the ground floor height and max potential damage updates
Bug fix for finding counties and parishes (are there other names for counties?)
api update, separated the update functions
create output folder with aggregation areas/additional attributes
create Building_footprints output folder
update single BF input to multiple. Add BF folder to exposure folder.
create add. attributes in root folder
update path (fix) add. attributes folder in root
deleted redundant code
Removed unnecessary lines
Implemented road damage to be set to 1 for road outages
Added ground elevation function to fiat.py and updated, still to be added to the api
small update fixing hazard map input
Updates according to bugfixing after failing tests
Added output from testdata to the gitignore
Updated path to equity data
Updating examples
Update hydromt_fiat/fiat.py
Update hydromt_fiat/fiat.py
Implemented that the SVI and equity shapefiles are saved in the right folder
Change of folder
The data was saved in the fiat folder where the model was read and not in the output. I moved the script to the write function to write it to the correct folder
Added additional assert for correctly saving the files
aligning with floodadapt needs
allow to directly provide a DataArray for the hazard raster
Added census block aggregation area in the exposure data when using setup_equity
Adding aggregation areas to new composite area
add self.svi variable
All good for the aggregation areas and ground elevation in new development areas
create variable of updated exposure df from run_hydromt()
reverse svi changes
update self.buildings with model output
[GUI] Quick build #235 [GUI] Remove start from scratch #237 [GUI] Start tab -> Asset locations tab #239
update in hazard band naming
corrected unit conversion