Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 178 additions & 0 deletions QGIS-Styles/TUFLOW/depth_range_20251222.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis maxScale="0" version="3.44.5-Solothurn" autoRefreshMode="Disabled" styleCategories="LayerConfiguration|Symbology|MapTips|AttributeTable|Rendering|CustomProperties|Temporal|Elevation|Notes" minScale="1e+08" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0">
<flags>
<Identifiable>1</Identifiable>
<Removable>1</Removable>
<Searchable>0</Searchable>
<Private>0</Private>
</flags>
<temporal bandNumber="1" fetchMode="0" mode="0" enabled="0">
<fixedRange>
<start></start>
<end></end>
</fixedRange>
</temporal>
<elevation zscale="1" zoffset="0" mode="RepresentsElevationSurface" symbology="Line" band="1" enabled="0">
<data-defined-properties>
<Option type="Map">
<Option name="name" value="" type="QString"/>
<Option name="properties"/>
<Option name="type" value="collection" type="QString"/>
</Option>
</data-defined-properties>
<profileLineSymbol>
<symbol name="" frame_rate="10" type="line" alpha="1" clip_to_extent="1" is_animated="0" force_rhr="0">
<data_defined_properties>
<Option type="Map">
<Option name="name" value="" type="QString"/>
<Option name="properties"/>
<Option name="type" value="collection" type="QString"/>
</Option>
</data_defined_properties>
<layer pass="0" id="{6e48b7ef-b45c-4ce2-84f0-3c00f5bf08c6}" class="SimpleLine" locked="0" enabled="1">
<Option type="Map">
<Option name="align_dash_pattern" value="0" type="QString"/>
<Option name="capstyle" value="square" type="QString"/>
<Option name="customdash" value="5;2" type="QString"/>
<Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
<Option name="customdash_unit" value="MM" type="QString"/>
<Option name="dash_pattern_offset" value="0" type="QString"/>
<Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
<Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
<Option name="draw_inside_polygon" value="0" type="QString"/>
<Option name="joinstyle" value="bevel" type="QString"/>
<Option name="line_color" value="243,166,178,255,rgb:0.9529412,0.6509804,0.6980392,1" type="QString"/>
<Option name="line_style" value="solid" type="QString"/>
<Option name="line_width" value="0.6" type="QString"/>
<Option name="line_width_unit" value="MM" type="QString"/>
<Option name="offset" value="0" type="QString"/>
<Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
<Option name="offset_unit" value="MM" type="QString"/>
<Option name="ring_filter" value="0" type="QString"/>
<Option name="trim_distance_end" value="0" type="QString"/>
<Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
<Option name="trim_distance_end_unit" value="MM" type="QString"/>
<Option name="trim_distance_start" value="0" type="QString"/>
<Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
<Option name="trim_distance_start_unit" value="MM" type="QString"/>
<Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
<Option name="use_custom_dash" value="0" type="QString"/>
<Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
</Option>
<data_defined_properties>
<Option type="Map">
<Option name="name" value="" type="QString"/>
<Option name="properties"/>
<Option name="type" value="collection" type="QString"/>
</Option>
</data_defined_properties>
</layer>
</symbol>
</profileLineSymbol>
<profileFillSymbol>
<symbol name="" frame_rate="10" type="fill" alpha="1" clip_to_extent="1" is_animated="0" force_rhr="0">
<data_defined_properties>
<Option type="Map">
<Option name="name" value="" type="QString"/>
<Option name="properties"/>
<Option name="type" value="collection" type="QString"/>
</Option>
</data_defined_properties>
<layer pass="0" id="{d02134be-e195-4459-ad7f-9ac906615abe}" class="SimpleFill" locked="0" enabled="1">
<Option type="Map">
<Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
<Option name="color" value="243,166,178,255,rgb:0.9529412,0.6509804,0.6980392,1" type="QString"/>
<Option name="joinstyle" value="bevel" type="QString"/>
<Option name="offset" value="0,0" type="QString"/>
<Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
<Option name="offset_unit" value="MM" type="QString"/>
<Option name="outline_color" value="35,35,35,255,rgb:0.1372549,0.1372549,0.1372549,1" type="QString"/>
<Option name="outline_style" value="no" type="QString"/>
<Option name="outline_width" value="0.26" type="QString"/>
<Option name="outline_width_unit" value="MM" type="QString"/>
<Option name="style" value="solid" type="QString"/>
</Option>
<data_defined_properties>
<Option type="Map">
<Option name="name" value="" type="QString"/>
<Option name="properties"/>
<Option name="type" value="collection" type="QString"/>
</Option>
</data_defined_properties>
</layer>
</symbol>
</profileFillSymbol>
</elevation>
<customproperties>
<Option type="Map">
<Option name="WMSBackgroundLayer" value="false" type="QString"/>
<Option name="WMSPublishDataSourceUrl" value="false" type="QString"/>
<Option name="embeddedWidgets/count" value="0" type="QString"/>
<Option name="identify/format" value="Value" type="QString"/>
</Option>
</customproperties>
<mapTip enabled="1"></mapTip>
<pipe-data-defined-properties>
<Option type="Map">
<Option name="name" value="" type="QString"/>
<Option name="properties"/>
<Option name="type" value="collection" type="QString"/>
</Option>
</pipe-data-defined-properties>
<pipe>
<provider>
<resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
</provider>
<rasterrenderer alphaBand="-1" type="singlebandpseudocolor" opacity="1" nodataColor="" band="1" classificationMin="0.05" classificationMax="100">
<rasterTransparency/>
<minMaxOrigin>
<limits>None</limits>
<extent>WholeRaster</extent>
<statAccuracy>Estimated</statAccuracy>
<cumulativeCutLower>0.02</cumulativeCutLower>
<cumulativeCutUpper>0.98</cumulativeCutUpper>
<stdDevFactor>2</stdDevFactor>
</minMaxOrigin>
<rastershader>
<colorrampshader labelPrecision="2" maximumValue="100" clip="1" minimumValue="0.050000000000000003" colorRampType="DISCRETE" classificationMode="1">
<colorramp name="[source]" type="gradient">
<Option type="Map">
<Option name="color1" value="255,255,255,0,rgb:1,1,1,0" type="QString"/>
<Option name="color2" value="8,48,107,255,rgb:0.0313725,0.1882353,0.4196078,1" type="QString"/>
<Option name="direction" value="ccw" type="QString"/>
<Option name="discrete" value="0" type="QString"/>
<Option name="rampType" value="gradient" type="QString"/>
<Option name="spec" value="rgb" type="QString"/>
<Option name="stops" value="0.00050025;215,230,245,255,rgb:0.8431373,0.9019608,0.9607843,1;rgb;ccw:0.002001;175,209,231,255,rgb:0.6862745,0.8196078,0.9058824,1;rgb;ccw:0.00450225;115,178,216,255,rgb:0.4509804,0.6980392,0.8470588,1;rgb;ccw:0.00950475;62,142,196,255,rgb:0.2431373,0.5568627,0.7686275,1;rgb;ccw:0.0195098;22,99,170,255,rgb:0.0862745,0.3882353,0.6666667,1;rgb;ccw" type="QString"/>
</Option>
</colorramp>
<item color="#ffffff" value="0.05" alpha="0" label="&lt;= 0.05"/>
<item color="#d7e6f5" value="0.1" alpha="255" label="0.05 - 0.10"/>
<item color="#afd1e7" value="0.25" alpha="255" label="0.10 - 0.25"/>
<item color="#73b2d8" value="0.5" alpha="255" label="0.25 - 0.50"/>
<item color="#3e8ec4" value="1" alpha="255" label="0.50 - 1.00"/>
<item color="#1663aa" value="2" alpha="255" label="1.00 - 2.00"/>
<item color="#08306b" value="9999999" alpha="255" label=">2"/>
<rampLegendSettings orientation="2" direction="0" useContinuousLegend="1" suffix="" minimumLabel="" maximumLabel="" prefix="">
<numericFormat id="basic">
<Option type="Map">
<Option name="decimal_separator" type="invalid"/>
<Option name="decimals" value="6" type="int"/>
<Option name="rounding_type" value="0" type="int"/>
<Option name="show_plus" value="false" type="bool"/>
<Option name="show_thousand_separator" value="true" type="bool"/>
<Option name="show_trailing_zeros" value="false" type="bool"/>
<Option name="thousand_separator" type="invalid"/>
</Option>
</numericFormat>
</rampLegendSettings>
</colorrampshader>
</rastershader>
</rasterrenderer>
<brightnesscontrast gamma="1" contrast="0" brightness="0"/>
<huesaturation saturation="0" colorizeOn="0" invertColors="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" colorizeStrength="100" grayscaleMode="0"/>
<rasterresampler maxOversampling="2"/>
<resamplingStage>resamplingFilter</resamplingStage>
</pipe>
<blendMode>0</blendMode>
</qgis>
Binary file modified dist/ryan_functions-26.1.26.1-py3-none-any.whl
Binary file not shown.
58 changes: 58 additions & 0 deletions orchestrators_structure_proposal.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
Proposed tree (orchestrators grouped by domain)

ryan_library/
├── orchestrators/
│ ├── __init__.py
│ ├── py.typed
│ ├── gdal/
│ │ ├── __init__.py
│ │ ├── py.typed
│ │ └── gdal_flood_extent.py
│ ├── tuflow/
│ │ ├── __init__.py
│ │ ├── closure_durations.py
│ │ ├── peak_check_po_csvs.py
│ │ ├── po_combine.py
│ │ ├── pomm_combine.py
│ │ ├── pomm_max_items.py
│ │ ├── tuflow_culverts_merge.py
│ │ ├── tuflow_culverts_mean.py
│ │ ├── tuflow_culverts_timeseries.py
│ │ ├── tuflow_logsummary.py
│ │ ├── tuflow_results_styling.py
│ │ └── tuflow_timeseries_stability.py
│ └── rorb/
│ ├── __init__.py
│ └── closure_durations.py
├── functions/
│ └── wrapper_utils.py
└── scripts/
├── __init__.py (compat shim -> orchestrators)
├── py.typed (compat shim package marker)
├── wrapper_utils.py (compat shim -> functions)
├── gdal/
│ ├── __init__.py (compat shim -> orchestrators.gdal)
│ ├── py.typed
│ └── gdal_flood_extent.py (compat shim)
├── tuflow/
│ ├── __init__.py (compat shim -> orchestrators.tuflow)
│ ├── closure_durations.py (compat shim)
│ ├── peak_check_po_csvs.py (compat shim)
│ ├── po_combine.py (compat shim)
│ ├── pomm_combine.py (compat shim)
│ ├── pomm_max_items.py (compat shim)
│ ├── tuflow_culverts_merge.py (compat shim)
│ ├── tuflow_culverts_mean.py (compat shim)
│ ├── tuflow_culverts_timeseries.py (compat shim)
│ ├── tuflow_logsummary.py (compat shim)
│ ├── tuflow_results_styling.py (compat shim)
│ └── tuflow_timeseries_stability.py (compat shim)
└── rorb/
├── __init__.py (compat shim -> orchestrators.rorb)
└── closure_durations.py (compat shim)

Notes
- All functional modules live in ryan_library/orchestrators.
- ryan_library/functions/wrapper_utils.py holds shared wrapper utilities.
- ryan_library/scripts becomes compatibility-only until 31/12/2026 with DeprecationWarning notices.
- Orchestrators are grouped by domain (gdal, tuflow, rorb).
2 changes: 1 addition & 1 deletion ryan-scripts/12D-python/thin-raster-terrain-for-12D_v5.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from loguru import logger
from ryan_library.functions.loguru_helpers import setup_logger, worker_initializer
from ryan_library.functions.file_utils import ensure_output_directory
from ryan_library.scripts.wrapper_utils import print_library_version
from ryan_library.functions.wrapper_utils import print_library_version


def thin_data_by_global_selection(df: pd.DataFrame, thinning_factor: int) -> pd.DataFrame:
Expand Down
2 changes: 1 addition & 1 deletion ryan-scripts/12D-python/tif-to-LAS-valid-only_v6.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
from ryan_library.functions.loguru_helpers import setup_logger
from ryan_library.functions.terrain_processing import parallel_process_multiple_terrain
from ryan_library.scripts.wrapper_utils import print_library_version
from ryan_library.functions.wrapper_utils import print_library_version


def save_tile_las(tile_df, output_dir, base_filename, i, j) -> None:
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/RORB-python/RORB-find-closure-durations.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import os
from pathlib import Path

from ryan_library.scripts.RORB.closure_durations import run_closure_durations
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.rorb.closure_durations import run_closure_durations
from ryan_library.functions.wrapper_utils import (
change_working_directory,
print_library_version,
)
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/TUFLOW-python/LogSummary.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from pathlib import Path
import os

from ryan_library.scripts.tuflow.tuflow_logsummary import main_processing
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.tuflow_logsummary import main_processing
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
add_common_cli_arguments,
change_working_directory,
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/TUFLOW-python/POMM-mean-max-aep-dur.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import gc
import os

from ryan_library.scripts.tuflow.pomm_max_items import export_mean_peak_report
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.pomm_max_items import export_mean_peak_report
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
PommPeakWrapperDefaults,
add_common_cli_arguments,
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/TUFLOW-python/POMM-med-max-aep-dur.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import gc
import os

from ryan_library.scripts.tuflow.pomm_max_items import export_median_peak_report
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.pomm_max_items import export_median_peak_report
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
PommPeakWrapperDefaults,
add_common_cli_arguments,
Expand Down
6 changes: 3 additions & 3 deletions ryan-scripts/TUFLOW-python/POMM_combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"""
Wrapper Script: Combine TUFLOW POMM Results.

This script acts as a mutable wrapper for `ryan_library.scripts.tuflow.pomm_combine`.
This script acts as a mutable wrapper for `ryan_library.orchestrators.tuflow.pomm_combine`.
It manages the combination of "POMM" (Plot Output Maximums/Minimums) data, primarily used for culvert peak analysis.
Users can edit hard-coded defaults in this file or use CLI arguments to control the execution.

Expand Down Expand Up @@ -31,8 +31,8 @@
import gc
import os

from ryan_library.scripts.tuflow.pomm_combine import main_processing
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.pomm_combine import main_processing
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
add_common_cli_arguments,
change_working_directory,
Expand Down
6 changes: 3 additions & 3 deletions ryan-scripts/TUFLOW-python/PO_combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"""
Wrapper Script: Combine TUFLOW PO Results.

This script acts as a mutable wrapper for `ryan_library.scripts.tuflow.po_combine`.
This script acts as a mutable wrapper for `ryan_library.orchestrators.tuflow.po_combine`.
It allows users to hard-code default configurations for merging TUFLOW "PO" (Plot Output) CSV files,
while still providing command-line overrides for automation/batch processing.

Expand Down Expand Up @@ -31,8 +31,8 @@
import gc
import os

from ryan_library.scripts.tuflow.po_combine import main_processing
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.po_combine import main_processing
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
add_common_cli_arguments,
change_working_directory,
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/TUFLOW-python/TUFLOW-find-closure-durations.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import os


from ryan_library.scripts.tuflow.closure_durations import run_closure_durations
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.closure_durations import run_closure_durations
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
add_common_cli_arguments,
change_working_directory,
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/TUFLOW-python/TUFLOW_Culvert-mean-max-aep-dur.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import gc
import os

from ryan_library.scripts.tuflow.tuflow_culverts_mean import run_culvert_mean_report
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.tuflow_culverts_mean import run_culvert_mean_report
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
add_common_cli_arguments,
change_working_directory,
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/TUFLOW-python/TUFLOW_Culvert_Maximums.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import gc
import os

from ryan_library.scripts.tuflow.tuflow_culverts_merge import main_processing
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.tuflow_culverts_merge import main_processing
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
add_common_cli_arguments,
change_working_directory,
Expand Down
4 changes: 2 additions & 2 deletions ryan-scripts/TUFLOW-python/TUFLOW_Culvert_Timeseries.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import gc
import os

from ryan_library.scripts.tuflow.tuflow_culverts_timeseries import main_processing
from ryan_library.scripts.wrapper_utils import (
from ryan_library.orchestrators.tuflow.tuflow_culverts_timeseries import main_processing
from ryan_library.functions.wrapper_utils import (
CommonWrapperOptions,
add_common_cli_arguments,
change_working_directory,
Expand Down
Loading