From a0bcb0d466b7b7f2746a6461f7694e57af29bdfe Mon Sep 17 00:00:00 2001 From: rhutten Date: Wed, 28 Oct 2020 11:43:08 +0100 Subject: [PATCH] added todo's for #11 --- examples/test_osm.py | 28 ++++++++++++++++++++-------- setup.py | 3 ++- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/examples/test_osm.py b/examples/test_osm.py index 9e3f3c7..b2484b3 100644 --- a/examples/test_osm.py +++ b/examples/test_osm.py @@ -15,14 +15,26 @@ print(type(osm)) # TODO: read branches, culvert, cross sections and properties from file and plot network to check - -# TODO: snapping of open drains over culverts. May not be needed as wel only use parameterized profiles - -# TODO: make culvert points (midpoint) with properties - -# TODO assign elevation value to cross sections. this needs to be retrieved from a DEM (which we have!) - -# TODO: where cross sections are meeting a culvert, it may make sense to straighten the elevation value up and downstream of culvert +# TODO: BRANCHES - read id column from json. Do not deviate between drain type +# TODO: BRANCHES - connect branches on the right locations +# TODO: plot branches + +# TODO: CROSS SECTIONS DEFINTION - read id, drain_type, material, width, depth, top_width, diameter, profile_op, profile_cl, bottom_width columns from json +# TODO: CROSS SECTIONS DEFINTION - specify roughness dependent on material add this +# TODO: CROSS SECTION DEFINITION - assign elevation value to cross sections. this needs to be retrieved from a DEM (which we have!) +# TODO: CROSS SECTION DEFINITION - create circular profiles --> prof_idofbranch +# TODO: CROSS SECTION DEFINITION - create rectangular profiles --> prof_idofbranch +# TODO: CROSS SECTION DEFINITION - create trapezoid profiles --> prof_idofbranch +# TODO: CROSS SECTION LOCATION - select rows with drain type other than culvert +# TODO: CROSS SECTION LOCATION - add cross sections at start and end of branch. Take the longitudinal slope with SHIFT parameter into account +# TODO: plot branches + cross sections locations + +# TODO: STRUCTURE - read id, draintype +# TODO: STRUCTURE - select rows with draintype culvert +# TODO: STRUCTURE - determine length and midpoint location culvert +# TODO: STRUCTURE - snapping of open drains over culverts. May not be needed as wel only use parameterized profiles +# TODO: STRUCTURE - where cross sections are meeting a culvert, it may make sense to straighten the elevation value up and downstream of culvert +# TODO: plot branches + cross sections locations + structures # TODO: create DFM parsers for drains, culverts and cross sections based on dfmmodel.structures.io.xxxx_from_hydamo as example diff --git a/setup.py b/setup.py index 009ba5f..fbd825e 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ test_suite="tests", use_scm_version=True, setup_requires=["setuptools_scm"], - python_requires=">=3.6", + python_requires=">=3.7", install_requires=[ "gdal", "geopandas", @@ -34,6 +34,7 @@ "rasterio", "rasterstats", "scipy", + "setuptools", "setuptools_scm", "tqdm" ],