ea 0.6.13 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf25ee32e2c74ea3e4c5dc60be9e471eb535e861308ba4ba4c3caf73d73b4431
-  data.tar.gz: 2702c5b5d83823a16b4eb7c286fa96fa0a09174b61e3965634a27e6070b06545
+  metadata.gz: d69a2edfc36e402cd81b0eda6c4eb5c43cb0fda3ad8c46fcc2e4e5d1de63d8ec
+  data.tar.gz: d5bfb484b0d84399bfe8e54fd874374a7200dbb3e667dc47f0330f5f65a6531f
 SHA512:
-  metadata.gz: c7c111e417e5097b43abcb1a8b54f61232262821b4524b459f96d734663309920d8256d4a833fe01357a843b56106427d4ede024ba9cc47a3a08160c41b8ca16
-  data.tar.gz: 849694a1724246a1b0410083d6ab0a8e84b5048bc5b1c214006c7264a95827aa851792b3db726ba602da585d2d9daf7af9b43873518219b8ee7cdfcea84897e2
+  metadata.gz: ba29936fcceaa22430339e69dd4db37a47fd39b7c6c474484740fb8d218014a1c0a4bfa84fc6ab09fd90adf4402e65cf51fbf96cd3e63cc8e116c45065ba4a07
+  data.tar.gz: 947511083114075e9ad373e11f20c1c4dcea02cd9f5b35da4719243430a2228322da6922bb6b95903fd63a30cc6568ac12d6d5b353a02e633b567cbbc674eaa5

data/lib/ea/sources/qea/diagram_builder.rb

@@ -377,9 +377,31 @@ module Ea
                          element_edge_point(target_placement, :target, edge_out)
 
           intermediate = intermediate_waypoints(link_row)
-          if tree_route?(edge_out, intermediate)
-            points = tree_waypoints(source_placement, target_placement,
-                                    intermediate.first)
+          if edge_out == 2 && source_port && target_port &&
+             !valid_tree_path?(intermediate, source_placement)
+            # EA recomputes tree routes at DRAW TIME from current
+            # element positions when the stored Path no longer lands
+            # on the source's facing edge (hand-verified: SY 8542's
+            # stale Path vs EA-drawn route; CityObjectGroup's current
+            # Path renders byte-exact and is kept). Computed route:
+            # source port -> corner at (target dock x, source exit
+            # y) -> target port.
+            points = [[source_point[0], source_point[1]],
+                      [target_point[0], source_point[1]],
+                      [target_point[0], target_point[1]]]
+          elsif edge_out == 2 && intermediate.size == 1
+            # Current tree Path (bend on the source's facing edge):
+            # EA's draw-time route shape — source right edge at the
+            # bend's y, corner at the bend, target facing edge at the
+            # bend's x (byte-exact on CityObjectGroup).
+            src = bounds_from_rect(source_placement)
+            tgt = bounds_from_rect(target_placement)
+            bend = intermediate.first
+            going_up = tgt.y + tgt.height <= src.y
+            target_y = going_up ? tgt.y + tgt.height : tgt.y
+            points = [[src.x + src.width, bend[1]],
+                      [bend[0], bend[1]],
+                      [bend[0], target_y]]
           elsif intermediate.any?
             points = [source_point, *intermediate, target_point]
           elsif source_port || target_port
@@ -395,24 +417,17 @@ module Ea
           end
         end
 
-        # EA's tree-style routing (Geometry EDGE=2 with a single Path
-        # bend): the visible line leaves the SOURCE's right edge at
-        # the bend's y, runs horizontally to the bend x, then
-        # vertically to the target's facing edge — replacing the
-        # ray-cast ports entirely. Verified against the
-        # CityObjectGroup reference (parent + groupMember lines).
-        def tree_route?(edge_out, intermediate)
-          edge_out == 2 && intermediate.size == 1
-        end
-
-        def tree_waypoints(source_placement, target_placement, bend)
-          src = bounds_from_rect(source_placement)
-          tgt = bounds_from_rect(target_placement)
-          bend_x = bend[0]
-          source_point = [src.x + src.width, bend[1]]
-          going_up = tgt.y + tgt.height <= src.y
-          target_y = going_up ? tgt.y + tgt.height : tgt.y
-          [source_point, [bend_x, bend[1]], [bend_x, target_y]]
+        # A tree Path is current when its bend height still falls
+        # within the source element's y-range (the exit height EA
+        # records); a bend outside the element is stale and EA
+        # re-derives the route at draw time. The bend's x may sit
+        # arbitrarily far right (trunk position).
+        def valid_tree_path?(intermediate, source_placement)
+          return false if intermediate.empty?
+
+          bend = intermediate.first
+          b = bounds_from_rect(source_placement)
+          bend[1].between?(b.y - 5, b.y + b.height + 5)
         end
 
         # Absolute connection point EA docks the connector's visible

data/lib/ea/svg/ea_emitter/label/end_label.rb

@@ -69,11 +69,12 @@ module Ea
 
           private
 
-          # EA's tree-route label clusters (verified against
-          # EA-published reference SVGs): source-end pairs stack at
-          # the exit point (role +3/-23, mult +3/0); target-end pairs
-          # sit astride the trunk — the mult starts at trunk+8 and
-          # the role's right edge meets it (role_x = trunk+8-width).
+          # EA's tree-route label clusters (hand-verified against the
+          # EA-published reference, SY 8542 with canvas=(0,0)):
+          # source-end pairs stack at the exit point (role +3/-23,
+          # mult +3/0); target-end pairs sit just above the dock
+          # astride the trunk — role right edge at trunk+7, mult
+          # starting at trunk+8, both at dock_y - 8.
           def zero_offset?(text_box, mult_box)
             [text_box, mult_box].compact.all? do |b|
               b["ox"].to_i.zero? && b["oy"].to_i.zero?
@@ -88,8 +89,8 @@ module Ea
               width = Ea::Fonts::Metrics.text_length(
                 role.to_s, font_size, family: font_family
               ) || role.to_s.length * 6
-              [[anchor[0] + 8 - width, text_pos ? text_pos[1] : anchor[1]],
-               [anchor[0] + 8, mult_pos ? mult_pos[1] : anchor[1]]]
+              [[anchor[0] + 7 - width, anchor[1] - 8],
+               [anchor[0] + 8, anchor[1] - 8]]
             end
           end
 

data/lib/ea/version.rb

@@ -4,5 +4,5 @@ module Ea
   # Gem release version. Extracted to its own file so the
   # `gem-release` tool's `gem bump` can find and update it via the
   # standard `lib/<gem>/version.rb` convention.
-  VERSION = "0.6.13"
+  VERSION = "0.6.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ea
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-30 00:00:00.000000000 Z
+date: 2026-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model