diff --git a/wntr/gis/network.py b/wntr/gis/network.py index 7dd1552c7..2a4f58a61 100644 --- a/wntr/gis/network.py +++ b/wntr/gis/network.py @@ -114,6 +114,11 @@ def _extract_geodataframe(df, crs=None, valid_base_names=None, if 'node_type' in df.columns: geom = [Point((x,y)) for x,y in df['coordinates']] del df['node_type'] + + # do not carry over leak attributes to dataframe. + del df['leak'] + del df['leak_area'] + del df['leak_discharge_coeff'] elif 'link_type' in df.columns: geom = [] for link_name in df['name']: diff --git a/wntr/network/elements.py b/wntr/network/elements.py index 5cd79cdb5..b451992e9 100644 --- a/wntr/network/elements.py +++ b/wntr/network/elements.py @@ -89,10 +89,7 @@ class Junction(Node): "minimum_pressure", "required_pressure", "pressure_exponent", - "tag", - "leak", - "leak_area", - "leak_discharge_coeff"] + "tag"] def __init__(self, name, wn): super(Junction, self).__init__(wn, name) @@ -434,10 +431,7 @@ class Tank(Node): "mixing_fraction", "mixing_model", "bulk_coeff", - "tag", - "leak", - "leak_area", - "leak_discharge_coeff"] + "tag"] def __init__(self, name, wn): super(Tank, self).__init__(wn, name)