ea 0.6.10 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed940fe5d30af46cc24f8945771cfa2ae1b4ccafaf5574a343b0b361241c7fb
-  data.tar.gz: f072e8063bfd37d5f1547bec70e72fcc3cac33a2ae0fdfff5a85e035885a4ab2
+  metadata.gz: 9ab8e167be62620122df9b9f06f67164d94f5843811f2e3d41069095b7225d1d
+  data.tar.gz: 512ab6826980ce4625c31816a4efa7d55bee0f37a12a4e74cd2fa0ba430f0cdf
 SHA512:
-  metadata.gz: a202d8da9feef0a2f2908780873dab759090e74fc6c5bd9c313e443f3e33659a871b2492122fd9b39b37528e4f5f05f30e4439b88e72646c370a0045a66b2ecc
-  data.tar.gz: 56d7264d3167c6367a753254a4815e42e3ed029cc1a39ae0d1d85f2baebf1fde14a0cf2a1b0008981a1196474632eafcc1c763cfac72ff8913e10dcb5096154f
+  metadata.gz: 52b93143d5900ecd0ffa27abb452b1b2ce3ac1005e97cc7e7cea20d0ed98f0000e458b18453dd3dc89a02dd0e8cdf3e1de806c917b239de558bcf4e2a46b9021
+  data.tar.gz: 13b265e34b8d6e0358f0116f0a0a41878231ea7f0aba212553038f14e936fd41a646d4b56145ebc6058b07da90c97e66dabab2ad9b1e256aa2f7c2e184843867

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

@@ -377,7 +377,10 @@ module Ea
                          element_edge_point(target_placement, :target, edge_out)
 
           intermediate = intermediate_waypoints(link_row)
-          if intermediate.any?
+          if tree_route?(edge_out, intermediate)
+            points = tree_waypoints(source_placement, target_placement,
+                                    intermediate.first)
+          elsif intermediate.any?
             points = [source_point, *intermediate, target_point]
           elsif source_port || target_port
             # Exact ports are known — the SX/SY bend heuristics in
@@ -392,6 +395,26 @@ 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]]
+        end
+
         # Absolute connection point EA docks the connector's visible
         # endpoint at, derived from the Geometry SX/SY (source) and
         # EX/EY (target) offsets. The offsets are measured inward from

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

@@ -41,7 +41,8 @@ module Ea
           #   anchor     - [x, y] of the connector endpoint
           #   connector  - the DiagramConnector (for relationship lookup)
           #   end_kind   - :source or :target
-          def texts(text_box:, mult_box:, anchor:, connector:, end_kind:)
+          def texts(text_box:, mult_box:, anchor:, connector:, end_kind:,
+                    tree: false)
             from_property, role, mult = role_and_multiplicity(connector, end_kind)
             if role_empty?(role) && mult_empty?(mult)
               other_from_prop, other_role, other_mult = role_and_multiplicity(connector,
@@ -56,6 +57,10 @@ module Ea
 
             text_pos = position_at(text_box, anchor)
             mult_pos = position_at(mult_box, anchor) || text_pos
+            if tree && zero_offset?(text_box, mult_box)
+              text_pos, mult_pos = tree_positions(end_kind, anchor, role,
+                                                  text_pos, mult_pos)
+            end
             show_property = property_label?(connector)
 
             build_texts(role:, mult:, standalone:,
@@ -64,6 +69,30 @@ 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).
+          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?
+            end
+          end
+
+          def tree_positions(end_kind, anchor, role, text_pos, mult_pos)
+            if end_kind == :source
+              [[anchor[0] + 3, anchor[1] - 23],
+               [anchor[0] + 3, anchor[1]]]
+            else
+              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]]]
+            end
+          end
+
           def build_texts(role:, mult:, standalone:, text_pos:, mult_pos:,
                           show_property:)
             if role && !role.empty? && text_pos

data/lib/ea/svg/ea_emitter/labels.rb

@@ -72,6 +72,7 @@ module Ea
           source_pt = points.first
           target_pt = points.last
           boxes = connector.label_boxes || {}
+          tree = tree_shaped?(points)
 
           src_tb, src_mb = end_boxes(boxes, :llt, :llb) ||
                            default_label_boxes(points, :source)
@@ -81,13 +82,25 @@ module Ea
           texts = []
           end_renderer.texts(text_box: src_tb, mult_box: src_mb,
                              anchor: source_pt, connector: connector,
-                             end_kind: :source).each { |t| texts << t }
-          end_renderer.texts(text_box: tgt_tb, mult_box: tgt_mb,
+                             end_kind: :source, tree: tree && tree[:source]).each { |t| texts << t }
+          end_renderer.texts(text_box: tgt_tb,
+                             mult_box: tgt_mb,
                              anchor: target_pt, connector: connector,
-                             end_kind: :target).each { |t| texts << t }
+                             end_kind: :target, tree: tree && tree[:target]).each { |t| texts << t }
           texts
         end
 
+        # EA tree routes are a perfect L: source-exit horizontal into
+        # the corner, vertical trunk into the target dock. Returns
+        # per-end flags when the connector matches, else nil.
+        def tree_shaped?(points)
+          return nil unless points.size == 3
+          return nil unless points[0][1] == points[1][1] &&
+                           points[1][0] == points[2][0]
+
+          { source: true, target: true }
+        end
+
         def end_boxes(boxes, text_key, mult_key)
           return nil if boxes[text_key].nil? && boxes[mult_key].nil?
 

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.10"
+  VERSION = "0.6.12"
 end

metadata

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