floodmodeller-api 0.5.2__py3-none-any.whl → 0.5.2.post1__py3-none-any.whl

floodmodeller_api/dat.py

@@ -941,7 +941,6 @@ class DAT(FMFile):
             in_reach = hasattr(unit, "dist_to_next") and unit.dist_to_next > 0
             if in_reach:  # has implicit downstream labels
                 next_unit = units[idx + 1]
-                next_next_unit = units[idx + 2]
 
                 if next_unit.name is None:
                     msg = "Unit has no name."
@@ -950,7 +949,7 @@ class DAT(FMFile):
                 end_of_reach = (
                     (not hasattr(next_unit, "dist_to_next"))
                     or (next_unit.dist_to_next == 0)
-                    or (not hasattr(next_next_unit, "dist_to_next"))
+                    or (not hasattr(units[idx + 2], "dist_to_next"))
                 )
 
                 if end_of_reach:

floodmodeller_api/toolbox/model_build/structure_log/structure_log.py

@@ -249,7 +249,6 @@ class StructureLogBuilder:
                     "Conduit subtype: %s not currently supported in structure log",
                     conduit.subtype,
                 )
-                self._write(conduit.name, conduit._unit, conduit.subtype)
                 continue
             conduit_dict, add_to_conduit_stack = self._conduit_data(conduit)
             self.unit_store[(conduit.name, conduit._unit)]["conduit_data"] = conduit_dict
@@ -400,7 +399,6 @@ class StructureLogBuilder:
                     "Structure: %s not currently supported in structure log",
                     structure._unit,
                 )
-                self._write(structure.name, structure._unit, structure.subtype)
                 continue
 
     def _format_friction(self, unit_dict):

floodmodeller_api/units/_base.py

@@ -255,7 +255,7 @@ class Unit(Jsonable):
         return rules
 
     def _remove_unit_name(self, line: str, *, remove_revision: bool = False) -> str:
-        line = line.replace(self._unit, "")
+        line = line.replace(self._unit, "", 1)
         if remove_revision:
             line = line.replace("#revision#", "", 1)
         return line.strip()

floodmodeller_api/version.py

@@ -1 +1 @@
-__version__ = "0.5.2"
+__version__ = "0.5.2.post1"

{floodmodeller_api-0.5.2.dist-info → floodmodeller_api-0.5.2.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: floodmodeller_api
-Version: 0.5.2
+Version: 0.5.2.post1
 Summary: Extends the functionality of Flood Modeller to python users
 Author: Jacobs
 Author-email: joe.pierce@jacobs.com

{floodmodeller_api-0.5.2.dist-info → floodmodeller_api-0.5.2.post1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 floodmodeller_api/__init__.py,sha256=gPtU8nKJL-XHb19XuMryUpwlYNA3dlHlxl8xy69KPQA,400
 floodmodeller_api/_base.py,sha256=nr4MdHlxkoELCMvUHW0UnFdz-CHBy8_pz8L6zLZv27M,7761
 floodmodeller_api/backup.py,sha256=Pdqq3VF-aiEuLOGFyoEINLc_vauhUeaNedJTa1cWDLI,11139
-floodmodeller_api/dat.py,sha256=22cdjCrf1AjBzGc-iJ8Ruw6OEftpiXMRGSOIQ3aG9wU,40097
+floodmodeller_api/dat.py,sha256=tXv8AuH_ANtX7m4Xp46rqiPmLmihA92MrvK9QCgkBPI,40049
 floodmodeller_api/diff.py,sha256=y7W5l-03iYdm-YPcwrbHZMdlXFhBe0JEl-WahWL_pi8,5208
 floodmodeller_api/ied.py,sha256=jl63fk1SlxMnrCjY4__rzP-W0HkL7HnjWYTeJR-Vy5E,12316
 floodmodeller_api/ief.py,sha256=6I2DJp4V2k7myNi7ot7iAwPrQns1iVc82huWFiqWg4Q,31039
@@ -11,7 +11,7 @@ floodmodeller_api/mapping.py,sha256=hnj2a8lANznFc3QosGTtyHEpxVIKdE621_Ev3trb6J8,
 floodmodeller_api/to_from_json.py,sha256=qyRKRe4mpdNBo6XgXVrP9dI3oqYY8Px5YcGm690F-jg,7427
 floodmodeller_api/tool.py,sha256=Lpx4LiF_OhCqt8KiXNtOrYx1K0tSwxig2ZJcGU3gbM4,11330
 floodmodeller_api/util.py,sha256=16oY6ia5SJjyjKYIoxa8jMw_sZ828y73NWbpe31ig-w,4590
-floodmodeller_api/version.py,sha256=isJrmDBLRag7Zc2UK9ZovWGOv7ji1Oh-zJtJMNJFkXw,22
+floodmodeller_api/version.py,sha256=jHthESksSvFIiblL_-OedpOncolw4EZ3jjkbbqg0oKA,28
 floodmodeller_api/xml2d.py,sha256=L99d147ySVIp8i1Ksp3ekyLDJ55MJ__dP32KXaVcR5o,25697
 floodmodeller_api/xml2d_template.py,sha256=lu0tM7-YysYniqAw331bhvulH0Ha5xKsgtIo9KTnyNw,1806
 floodmodeller_api/xsd_backup.xml,sha256=hRZYhpNcucT7TgFPhuINMAEJOkds-lg6n7RH3b2jeq4,28430
@@ -210,12 +210,12 @@ floodmodeller_api/toolbox/model_build/__init__.py,sha256=AvtpvGVkBIM88k7mXFA_a3y
 floodmodeller_api/toolbox/model_build/add_siltation_definition.py,sha256=f4YGdteOgYIT9Pz1fzM7GQzozwSP0F4Juz5_LR2A0cA,3100
 floodmodeller_api/toolbox/model_build/structure_log_definition.py,sha256=15i17agV9FoupUVIUxK9Z1WQ69_cIzFEHuuOmS4dUnc,1866
 floodmodeller_api/toolbox/model_build/structure_log/__init__.py,sha256=uIChpuOCUua7vREPLedWwgcRH4ApbheC_GO-Pi8VwV8,47
-floodmodeller_api/toolbox/model_build/structure_log/structure_log.py,sha256=5OWz181-xQqbt6xbvnTA8adkmT72dNh80VyD8UDigZ8,22991
+floodmodeller_api/toolbox/model_build/structure_log/structure_log.py,sha256=7Ny7SLxPDsFx4WYuRPLOwi6X9nXcv9ehpd_t6vt7y10,22837
 floodmodeller_api/toolbox/model_conversion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 floodmodeller_api/toolbox/model_review/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 floodmodeller_api/toolbox/results_analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 floodmodeller_api/units/__init__.py,sha256=HJQaIgi0E3y8OhbYIDfZx8lHV4M2J2ebCgrOKnvTXpI,1030
-floodmodeller_api/units/_base.py,sha256=fuWCj5SBXakfLlS7xYgvD-S2PuuYC8GkRvdJRVbfx5Y,10826
+floodmodeller_api/units/_base.py,sha256=KihWO_E1KmFxjfeNhJwL_heKm57i3AjXSP01Iyqjmzk,10829
 floodmodeller_api/units/_helpers.py,sha256=KqH9Qn6_mGB-TQBPkObb1_DRGfpvwdKqdA1iYFtAMuc,10918
 floodmodeller_api/units/boundaries.py,sha256=YW3Gact2CDvENkmI5ttka_fMJB131stYAoReIF4b3fI,19135
 floodmodeller_api/units/comment.py,sha256=KFaPuypi4RfkSPVwFuyLG1AtiBhlcliptWXp7Bo45R0,1864
@@ -244,9 +244,9 @@ floodmodeller_api/validation/__init__.py,sha256=sUMqShUGLnuQjmxKN3wAR7XpDVYsSFn4
 floodmodeller_api/validation/parameters.py,sha256=37a0w9J1z8e8kzWhosF54ZcmGDlmGZYbxczLd41cVdI,16194
 floodmodeller_api/validation/urban_parameters.py,sha256=tD4ORsexmvvVZhDxbRyDlYyEH4uswySxiTIs2JWZwKs,11391
 floodmodeller_api/validation/validation.py,sha256=rwNNmUP2VSfv196Iv6HbGI-PeC_YxTCQM_4stcEB5lk,4665
-floodmodeller_api-0.5.2.dist-info/LICENSE.txt,sha256=las1guEzggQukja_R_nI5E6jGEYEnpQdJoTZvup2e5E,920
-floodmodeller_api-0.5.2.dist-info/METADATA,sha256=24ZsqwNpub1q-Adc0VCjNKMsfvIvzGmIMvGzngyp2JI,5597
-floodmodeller_api-0.5.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-floodmodeller_api-0.5.2.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
-floodmodeller_api-0.5.2.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
-floodmodeller_api-0.5.2.dist-info/RECORD,,
+floodmodeller_api-0.5.2.post1.dist-info/LICENSE.txt,sha256=las1guEzggQukja_R_nI5E6jGEYEnpQdJoTZvup2e5E,920
+floodmodeller_api-0.5.2.post1.dist-info/METADATA,sha256=XKY3LmmhXC7fnLu1CLZSEcrLKZLOKFGrvp6d1wWvkmo,5603
+floodmodeller_api-0.5.2.post1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+floodmodeller_api-0.5.2.post1.dist-info/entry_points.txt,sha256=RQFzb_zf1hNv2uNRfoCD3nRzyzGi8vPvj7VGOhrOjtI,198
+floodmodeller_api-0.5.2.post1.dist-info/top_level.txt,sha256=x10nxct120kv2PpqYA2lhiwrYre3wKyic2wcUyNWWRw,18
+floodmodeller_api-0.5.2.post1.dist-info/RECORD,,

{floodmodeller_api-0.5.2.dist-info → floodmodeller_api-0.5.2.post1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any