bimforge 0.1.97__tar.gz → 0.1.99__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (181) hide show
  1. {bimforge-0.1.97/bimforge.egg-info → bimforge-0.1.99}/PKG-INFO +2 -1
  2. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/cli.py +142 -13
  3. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/review.py +1 -0
  4. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/anchors.py +57 -11
  5. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/reconcile.py +421 -14
  6. {bimforge-0.1.97 → bimforge-0.1.99/bimforge.egg-info}/PKG-INFO +2 -1
  7. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge.egg-info/requires.txt +1 -0
  8. {bimforge-0.1.97 → bimforge-0.1.99}/pyproject.toml +3 -2
  9. {bimforge-0.1.97 → bimforge-0.1.99}/LICENSE +0 -0
  10. {bimforge-0.1.97 → bimforge-0.1.99}/NOTICE +0 -0
  11. {bimforge-0.1.97 → bimforge-0.1.99}/README.md +0 -0
  12. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/__init__.py +0 -0
  13. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/__init__.py +0 -0
  14. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/alignment.py +0 -0
  15. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/annotate.py +0 -0
  16. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/approach_slab_rebar.py +0 -0
  17. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/approach_slab_section.py +0 -0
  18. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_732sw_endblock.py +0 -0
  19. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_732sw_rebar.py +0 -0
  20. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_732sw_transition.py +0 -0
  21. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_842_endblock.py +0 -0
  22. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_842_rebar.py +0 -0
  23. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_842_transition.py +0 -0
  24. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_rebar.py +0 -0
  25. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_section.py +0 -0
  26. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/barrier_template.py +0 -0
  27. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/box_girder_section.py +0 -0
  28. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/box_section.py +0 -0
  29. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/culvert_headwall_rebar.py +0 -0
  30. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/culvert_headwall_section.py +0 -0
  31. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/culvert_headwall_wingwall.py +0 -0
  32. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/curved_run.py +0 -0
  33. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/emit_alignment.py +0 -0
  34. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/emit_bbs.py +0 -0
  35. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/emit_dxf.py +0 -0
  36. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/emit_ifc.py +0 -0
  37. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/emit_qto.py +0 -0
  38. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/emit_step.py +0 -0
  39. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/bridge-standard.paycodes.yaml +0 -0
  40. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/bridge-standard.spec.yaml +0 -0
  41. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-b3-retaining-wall.paycodes.yaml +0 -0
  42. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-b3-retaining-wall.spec.yaml +0 -0
  43. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-b3-tables.example.yaml +0 -0
  44. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-b9-approach-slab.paycodes.yaml +0 -0
  45. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-box-culvert-tables.example.yaml +0 -0
  46. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-box-culvert.paycodes.yaml +0 -0
  47. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-box-culvert.spec.yaml +0 -0
  48. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-culvert-wingwall-tables.example.yaml +0 -0
  49. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-culvert-wingwall.paycodes.yaml +0 -0
  50. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-culvert-wingwall.spec.yaml +0 -0
  51. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-d90-headwall-tables.example.yaml +0 -0
  52. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-d90-headwall.paycodes.yaml +0 -0
  53. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-d90-headwall.spec.yaml +0 -0
  54. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-pipe-headwall-tables.example.yaml +0 -0
  55. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-pipe-headwall.paycodes.yaml +0 -0
  56. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-pipe-headwall.spec.yaml +0 -0
  57. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/caltrans-wingwall-steel.example.yaml +0 -0
  58. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/concrete-barrier-732sw.paycodes.yaml +0 -0
  59. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/concrete-barrier-732sw.spec.yaml +0 -0
  60. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/concrete-barrier-842.paycodes.yaml +0 -0
  61. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/concrete-barrier-842.spec.yaml +0 -0
  62. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/demo-box.paycodes.yaml +0 -0
  63. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/demo-box.spec.yaml +0 -0
  64. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/tubular-handrail.paycodes.yaml +0 -0
  65. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/examples/tubular-handrail.spec.yaml +0 -0
  66. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/__init__.py +0 -0
  67. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/approach_slab.py +0 -0
  68. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/box_culvert.py +0 -0
  69. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/bridge_standard.py +0 -0
  70. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/concrete_barrier_732sw.py +0 -0
  71. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/concrete_barrier_842.py +0 -0
  72. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/culvert_headwall.py +0 -0
  73. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/culvert_wingwall.py +0 -0
  74. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/demo_box.py +0 -0
  75. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/headwall_926.py +0 -0
  76. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/pipe_headwall.py +0 -0
  77. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/pipe_supports.py +0 -0
  78. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/registry.py +0 -0
  79. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/spillway.py +0 -0
  80. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/standard_plan.py +0 -0
  81. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/families/tubular_handrail.py +0 -0
  82. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/federate.py +0 -0
  83. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/footing_run.py +0 -0
  84. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/gate.py +0 -0
  85. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/headwall_section.py +0 -0
  86. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/ifc_styles.py +0 -0
  87. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/lifts.py +0 -0
  88. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/model.py +0 -0
  89. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/ops.py +0 -0
  90. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/paycodes.py +0 -0
  91. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/placement.py +0 -0
  92. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/primitives.py +0 -0
  93. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/project.py +0 -0
  94. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/rail_run.py +0 -0
  95. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/rail_section.py +0 -0
  96. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/ribbon.py +0 -0
  97. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/spatial.py +0 -0
  98. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/sweep.py +0 -0
  99. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/type_836_section.py +0 -0
  100. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/type_842_profile.py +0 -0
  101. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/wingwall_rebar.py +0 -0
  102. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/wingwall_section.py +0 -0
  103. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/author/wingwall_steel.py +0 -0
  104. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/__init__.py +0 -0
  105. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/alignment_station.py +0 -0
  106. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/cost5d.py +0 -0
  107. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/costload.py +0 -0
  108. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/developed.py +0 -0
  109. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/dxf2bim.py +0 -0
  110. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/estimate5d.py +0 -0
  111. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/estimate_model5d.py +0 -0
  112. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/examples/layer_map.example.yaml +0 -0
  113. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/examples/takeoff_map.example.yaml +0 -0
  114. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/georef.py +0 -0
  115. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/ifc2dxf.py +0 -0
  116. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/ifc2gis.py +0 -0
  117. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/ifc_mesh.py +0 -0
  118. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/ifc_takeoff.py +0 -0
  119. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/kml.py +0 -0
  120. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/kmz.py +0 -0
  121. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/linear_ref.py +0 -0
  122. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/model_elements.py +0 -0
  123. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/__init__.py +0 -0
  124. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/calibrate.py +0 -0
  125. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/classes.example.yaml +0 -0
  126. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/contours.py +0 -0
  127. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/crosscheck.py +0 -0
  128. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/detect.py +0 -0
  129. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/geopdf.py +0 -0
  130. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/hints.py +0 -0
  131. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/labels.py +0 -0
  132. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/measure.py +0 -0
  133. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/regions.py +0 -0
  134. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/snap.py +0 -0
  135. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/triage.py +0 -0
  136. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/plansheet/vectors.py +0 -0
  137. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/sample.py +0 -0
  138. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/schedule4d.py +0 -0
  139. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/schedule_io.py +0 -0
  140. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/schedule_model.py +0 -0
  141. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/schedule_read.py +0 -0
  142. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/schedule_state.py +0 -0
  143. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/section_style.py +0 -0
  144. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/takeoff_workbook.py +0 -0
  145. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/bim/xer.py +0 -0
  146. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/blender/__init__.py +0 -0
  147. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/blender/__main__.py +0 -0
  148. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/blender/alignment_section/__init__.py +0 -0
  149. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/__init__.py +0 -0
  150. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/doc.py +0 -0
  151. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/formats.py +0 -0
  152. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/geo.py +0 -0
  153. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/kml.py +0 -0
  154. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/layers.py +0 -0
  155. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/plot.py +0 -0
  156. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/sheet.py +0 -0
  157. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/stylepack.py +0 -0
  158. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/templates/generic-title-blocks.dxf +0 -0
  159. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/templates/make_generic.py +0 -0
  160. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/titleblock.py +0 -0
  161. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/cad/viewport.py +0 -0
  162. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/sheets/__init__.py +0 -0
  163. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/sheets/cli.py +0 -0
  164. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/sheets/control.py +0 -0
  165. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/sheets/layout.py +0 -0
  166. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/sheets/model.py +0 -0
  167. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/sheets/structure.py +0 -0
  168. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/__init__.py +0 -0
  169. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/attach.py +0 -0
  170. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/contours.py +0 -0
  171. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/datum.py +0 -0
  172. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/diff.py +0 -0
  173. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/fetch.py +0 -0
  174. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/grid.py +0 -0
  175. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/provenance.py +0 -0
  176. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge/terrain/solid.py +0 -0
  177. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge.egg-info/SOURCES.txt +0 -0
  178. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge.egg-info/dependency_links.txt +0 -0
  179. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge.egg-info/entry_points.txt +0 -0
  180. {bimforge-0.1.97 → bimforge-0.1.99}/bimforge.egg-info/top_level.txt +0 -0
  181. {bimforge-0.1.97 → bimforge-0.1.99}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bimforge
3
- Version: 0.1.97
3
+ Version: 0.1.99
4
4
  Summary: Standalone CAD/BIM toolkit: DXF -> IFC -> takeoff pipeline, sheet production, org-neutral CAD engine.
5
5
  License-Expression: Apache-2.0
6
6
  Project-URL: Homepage, https://github.com/BrandonLewis/BIMForge
@@ -17,6 +17,7 @@ Requires-Dist: ifcopenshell<0.10,>=0.9
17
17
  Requires-Dist: shapely
18
18
  Requires-Dist: pyproj
19
19
  Requires-Dist: numpy
20
+ Requires-Dist: networkx
20
21
  Provides-Extra: bim
21
22
  Requires-Dist: pymupdf; extra == "bim"
22
23
  Provides-Extra: draw
@@ -27,7 +27,7 @@ the paths ARE the geometry):
27
27
  and the terrain source path (plan-sheet contours -> TIN -> QA vs 3DEP):
28
28
 
29
29
  est-bim contours --pdf plans.pdf --sheet 28 [--profile] [--calib calib.yaml] [--tie PX,PY=N,E ... [--tie-model affine] [--crs-epsg N]] [--viewport N] [--geopdf-bbox page] [--no-geopdf] [--clip x0,y0,x1,y1] --layer 'EXIST=0.753@0.72|EXIST=ocg:GLOB' ... [--surface NAME=existing] [--role NAME=index] [--max-residual-ft F] [--out contours.dxf] [--json contours.json]
30
- est-bim contour-surface --contours contours.json ... --anchors anchors.yaml [--spots spots.yaml] [--propagate --interval 1] [--surface existing|proposed] [--include-review] --out tin.npz [--dxf surface.dxf] [--report surface.md] [--max-rmse 1.0] [--contact-ft 0.5] [--strict] [--spot-pins] [--review-dir DIR [--pdf plans.pdf]]
30
+ est-bim contour-surface --contours contours.json ... --anchors anchors.yaml [--spots spots.yaml] [--propagate --interval 1] [--surface existing|proposed] [--include-review] --out tin.npz [--dxf surface.dxf] [--report surface.md] [--max-rmse 1.0] [--contact-ft 0.5] [--min-facing-ft 4] [--barrier-layers PROP ...] [--no-face A,B ...] [--strict] [--spot-pins] [--review-dir DIR [--pdf plans.pdf]]
31
31
  est-bim terrain-diff --surface surface.xyz|tin.npz (--grid grid.npz [--vshift-json vshift.json] [--units ftUS] | --against other.npz [--step 5] [--tie-tol 0.5] [--zones zones.yaml] [--report r.md]) [--csv diff.csv] [--png diff.png]
32
32
  est-bim label-crops --contours contours.json --pdf plans.pdf --sheet 94 [--sources mask,gap] [--labels 'ocg:GLOB'] [--spots 'ocg:GLOB'] [--dpi 300] --out-dir crops/ --anchors anchors.skeleton.yaml
33
33
 
@@ -1110,6 +1110,11 @@ def _run_contours(args) -> int:
1110
1110
  def _log(msg):
1111
1111
  print(msg, file=sys.stderr)
1112
1112
 
1113
+ if args.min_path_pt > 0:
1114
+ _log(f" WARNING: --min-path-pt {args.min_path_pt:g} drops short "
1115
+ "connector paths and can fragment contours and lose line "
1116
+ "work — check the polyline count/length against "
1117
+ "--min-path-pt 0")
1113
1118
  try:
1114
1119
  sv = extract_sheet(args.pdf, args.sheet - 1,
1115
1120
  min_path_pt=args.min_path_pt)
@@ -1380,6 +1385,19 @@ def _leave_one_out(polys, graph, lettered, interval, spots, *, roles,
1380
1385
  return {"rows": rows, "stats": score_stats([r["err"] for r in rows])}
1381
1386
 
1382
1387
 
1388
+ def _face_pair(text):
1389
+ """``--no-face A,B``: two contour line numbers."""
1390
+ import argparse
1391
+ parts = str(text).split(",")
1392
+ try:
1393
+ if len(parts) != 2:
1394
+ raise ValueError
1395
+ return int(parts[0]), int(parts[1])
1396
+ except ValueError:
1397
+ raise argparse.ArgumentTypeError(
1398
+ f"expected A,B (two contour line numbers), got {text!r}") from None
1399
+
1400
+
1383
1401
  def _run_contour_surface(args) -> int:
1384
1402
  """Labelled contour manifests -> TIN npz + spot score report (held-out
1385
1403
  spots, or leave-one-out with ``--spot-pins --propagate``)."""
@@ -1423,15 +1441,31 @@ def _run_contour_surface(args) -> int:
1423
1441
  except ValueError as exc:
1424
1442
  print(f"error: --review-dir: {exc}", file=sys.stderr)
1425
1443
  return 1
1444
+ barrier_layers = list(dict.fromkeys(args.barrier_layers or []))
1445
+ both = [name for name in barrier_layers if name in set(args.layers or [])]
1446
+ if both:
1447
+ print(f"error: layer {', '.join(both)} is in both --layers and "
1448
+ "--barrier-layers — a layer is either contours or a barrier",
1449
+ file=sys.stderr)
1450
+ return 1
1426
1451
 
1427
1452
  try:
1428
1453
  polys, manifests, layer_meta = [], [], {}
1454
+ barriers: list = [] # [(points, label)] — obstacles, not contours
1455
+ barrier_seen: set = set()
1456
+ barrier_lines: Counter = Counter()
1429
1457
  wanted = set(args.layers or [])
1430
1458
  skipped_review = 0
1431
1459
  for p in args.contours:
1432
1460
  m = json.loads(Path(p).read_text(encoding="utf-8"))
1433
1461
  manifests.append(m)
1434
1462
  for name, d in m["layers"].items():
1463
+ if name in barrier_layers:
1464
+ barrier_seen.add(name)
1465
+ barrier_lines[name] += len(d["lines"])
1466
+ barriers += [(np.asarray(ln["points"], dtype=float),
1467
+ f"layer {name}") for ln in d["lines"]]
1468
+ continue
1435
1469
  if wanted and name not in wanted:
1436
1470
  continue
1437
1471
  if name == "REVIEW" and not args.include_review:
@@ -1443,6 +1477,13 @@ def _run_contour_surface(args) -> int:
1443
1477
  for ln in d["lines"]:
1444
1478
  polys.append((np.asarray(ln["points"], dtype=float),
1445
1479
  src, name))
1480
+ missing = [name for name in barrier_layers if name not in barrier_seen]
1481
+ if missing:
1482
+ raise ValueError(
1483
+ f"--barrier-layers {', '.join(missing)}: no such layer in "
1484
+ f"any --contours manifest (layers: "
1485
+ + ", ".join(sorted({n for m in manifests for n in m["layers"]}))
1486
+ + ")")
1446
1487
  raw = load_anchors(args.anchors)
1447
1488
  extra_spots = []
1448
1489
  if args.spots:
@@ -1472,14 +1513,20 @@ def _run_contour_surface(args) -> int:
1472
1513
  print(f"error: {exc}", file=sys.stderr)
1473
1514
  return 1
1474
1515
 
1516
+ for name in barrier_layers:
1517
+ if not barrier_lines[name]:
1518
+ _log(f"warning: --barrier-layers {name}: layer has no lines — "
1519
+ "it blocks nothing")
1475
1520
  if skipped_review:
1476
1521
  _log(f"skipped {skipped_review} REVIEW line(s); pass --include-review "
1477
1522
  "to use them")
1478
1523
  if anchors.unread:
1479
1524
  _log(f"{anchors.unread} anchor record(s) have elev: null (unread) — "
1480
1525
  "skipped")
1481
- uses_page = any("page" in r for r in (raw.get("contours") or [])
1482
- + list(raw.get("spots") or []))
1526
+ uses_page = any(isinstance(r, dict) and "page" in r
1527
+ for r in list(raw.get("contours") or [])
1528
+ + list(raw.get("spots") or [])
1529
+ + list(raw.get("breaks") or []))
1483
1530
  if uses_page and placed_by and not args.tie:
1484
1531
  _log(f"page anchors placed by the {placed_by}")
1485
1532
 
@@ -1538,7 +1585,32 @@ def _run_contour_surface(args) -> int:
1538
1585
  _log("--spot-pins: there are no spot elevations to pin")
1539
1586
  line_roles = {i: (layer_meta.get((src, lay)) or {}).get("role")
1540
1587
  for i, (_, src, lay) in enumerate(polys)}
1541
- graph = neighbour_graph(polys, contact_ft=args.contact_ft)
1588
+ barriers += [(np.asarray(b["points"], dtype=float), b["label"])
1589
+ for b in anchors.breaks]
1590
+ graph = neighbour_graph(polys, contact_ft=args.contact_ft,
1591
+ min_facing_ft=args.min_facing_ft,
1592
+ barriers=barriers)
1593
+ try:
1594
+ for w in graph.set_aside_faces(args.no_face or []):
1595
+ _log(f"warning: {w}")
1596
+ except ValueError as exc:
1597
+ print(f"error: {exc}", file=sys.stderr)
1598
+ return 1
1599
+ barrier_input = bool(barriers or args.no_face)
1600
+ set_aside = [b for b in graph.barred if not b.partial]
1601
+ leaky = [b for b in graph.barred if b.partial]
1602
+ if barrier_input:
1603
+ def _by(rows):
1604
+ c: Counter = Counter()
1605
+ for b in rows:
1606
+ first = b.by[0]
1607
+ c["break lines" if first.startswith("break ") else first] += 1
1608
+ return (" (" + ", ".join(f"{k}: {v}" for k, v in c.items()) + ")"
1609
+ if c else "")
1610
+ _log(f"barriers: {len(set_aside)} faces pair(s) set aside"
1611
+ + _by(set_aside)
1612
+ + (f"; {len(leaky)} pair(s) kept though partly blocked — "
1613
+ "extend the barrier" + _by(leaky) if leaky else ""))
1542
1614
 
1543
1615
  def _reconcile(e, reuse=None):
1544
1616
  return reconcile(polys, graph, e, interval, roles=line_roles,
@@ -1697,7 +1769,10 @@ def _run_contour_surface(args) -> int:
1697
1769
  "spot_scoring": scoring,
1698
1770
  "graph": {**graph.params, "same": len(graph.same),
1699
1771
  "joints": len(graph.joints),
1700
- "refused_merges": merge_stats["refused"]},
1772
+ "refused_merges": merge_stats["refused"],
1773
+ **({"barred": len(set_aside),
1774
+ "partly_barred": len(leaky)} if barrier_input
1775
+ else {})},
1701
1776
  "flat_triangle_share": round(flat, 4), "crs_epsg": crs_epsg}
1702
1777
  out = save_tin_npz(args.out, pts, tin.simplices, info, tin_lines, pt_line)
1703
1778
  print(f"wrote {out}")
@@ -1815,9 +1890,22 @@ def _run_contour_surface(args) -> int:
1815
1890
  lines.append("off — no contour interval (interval_ft or --interval)")
1816
1891
  else:
1817
1892
  c, gp = rec.counts(), graph.params
1893
+ bar_txt = ""
1894
+ if barrier_input:
1895
+ kinds = Counter("break lines" if lab.startswith("break ")
1896
+ else lab for lab in (gp.get("barriers") or {})
1897
+ for _ in range(gp["barriers"][lab]))
1898
+ parts = [f"{k} ({v} line{'' if v == 1 else 's'})"
1899
+ for k, v in kinds.items()]
1900
+ if args.no_face:
1901
+ parts.append(f"--no-face {len(args.no_face)} pair(s)")
1902
+ bar_txt = (f" · barriers: {', '.join(parts)} — "
1903
+ f"{len(set_aside)} faces pair(s) set aside"
1904
+ + (f", {len(leaky)} kept though partly blocked"
1905
+ if leaky else ""))
1818
1906
  lines += [f"neighbour graph: contact_ft {gp['contact_ft']:g} · "
1819
1907
  f"min_facing_ft {gp['min_facing_ft']:g} · "
1820
- f"sample_ft {gp['sample_ft']:g}", "",
1908
+ f"sample_ft {gp['sample_ft']:g}" + bar_txt, "",
1821
1909
  "| pinned | ambiguous | conflict | unreached | "
1822
1910
  "lettered in conflict |", "|---|---|---|---|---|",
1823
1911
  f"| {c['pinned']} | {c['ambiguous']} | {c['conflict']} | "
@@ -1844,8 +1932,9 @@ def _run_contour_surface(args) -> int:
1844
1932
  f"{f.xy[0]:.1f} | {f.xy[1]:.1f} | {page} | "
1845
1933
  f"{f.check} |")
1846
1934
  for f in findings:
1847
- if f.detail or f.paths:
1935
+ if f.detail or f.paths or f.chains:
1848
1936
  lines += ["", f"**{f.id} · {f.kind}** — {f.detail}"]
1937
+ lines += [f"- {c['text']}" for c in f.chains]
1849
1938
  lines += [f"- {p}" for p in f.paths]
1850
1939
  else:
1851
1940
  lines.append("none")
@@ -1877,10 +1966,16 @@ def _run_contour_surface(args) -> int:
1877
1966
  print(f"error: spot RMSE {st['rmse']:.2f} ft exceeds "
1878
1967
  f"--max-rmse {args.max_rmse:g} ft", file=sys.stderr)
1879
1968
  return 2
1880
- if args.strict and findings:
1969
+ # a barrier set-aside was asked for: reported, but not a failure; a
1970
+ # partial one (the barrier leaked) is — it did not do what was asked
1971
+ gating = [f for f in findings if f.kind != "barrier" or f.partial]
1972
+ if args.strict and gating:
1881
1973
  where = (f"see {args.report}" if args.report
1882
1974
  else "rerun with --report for the details")
1883
- print(f"error: --strict: {len(findings)} finding(s) ({kinds_txt}) — "
1975
+ gate_txt = ", ".join(f"{v} {k}" for k, v in Counter(
1976
+ ("partial barrier" if f.kind == "barrier" else f.kind)
1977
+ for f in gating).items())
1978
+ print(f"error: --strict: {len(gating)} finding(s) ({gate_txt}) — "
1884
1979
  f"{where}", file=sys.stderr)
1885
1980
  return 2
1886
1981
  return 0
@@ -2585,10 +2680,13 @@ def main(argv=None) -> int:
2585
2680
  metavar="DEG",
2586
2681
  help="max direction change across a --gap jump "
2587
2682
  "(default 25)")
2588
- co.add_argument("--min-path-pt", type=float, default=2.0,
2683
+ co.add_argument("--min-path-pt", type=float, default=0.0,
2589
2684
  dest="min_path_pt",
2590
2685
  help="drop source paths shorter than this, page points "
2591
- "(default 2)")
2686
+ "(default 0, keep every path: contour line work is "
2687
+ "built from short connector paths, so a length "
2688
+ "filter fragments contours; raise it only to drop "
2689
+ "hatch noise)")
2592
2690
  co.add_argument("--tie", action="append", default=[],
2593
2691
  metavar="PX,PY=N,E",
2594
2692
  help="survey tie page point -> northing,easting; two or "
@@ -2646,7 +2744,10 @@ def main(argv=None) -> int:
2646
2744
  "interval_ft, optional index_interval_ft and sheet, "
2647
2745
  "contours/spots: [{elev, xy|page}] — page records "
2648
2746
  "are placed by --tie or the v2 manifest's georef; "
2649
- "elev: null records are unread and skipped")
2747
+ "elev: null records are unread and skipped; "
2748
+ "optional breaks: [{page|xy: [[x, y], ...], note}] "
2749
+ "are break lines drawn across a gap in the "
2750
+ "contours (see --barrier-layers)")
2650
2751
  cs.add_argument("--spots",
2651
2752
  help="spot elevations YAML — the scorecard (held out; "
2652
2753
  "with --spot-pins also a consistency check on the "
@@ -2706,9 +2807,37 @@ def main(argv=None) -> int:
2706
2807
  "neighbours, and a finding where they touch or cross; "
2707
2808
  "also how close a merge join may pass another line "
2708
2809
  "(default 0.5)")
2810
+ cs.add_argument("--min-facing-ft", type=float, default=4.0,
2811
+ dest="min_facing_ft", metavar="FT",
2812
+ help="two contours facing each other across open ground "
2813
+ "along at least this much of their length are "
2814
+ "neighbours (one interval apart at most); raise it "
2815
+ "when short runs facing across a gap in the "
2816
+ "linework (a roadway prism, an erased area) make "
2817
+ "the labels conflict (default 4)")
2818
+ cs.add_argument("--barrier-layers", nargs="+", default=[],
2819
+ dest="barrier_layers", metavar="LAYER",
2820
+ help="manifest layers that are obstacles, not contours "
2821
+ "(e.g. the proposed-grading contours through a "
2822
+ "roadway cut): never in the TIN; two contours "
2823
+ "facing each other across one are not counted as "
2824
+ "one interval apart, and each pair set aside is a "
2825
+ "'barrier' finding. Anchors-file breaks: lines "
2826
+ "work the same way. A barrier or break line must "
2827
+ "reach the ends of the interrupted contours: where "
2828
+ "it stops short they still face, and the pair is "
2829
+ "kept (a partial 'barrier' finding)")
2830
+ cs.add_argument("--no-face", action="append", default=[], dest="no_face",
2831
+ type=_face_pair, metavar="A,B",
2832
+ help="set aside the faces pair between contour lines A "
2833
+ "and B (the line numbers in the report, after "
2834
+ "fragment merging); repeatable; a one-off — an "
2835
+ "anchors-file break line survives re-extraction")
2709
2836
  cs.add_argument("--strict", action="store_true",
2710
2837
  help="exit 2 when there is any finding (after writing "
2711
- "every output)")
2838
+ "every output); barrier findings you asked for do "
2839
+ "not count — they are reported, not failures — but "
2840
+ "a partial one (a barrier that leaked) does")
2712
2841
  cs.add_argument("--spot-pins", action="store_true", dest="spot_pins",
2713
2842
  help="check the contours against the spot elevations: a "
2714
2843
  "spot limits its nearest line to within one "
@@ -125,6 +125,7 @@ def write_review(out_dir, findings, rows, *, crops=None,
125
125
  if f.page is not None:
126
126
  md.append(f"- page: {f.page[0]:.1f}, {f.page[1]:.1f} pt")
127
127
  md += [f"- check: {f.check}", "", f.detail]
128
+ md += [f"- {c['text']}" for c in f.chains]
128
129
  md += [f"- {p}" for p in f.paths]
129
130
  if f.id in crops:
130
131
  md += ["", f"![{f.id}]({Path(crops[f.id]).name})"]
@@ -9,7 +9,15 @@ are read by eye and transcribed into an anchors YAML — the audit trail:
9
9
  index_interval_ft: 5.0 # optional; enables the index-multiple check
10
10
  contours: [{elev, page: [x, y] | xy: [e, n], id?, ...}]
11
11
  spots: [{elev, page | xy, id?}]
12
-
12
+ breaks: [{page: [[x, y], ...] | xy: [[e, n], ...], note?}]
13
+
14
+ ``breaks`` are optional break lines: polylines (2 or more points) drawn
15
+ across ground where contours are missing — a roadway cut, an erased area.
16
+ They are not contours; ``contour-surface`` passes each to the neighbour
17
+ graph as a barrier (``break 1``, ``break 2``, ... with the note), so the
18
+ lines either side of the gap are not counted as one interval apart. Being
19
+ in sheet coordinates, they survive a re-extraction that renumbers the
20
+ lines.
13
21
  ``page`` is unrotated page points, y down. ``elev: null`` marks a candidate
14
22
  nobody has read yet (an ``est-bim label-crops`` skeleton): it is skipped and
15
23
  counted, never guessed. A record's ``id`` (``L012``, ``S004`` in a skeleton)
@@ -33,6 +41,7 @@ class Anchors:
33
41
  contours: list = field(default_factory=list) # [{"elev", "xy", "id"}]
34
42
  spots: list = field(default_factory=list)
35
43
  unread: int = 0
44
+ breaks: list = field(default_factory=list) # [{"points", "note", "label"}]
36
45
 
37
46
 
38
47
  def _sheet(v):
@@ -100,6 +109,17 @@ def place_anchors(raw: dict, *, extra_spots=(), page_to_world=None) -> Anchors:
100
109
  sheet = _sheet(raw.get("sheet"))
101
110
  unread = 0
102
111
 
112
+ def to_world(x, y):
113
+ if page_to_world is None:
114
+ raise ValueError(
115
+ "anchor records give page coordinates but nothing places "
116
+ "them — pass --tie, or use a v2 manifest (its georef "
117
+ "places page points; with several manifests the anchors "
118
+ "file's sheet: picks one)"
119
+ + (f" — no v2 manifest is for sheet {sheet}"
120
+ if sheet is not None else ""))
121
+ return page_to_world(x, y)
122
+
103
123
  def place(rec, where):
104
124
  nonlocal unread
105
125
  if not isinstance(rec, dict):
@@ -113,15 +133,7 @@ def place_anchors(raw: dict, *, extra_spots=(), page_to_world=None) -> Anchors:
113
133
  e, n = _pair(rec["xy"], f"anchors {where}: xy")
114
134
  elif "page" in rec:
115
135
  x, y = _pair(rec["page"], f"anchors {where}: page")
116
- if page_to_world is None:
117
- raise ValueError(
118
- "anchor records give page coordinates but nothing places "
119
- "them — pass --tie, or use a v2 manifest (its georef "
120
- "places page points; with several manifests the anchors "
121
- "file's sheet: picks one)"
122
- + (f" — no v2 manifest is for sheet {sheet}"
123
- if sheet is not None else ""))
124
- e, n = page_to_world(x, y)
136
+ e, n = to_world(x, y)
125
137
  else:
126
138
  raise ValueError(f"anchor record needs xy or page: {rec!r}")
127
139
  rid = rec.get("id")
@@ -144,6 +156,39 @@ def place_anchors(raw: dict, *, extra_spots=(), page_to_world=None) -> Anchors:
144
156
  spots += [p for p in (place(r, f"--spots record {k}")
145
157
  for k, r in enumerate(extra_spots)) if p]
146
158
 
159
+ def place_break(rec, k):
160
+ where = f"anchors breaks[{k}]"
161
+ if not isinstance(rec, dict):
162
+ raise ValueError(f"{where}: expected a record {{page | xy: "
163
+ f"[[x, y], ...], note?}}, got {rec!r}")
164
+ if "page" in rec and "xy" in rec:
165
+ raise ValueError(f"{where}: give page or xy, not both")
166
+ if "page" not in rec and "xy" not in rec:
167
+ raise ValueError(f"{where}: needs page or xy (a list of 2 or "
168
+ f"more points), got {rec!r}")
169
+ key = "page" if "page" in rec else "xy"
170
+ pts = rec[key]
171
+ if not isinstance(pts, (list, tuple)):
172
+ raise ValueError(f"{where}: {key} must be a list of points "
173
+ f"[[x, y], ...] (got {pts!r})")
174
+ if len(pts) < 2:
175
+ raise ValueError(f"{where}: needs at least 2 points (got "
176
+ f"{len(pts)})")
177
+ pts = [_pair(q, f"{where}: {key} point {j}") for j, q in enumerate(pts)]
178
+ if all(q == pts[0] for q in pts[1:]):
179
+ raise ValueError(f"{where}: has zero length (every point is the "
180
+ f"same) — a break line runs across the gap, "
181
+ f"got {key}: {rec[key]!r}")
182
+ if key == "page":
183
+ pts = [to_world(x, y) for x, y in pts]
184
+ note = rec.get("note")
185
+ note = None if note is None else str(note)
186
+ label = f"break {k + 1}" + (f" ({note})" if note else "")
187
+ return {"points": [(float(e), float(n)) for e, n in pts],
188
+ "note": note, "label": label}
189
+
190
+ breaks = [place_break(r, k) for k, r in enumerate(records("breaks"))]
191
+
147
192
  def interval(key):
148
193
  v = raw.get(key)
149
194
  if v is None:
@@ -154,7 +199,8 @@ def place_anchors(raw: dict, *, extra_spots=(), page_to_world=None) -> Anchors:
154
199
  return f
155
200
 
156
201
  return Anchors(sheet, str(vd), interval("interval_ft"),
157
- interval("index_interval_ft"), contours, spots, unread)
202
+ interval("index_interval_ft"), contours, spots, unread,
203
+ breaks)
158
204
 
159
205
 
160
206
  def manifest_page_to_world(manifest: dict):