elkrb 1.0.2 → 2.0.0

data/lib/elkrb/layout/edge_router.rb

@@ -2,165 +2,298 @@
 
 require_relative "../geometry/point"
 require_relative "../geometry/bezier"
+require_relative "../geometry/rectangle"
 require_relative "../graph/edge"
+require_relative "node_index"
 
 module Elkrb
   module Layout
-    # Provides edge routing functionality for layout algorithms
+    # Provides edge routing functionality for layout algorithms.
+    #
+    # The including class sets @resolver (an Options::Resolver), as
+    # BaseAlgorithm does; every option read goes through it.
     module EdgeRouter
       # Route edges in a graph using specified routing style
       # @param graph [Graph::Graph] The graph to route edges for
-      # @param node_map [Hash] Map of node IDs to node objects
+      # @param node_map [NodeIndex] Resolves node/port ids to owning
+      #   nodes for this level
       # @param routing_style [String] Routing style (ORTHOGONAL, POLYLINE,
       #   SPLINES)
-      def route_edges(graph, node_map = nil, routing_style = nil)
-        node_map ||= build_node_map(graph)
-        routing_style ||= get_routing_style(graph)
+      # A plain `{id => node}` Hash was the documented node_map before
+      # NodeIndex existed, and both public entry points still take one.
+      # Only #node is ever asked of a node_map, so that is all this wraps.
+      class HashNodeMap
+        def initialize(nodes)
+          @nodes = nodes
+        end
+
+        # A caller-supplied Hash is keyed by node id, but an edge endpoint may
+        # name a PORT. Fall back to the node owning that port, the way the
+        # pre-NodeIndex router did — otherwise a ported edge silently ends up
+        # with no sections at all.
+        def node(id)
+          @nodes[id] || owner_of_port(id)
+        end
+
+        private
+
+        def owner_of_port(id)
+          @nodes.each_value.find { |node| owns_port?(node, id) }
+        end
+
+        def owns_port?(node, id)
+          return false unless node.respond_to?(:ports)
+
+          node.ports&.any? { |port| port.id == id } || false
+        end
+      end
+      private_constant :HashNodeMap
+
+      def coerce_node_map(node_map)
+        node_map.is_a?(::Hash) ? HashNodeMap.new(node_map) : node_map
+      end
 
+      def route_edges(graph, node_map = nil, routing_style = nil)
+        node_map = coerce_node_map(node_map || NodeIndex.build(graph))
         graph.edges&.each do |edge|
-          if self_loop?(edge)
-            route_self_loop(edge, node_map, graph, routing_style)
+          style = routing_style || get_edge_routing_style(graph, edge)
+          if self_loop?(edge, node_map)
+            route_self_loop(edge, node_map, graph, style)
           else
-            route_edge_with_style(edge, node_map, graph, routing_style)
+            route_edge_with_style(edge, node_map, graph, style)
           end
         end
       end
 
       # Route a single edge
       # @param edge [Graph::Edge] The edge to route
-      # @param node_map [Hash] Map of node IDs to node objects
+      # @param node_map [NodeIndex] Resolves node/port ids to owning
+      #   nodes for this level
       # @param graph [Graph::Graph] The containing graph
-      def route_edge(edge, node_map, _graph)
+      def route_edge(edge, node_map, graph, routing_style = nil)
         return unless edge.sources&.any? && edge.targets&.any?
 
+        node_map = coerce_node_map(node_map)
+
         # Get source and target nodes
         source_id = edge.sources.first
         target_id = edge.targets.first
 
-        source_node = node_map[source_id]
-        target_node = node_map[target_id]
-
-        # If nodes not found, sources/targets might be port IDs
-        # Try to find nodes that contain these ports
-        source_node ||= find_node_with_port(node_map.values, source_id)
-        target_node ||= find_node_with_port(node_map.values, target_id)
+        source_node = node_map.node(source_id)
+        target_node = node_map.node(target_id)
 
         return unless source_node && target_node
 
-        # Create edge section if not exists
-        edge.sections ||= []
-        if edge.sections.empty?
-          edge.sections << Graph::EdgeSection.new(
-            id: "#{edge.id}_section_0",
-          )
-        end
-
-        section = edge.sections.first
+        section = reset_section(edge, graph)
+        routing_style ||= get_edge_routing_style(graph, edge)
 
         # Calculate routing points based on port-awareness
         if edge_uses_ports?(edge, source_node, target_node)
-          route_with_ports(section, edge, source_node, target_node)
+          route_with_ports(section, edge, source_node, target_node,
+                           routing_style, graph)
         else
-          route_node_to_node(section, source_node, target_node, edge)
+          route_node_to_node(section, source_node, target_node, routing_style)
         end
       end
 
       private
 
-      # Build a map of node IDs to node objects
-      def build_node_map(graph)
-        map = {}
-        graph.children&.each do |node|
-          map[node.id] = node
+      def route_cross_level_edges(graph)
+        hierarchy = @resolver.get("elk.hierarchyHandling", graph)
+        return unless hierarchy == "INCLUDE_CHILDREN"
+
+        deep_index = NodeIndex.build_deep(graph)
+        level_index = NodeIndex.build(graph)
+        graph.edges&.each do |edge|
+          route_cross_level_edge(edge, graph, level_index, deep_index)
         end
-        map
       end
 
-      # Find node that contains a port with the given ID
-      def find_node_with_port(nodes, port_id)
-        nodes.find do |node|
-          node.ports&.any? { |port| port.id == port_id }
-        end
+      def route_cross_level_edge(edge, graph, level_index, deep_index)
+        return unless edge.sources&.any? && edge.targets&.any?
+
+        source = unique_deep_endpoint(deep_index, edge.sources.first)
+        target = unique_deep_endpoint(deep_index, edge.targets.first)
+        return unless source && target
+        return if self_loop?(edge, level_index)
+        return if level_index.node(edge.sources.first) &&
+          level_index.node(edge.targets.first)
+
+        start_point, end_point = absolute_endpoint_points(
+          edge, source, target
+        )
+        section = reset_section(edge, graph)
+        section.start_point = start_point
+        section.end_point = end_point
+        section.bend_points = []
+        route_cross_level_bends(section, edge, graph)
       end
 
-      # Check if edge should use port-based routing
-      def edge_uses_ports?(_edge, source_node, target_node)
-        # Check if nodes have ports
-        has_source_ports = source_node.ports&.any?
-        has_target_ports = target_node.ports&.any?
+      def unique_deep_endpoint(deep_index, id)
+        matches = deep_index[id] || []
+        if matches.length > 1
+          raise Elkrb::ValidationError, "ambiguous id across levels: #{id}"
+        end
 
-        has_source_ports || has_target_ports
+        matches.first
       end
 
-      # Route edge using port positions
-      def route_with_ports(section, edge, source_node, target_node)
-        # Get port positions or fallback to node center
+      def absolute_endpoint_points(edge, source, target)
+        source_node, source_offset = source
+        target_node, target_offset = target
+        source_rect = offset_rectangle(source_node, source_offset)
+        target_rect = offset_rectangle(target_node, target_offset)
         source_port = find_port_by_id(edge.sources.first, source_node)
         target_port = find_port_by_id(edge.targets.first, target_node)
+        source_anchor = absolute_endpoint_anchor(source_node, source_offset,
+                                                 source_port, source_rect)
+        target_anchor = absolute_endpoint_anchor(target_node, target_offset,
+                                                 target_port, target_rect)
 
-        start_point = get_port_position(
-          edge.sources.first,
-          source_node,
-          :outgoing,
-        )
-        end_point = get_port_position(
-          edge.targets.first,
-          target_node,
-          :incoming,
+        start_point = if source_port
+                        source_anchor
+                      else
+                        clip_to_border(source_rect, source_anchor,
+                                       target_anchor)
+                      end
+        end_point = if target_port
+                      target_anchor
+                    else
+                      clip_to_border(target_rect, target_anchor,
+                                     source_anchor)
+                    end
+        [start_point, end_point]
+      end
+
+      def offset_rectangle(node, offset)
+        Geometry::Rectangle.new(
+          (node.x || 0.0) + offset.x,
+          (node.y || 0.0) + offset.y,
+          node.width || 0.0,
+          node.height || 0.0,
         )
+      end
+
+      def absolute_endpoint_anchor(node, offset, port, rectangle)
+        return rectangle.center unless port
+
+        point = get_port_position(port.id, node, nil)
+        Geometry::Point.new(x: offset.x + point.x, y: offset.y + point.y)
+      end
+
+      def route_cross_level_bends(section, edge, graph)
+        case get_edge_routing_style(graph, edge)
+        when "ORTHOGONAL"
+          add_orthogonal_bend_points(section, section.start_point,
+                                     section.end_point)
+        when "SPLINES"
+          add_spline_control_points(section, section.start_point,
+                                    section.end_point, edge)
+        end
+      end
+
+      # Check if edge should use port-based routing
+      def edge_uses_ports?(edge, source_node, target_node)
+        find_port_by_id(edge.sources.first, source_node) ||
+          find_port_by_id(edge.targets.first, target_node)
+      end
+
+      # Route edge using port positions
+      def route_with_ports(section, edge, source_node, target_node,
+                           routing_style, graph)
+        start_point, end_point = endpoint_points(edge, source_node, target_node)
 
         section.start_point = start_point
         section.end_point = end_point
-        section.bend_points ||= []
+        section.bend_points = []
 
-        # Add intelligent bend points based on port sides
-        if source_port && target_port
-          add_port_aware_bend_points(
-            section,
-            start_point,
-            end_point,
-            source_port,
-            target_port,
+        if routing_style == "ORTHOGONAL"
+          add_orthogonal_bend_points_between_nodes(
+            section, start_point, end_point, source_node, target_node, graph
           )
-        elsif should_use_orthogonal_routing?(edge)
-          add_orthogonal_bend_points(section, start_point, end_point)
         end
       end
 
-      # Route edge from node center to node center
-      def route_node_to_node(section, source_node, target_node, edge = nil)
-        start_point = get_node_center(source_node)
-        end_point = get_node_center(target_node)
+      # Route edge from source border to target border
+      def route_node_to_node(section, source_node, target_node, routing_style)
+        source_rect = node_rectangle(source_node)
+        target_rect = node_rectangle(target_node)
+        source_center = source_rect.center
+        target_center = target_rect.center
+        start_point = clip_to_border(source_rect, source_center, target_center)
+        end_point = clip_to_border(target_rect, target_center, source_center)
 
         section.start_point = start_point
         section.end_point = end_point
-        section.bend_points ||= []
+        section.bend_points = []
 
-        # Add orthogonal routing if configured
-        if edge && should_use_orthogonal_routing?(edge)
+        if routing_style == "ORTHOGONAL"
           add_orthogonal_bend_points(section, start_point, end_point)
         end
       end
 
+      def node_rectangle(node)
+        Geometry::Rectangle.new(
+          node.x || 0.0,
+          node.y || 0.0,
+          node.width || 0.0,
+          node.height || 0.0,
+        )
+      end
+
+      # Intersect the ray from a rectangle's centre towards another point
+      # with the rectangle border.
+      def clip_to_border(rect, from, to)
+        dx = to.x - from.x
+        dy = to.y - from.y
+        return Geometry::Point.new(x: from.x, y: from.y) if dx.zero? && dy.zero?
+
+        scales = []
+        scales << ((rect.width / 2.0) / dx.abs) unless dx.zero?
+        scales << ((rect.height / 2.0) / dy.abs) unless dy.zero?
+        scale = scales.min
+
+        Geometry::Point.new(
+          x: from.x + (dx * scale),
+          y: from.y + (dy * scale),
+        )
+      end
+
+      def reset_section(edge, graph)
+        section = Graph::EdgeSection.new(
+          id: "#{edge.id}_s0",
+          incoming_shape: edge.sources.first,
+          outgoing_shape: edge.targets.first,
+        )
+        edge.sections = [section]
+        edge.container ||= graph.id
+        section
+      end
+
       # Find port by ID
       def find_port_by_id(port_id, node)
         node.ports&.find { |p| p.id == port_id }
       end
 
-      # Get position of a port or node center
+      # Get the port's outer-border anchor, or the node center.
       def get_port_position(port_id, node, _direction)
-        # Try to find port
         port = find_port_by_id(port_id, node)
-
-        if port
-          # Port position is relative to node position
-          Geometry::Point.new(
-            x: (node.x || 0.0) + (port.x || 0.0),
-            y: (node.y || 0.0) + (port.y || 0.0),
-          )
-        else
-          # Fallback to node center
-          get_node_center(node)
+        return get_node_center(node) unless port
+
+        x = (node.x || 0.0) + (port.x || 0.0)
+        y = (node.y || 0.0) + (port.y || 0.0)
+        width = port.width || 0.0
+        height = port.height || 0.0
+        case port.side
+        when Graph::Port::NORTH
+          Geometry::Point.new(x: x + (width / 2.0), y: y)
+        when Graph::Port::SOUTH
+          Geometry::Point.new(x: x + (width / 2.0), y: y + height)
+        when Graph::Port::WEST
+          Geometry::Point.new(x: x, y: y + (height / 2.0))
+        when Graph::Port::EAST
+          Geometry::Point.new(x: x + width, y: y + (height / 2.0))
+        else Geometry::Point.new(x: x, y: y)
         end
       end
 
@@ -171,37 +304,27 @@ module Elkrb
         Geometry::Point.new(x: x, y: y)
       end
 
-      # Check if orthogonal routing should be used
-      def should_use_orthogonal_routing?(edge)
-        edge.layout_options&.[]("edge.routing") == "orthogonal"
-      end
-
-      # Add intelligent bend points based on port sides
-      def add_port_aware_bend_points(section, start_point, end_point,
-                                       source_port, target_port)
-        source_side = source_port.side
-        target_side = target_port.side
+      def endpoint_points(edge, source_node, target_node)
+        source_id = edge.sources.first
+        target_id = edge.targets.first
+        source_port = find_port_by_id(source_id, source_node)
+        target_port = find_port_by_id(target_id, target_node)
+        source_anchor = get_port_position(source_id, source_node, :outgoing)
+        target_anchor = get_port_position(target_id, target_node, :incoming)
 
-        # Calculate bend points based on port side combinations
-        case [source_side, target_side]
-        when ["EAST", "WEST"], ["WEST", "EAST"]
-          # Horizontal connection: add midpoint
-          add_horizontal_bend_points(section, start_point, end_point)
-        when ["NORTH", "SOUTH"], ["SOUTH", "NORTH"]
-          # Vertical connection: add midpoint
-          add_vertical_bend_points(section, start_point, end_point)
-        when ["EAST", "NORTH"], ["EAST", "SOUTH"],
-             ["WEST", "NORTH"], ["WEST", "SOUTH"]
-          # Horizontal to vertical
-          add_horizontal_then_vertical(section, start_point, end_point)
-        when ["NORTH", "EAST"], ["NORTH", "WEST"],
-             ["SOUTH", "EAST"], ["SOUTH", "WEST"]
-          # Vertical to horizontal
-          add_vertical_then_horizontal(section, start_point, end_point)
-        else
-          # Default orthogonal routing
-          add_orthogonal_bend_points(section, start_point, end_point)
-        end
+        start_point = if source_port
+                        source_anchor
+                      else
+                        clip_to_border(node_rectangle(source_node),
+                                       source_anchor, target_anchor)
+                      end
+        end_point = if target_port
+                      target_anchor
+                    else
+                      clip_to_border(node_rectangle(target_node),
+                                     target_anchor, source_anchor)
+                    end
+        [start_point, end_point]
       end
 
       # Add horizontal bend points (for horizontal connections)
@@ -218,35 +341,75 @@ module Elkrb
         section.add_bend_point(end_point.x, mid_y)
       end
 
-      # Route horizontal then vertical
-      def add_horizontal_then_vertical(section, start_point, end_point)
-        section.add_bend_point(end_point.x, start_point.y)
+      # Add orthogonal (right-angle) bend points
+      def add_orthogonal_bend_points(section, start_point, end_point)
+        return if start_point.x == end_point.x || start_point.y == end_point.y
+
+        dx = (end_point.x - start_point.x).abs
+        dy = (end_point.y - start_point.y).abs
+        if dx >= dy
+          add_horizontal_bend_points(section, start_point, end_point)
+        else
+          add_vertical_bend_points(section, start_point, end_point)
+        end
       end
 
-      # Route vertical then horizontal
-      def add_vertical_then_horizontal(section, start_point, end_point)
-        section.add_bend_point(start_point.x, end_point.y)
+      def add_orthogonal_bend_points_between_nodes(
+        section, start_point, end_point, source_node, target_node, graph
+      )
+        return if start_point.x == end_point.x || start_point.y == end_point.y
+
+        source = node_rectangle(source_node)
+        target = node_rectangle(target_node)
+
+        if horizontal_routing?(source, target, graph)
+          mid_x = horizontal_gap(source, target, start_point, end_point)
+          section.add_bend_point(mid_x, start_point.y)
+          section.add_bend_point(mid_x, end_point.y)
+        else
+          mid_y = vertical_gap(source, target, start_point, end_point)
+          section.add_bend_point(start_point.x, mid_y)
+          section.add_bend_point(end_point.x, mid_y)
+        end
       end
 
-      # Add orthogonal (right-angle) bend points
-      def add_orthogonal_bend_points(section, start_point, end_point)
-        # Simple orthogonal routing: horizontal then vertical
-        mid_x = (start_point.x + end_point.x) / 2.0
+      def horizontal_routing?(source, target, graph)
+        direction = @resolver.get("elk.direction", graph)
+        return true if %w[LEFT RIGHT].include?(direction)
+        return false if %w[DOWN UP].include?(direction)
 
-        # Add bend points for orthogonal path
-        section.add_bend_point(mid_x, start_point.y)
-        section.add_bend_point(mid_x, end_point.y)
+        (target.center.x - source.center.x).abs >=
+          (target.center.y - source.center.y).abs
+      end
+
+      def horizontal_gap(source, target, start_point, end_point)
+        return (source.x + source.width + target.x) / 2.0 if
+          source.x + source.width <= target.x
+        return (target.x + target.width + source.x) / 2.0 if
+          target.x + target.width <= source.x
+
+        (start_point.x + end_point.x) / 2.0
       end
 
-      # Get routing style from graph options
-      def get_routing_style(graph)
-        return "ORTHOGONAL" unless graph.layout_options
+      def vertical_gap(source, target, start_point, end_point)
+        return (source.y + source.height + target.y) / 2.0 if
+          source.y + source.height <= target.y
+        return (target.y + target.height + source.y) / 2.0 if
+          target.y + target.height <= source.y
 
-        style = graph.layout_options["elk.edgeRouting"] ||
-          graph.layout_options["edgeRouting"] ||
-          graph.layout_options.edge_routing
+        (start_point.y + end_point.y) / 2.0
+      end
 
-        style ? style.to_s.upcase : "ORTHOGONAL"
+      # Get edge routing style from graph options
+      #
+      # @param graph [Elkrb::Graph::Graph] The graph
+      # @return [String] Routing style (ORTHOGONAL, POLYLINE, SPLINES)
+      def get_edge_routing_style(graph, edge = nil)
+        elements = edge ? [edge, graph] : [graph]
+        style = @resolver.get("elk.edgeRouting", *elements)
+
+        style = style.to_s.upcase
+        style == "UNDEFINED" ? "ORTHOGONAL" : style
       end
 
       # Route edge with specified routing style
@@ -257,40 +420,28 @@ module Elkrb
         when "POLYLINE"
           route_polyline_edge(edge, node_map, graph)
         else
-          route_edge(edge, node_map, graph)
+          route_edge(edge, node_map, graph, "ORTHOGONAL")
         end
       end
 
       # Route edge with polyline (straight segments) style
       def route_polyline_edge(edge, node_map, graph)
-        # Polyline is just direct routing without bend points
-        route_edge(edge, node_map, graph)
+        route_edge(edge, node_map, graph, "POLYLINE")
       end
 
       # Route edge with spline (curved) style
-      def route_spline_edge(edge, node_map, _graph)
+      def route_spline_edge(edge, node_map, graph)
         return unless edge.sources&.any? && edge.targets&.any?
 
         source_id = edge.sources.first
         target_id = edge.targets.first
 
-        source_node = node_map[source_id]
-        target_node = node_map[target_id]
-
-        source_node ||= find_node_with_port(node_map.values, source_id)
-        target_node ||= find_node_with_port(node_map.values, target_id)
+        source_node = node_map.node(source_id)
+        target_node = node_map.node(target_id)
 
         return unless source_node && target_node
 
-        # Create edge section if not exists
-        edge.sections ||= []
-        if edge.sections.empty?
-          edge.sections << Graph::EdgeSection.new(
-            id: "#{edge.id}_section_0",
-          )
-        end
-
-        section = edge.sections.first
+        section = reset_section(edge, graph)
 
         # Calculate spline routing
         if edge_uses_ports?(edge, source_node, target_node)
@@ -302,16 +453,7 @@ module Elkrb
 
       # Route spline edge using port positions
       def route_spline_with_ports(section, edge, source_node, target_node)
-        start_point = get_port_position(
-          edge.sources.first,
-          source_node,
-          :outgoing,
-        )
-        end_point = get_port_position(
-          edge.targets.first,
-          target_node,
-          :incoming,
-        )
+        start_point, end_point = endpoint_points(edge, source_node, target_node)
 
         section.start_point = start_point
         section.end_point = end_point
@@ -322,8 +464,12 @@ module Elkrb
 
       # Route spline edge from node center to node center
       def route_spline_node_to_node(section, edge, source_node, target_node)
-        start_point = get_node_center(source_node)
-        end_point = get_node_center(target_node)
+        source_rect = node_rectangle(source_node)
+        target_rect = node_rectangle(target_node)
+        source_center = source_rect.center
+        target_center = target_rect.center
+        start_point = clip_to_border(source_rect, source_center, target_center)
+        end_point = clip_to_border(target_rect, target_center, source_center)
 
         section.start_point = start_point
         section.end_point = end_point
@@ -352,17 +498,12 @@ module Elkrb
 
       # Get spline curvature from options
       def get_spline_curvature(edge)
-        return 0.5 unless edge.layout_options
-
-        curvature = edge.layout_options["elk.spline.curvature"] ||
-          edge.layout_options["spline.curvature"]
-
-        curvature ? curvature.to_f : 0.5
+        @resolver.get("elk.spline.curvature", edge)
       end
 
       # Calculate Bezier control points for smooth curves
       def calculate_spline_controls(start_point, end_point, curvature, edge)
-        # Determine routing direction from edge or graph options
+        # Determine routing direction from the edge's options
         direction = get_routing_direction(edge)
 
         case direction
@@ -390,45 +531,34 @@ module Elkrb
 
       # Get routing direction from edge options
       def get_routing_direction(edge)
-        return nil unless edge.layout_options
-
-        edge.layout_options["elk.direction"] ||
-          edge.layout_options["direction"] ||
-          nil
+        @resolver.get("elk.direction", edge, default: nil)
       end
 
-      # Check if edge is a self-loop (source == target)
-      def self_loop?(edge)
+      # Check if an edge's endpoints belong to the same node.
+      def self_loop?(edge, node_map = nil)
         sources = edge.sources || []
         targets = edge.targets || []
 
         return false if sources.empty? || targets.empty?
+        return sources.first == targets.first unless node_map
+
+        source_node = node_map.node(sources.first)
+        target_node = node_map.node(targets.first)
+        return sources.first == targets.first unless source_node || target_node
 
-        sources.first == targets.first
+        source_node&.equal?(target_node)
       end
 
       # Route a self-loop edge
       def route_self_loop(edge, node_map, graph, routing_style)
         node_id = edge.sources.first
-        node = node_map[node_id]
-
-        # If not found, might be a port ID
-        node ||= find_node_with_port(node_map.values, node_id)
+        node = node_map.node(node_id)
 
         return unless node
 
         # Get self-loop index for multiple loops on same node
-        loop_index = get_self_loop_index(edge, node, graph)
-
-        # Create edge section if not exists
-        edge.sections ||= []
-        if edge.sections.empty?
-          edge.sections << Graph::EdgeSection.new(
-            id: "#{edge.id}_section_0",
-          )
-        end
-
-        section = edge.sections.first
+        loop_index = get_self_loop_index(edge, node, graph, node_map)
+        section = reset_section(edge, graph)
 
         # Check if edge uses ports
         if edge_uses_ports_for_self_loop?(edge, node)
@@ -440,39 +570,42 @@ module Elkrb
           when "SPLINES"
             route_spline_self_loop(section, edge, node, loop_index)
           when "POLYLINE"
-            route_polyline_self_loop(section, edge, node, loop_index)
+            route_polyline_self_loop(section, edge, node, loop_index, graph)
           else
-            route_orthogonal_self_loop(section, edge, node, loop_index)
+            route_orthogonal_self_loop(
+              section, edge, node, loop_index, graph
+            )
           end
         end
       end
 
       # Get self-loop index for multiple loops on same node
-      def get_self_loop_index(edge, node, graph)
+      def get_self_loop_index(edge, node, graph,
+                              node_map = NodeIndex.build(graph))
         return 0 unless graph.edges
 
-        # Find all self-loops on this node
         self_loops = graph.edges.select do |e|
-          self_loop?(e) && e.sources&.first == node.id
+          source_node = node_map.node(e.sources&.first)
+          self_loop?(e, node_map) && source_node.equal?(node)
         end
 
-        # Return index of current edge
-        self_loops.index(edge) || 0
+        self_loops.index { |candidate| candidate.equal?(edge) } || 0
       end
 
       # Route orthogonal self-loop (rectangular path)
-      def route_orthogonal_self_loop(section, edge, node, loop_index)
+      def route_orthogonal_self_loop(section, edge, node, loop_index,
+                                     graph = nil)
         # Calculate offset based on loop index
-        offset = calculate_loop_offset(loop_index)
+        offset = calculate_loop_offset(loop_index, edge, node)
 
         # Get self-loop side
-        side = get_self_loop_side(edge, node)
-
         # Calculate dimensions
         width = ((node.width || 50.0) * 0.4) + offset
         height = ((node.height || 50.0) * 0.4) + offset
+        side = unobstructed_self_loop_side(
+          get_self_loop_side(edge, node), node, width, height, graph
+        )
 
-        # Calculate start/end points based on side
         case side
         when "EAST"
           route_east_self_loop(section, node, width, height)
@@ -483,121 +616,143 @@ module Elkrb
         when "SOUTH"
           route_south_self_loop(section, node, width, height)
         else
-          # Default: EAST
           route_east_self_loop(section, node, width, height)
         end
       end
 
+      def unobstructed_self_loop_side(preferred, node, width, height, graph)
+        return preferred unless graph
+
+        ([preferred] + %w[EAST WEST NORTH SOUTH]).uniq.find do |side|
+          self_loop_side_clear?(side, node, width, height, graph)
+        end || preferred
+      end
+
+      def self_loop_side_clear?(side, node, width, height, graph)
+        loop_box = self_loop_box(side, node, width, height)
+        graph.children.to_a.none? do |candidate|
+          next false if candidate.equal?(node)
+
+          rectangles_overlap?(loop_box, node_rectangle(candidate))
+        end
+      end
+
+      def self_loop_box(side, node, width, height)
+        x = node.x || 0.0
+        y = node.y || 0.0
+        node_width = node.width || 50.0
+        node_height = node.height || 50.0
+        case side
+        when "WEST"
+          Geometry::Rectangle.new(x - width, y + (node_height / 2.0) - 5.0,
+                                  width, 10.0)
+        when "NORTH"
+          Geometry::Rectangle.new(x + (node_width / 2.0) - 5.0, y - height,
+                                  10.0, height)
+        when "SOUTH"
+          Geometry::Rectangle.new(
+            x + (node_width / 2.0) - 5.0, y + node_height, 10.0, height
+          )
+        else
+          Geometry::Rectangle.new(
+            x + node_width, y + (node_height / 2.0) - 5.0, width, 10.0
+          )
+        end
+      end
+
+      def rectangles_overlap?(first, second)
+        first.x < second.x + second.width &&
+          first.x + first.width > second.x &&
+          first.y < second.y + second.height &&
+          first.y + first.height > second.y
+      end
+
       # Route self-loop on EAST side
-      def route_east_self_loop(section, node, width, height)
+      def route_east_self_loop(section, node, width, _height)
         node_x = node.x || 0.0
         node_y = node.y || 0.0
         node_width = node.width || 50.0
         node_height = node.height || 50.0
 
-        # Start point (right middle of node)
         start_x = node_x + node_width
-        start_y = node_y + (node_height / 2.0)
-
-        # End point (slightly below start)
+        start_y = node_y + (node_height / 2.0) - 5.0
         end_x = start_x
         end_y = start_y + 10.0
 
         section.start_point = Geometry::Point.new(x: start_x, y: start_y)
         section.end_point = Geometry::Point.new(x: end_x, y: end_y)
 
-        # Bend points forming rectangular loop
         section.bend_points = [
           Geometry::Point.new(x: start_x + width, y: start_y),
-          Geometry::Point.new(x: start_x + width, y: start_y - height),
-          Geometry::Point.new(x: start_x + width, y: start_y + height),
-          Geometry::Point.new(x: end_x, y: end_y - 5.0),
+          Geometry::Point.new(x: start_x + width, y: end_y),
         ]
       end
 
       # Route self-loop on WEST side
-      def route_west_self_loop(section, node, width, height)
+      def route_west_self_loop(section, node, width, _height)
         node_x = node.x || 0.0
         node_y = node.y || 0.0
         node_height = node.height || 50.0
 
-        # Start point (left middle of node)
         start_x = node_x
-        start_y = node_y + (node_height / 2.0)
-
-        # End point (slightly below start)
+        start_y = node_y + (node_height / 2.0) - 5.0
         end_x = start_x
         end_y = start_y + 10.0
 
         section.start_point = Geometry::Point.new(x: start_x, y: start_y)
         section.end_point = Geometry::Point.new(x: end_x, y: end_y)
 
-        # Bend points forming rectangular loop
         section.bend_points = [
           Geometry::Point.new(x: start_x - width, y: start_y),
-          Geometry::Point.new(x: start_x - width, y: start_y - height),
-          Geometry::Point.new(x: start_x - width, y: start_y + height),
-          Geometry::Point.new(x: end_x, y: end_y - 5.0),
+          Geometry::Point.new(x: start_x - width, y: end_y),
         ]
       end
 
       # Route self-loop on NORTH side
-      def route_north_self_loop(section, node, width, height)
+      def route_north_self_loop(section, node, _width, height)
         node_x = node.x || 0.0
         node_y = node.y || 0.0
         node_width = node.width || 50.0
 
-        # Start point (top middle of node)
-        start_x = node_x + (node_width / 2.0)
+        start_x = node_x + (node_width / 2.0) - 5.0
         start_y = node_y
-
-        # End point (slightly to the right of start)
         end_x = start_x + 10.0
         end_y = start_y
 
         section.start_point = Geometry::Point.new(x: start_x, y: start_y)
         section.end_point = Geometry::Point.new(x: end_x, y: end_y)
 
-        # Bend points forming rectangular loop
         section.bend_points = [
           Geometry::Point.new(x: start_x, y: start_y - height),
-          Geometry::Point.new(x: start_x - width, y: start_y - height),
-          Geometry::Point.new(x: start_x + width, y: start_y - height),
-          Geometry::Point.new(x: end_x - 5.0, y: end_y),
+          Geometry::Point.new(x: end_x, y: start_y - height),
         ]
       end
 
       # Route self-loop on SOUTH side
-      def route_south_self_loop(section, node, width, height)
+      def route_south_self_loop(section, node, _width, height)
         node_x = node.x || 0.0
         node_y = node.y || 0.0
         node_width = node.width || 50.0
         node_height = node.height || 50.0
 
-        # Start point (bottom middle of node)
-        start_x = node_x + (node_width / 2.0)
+        start_x = node_x + (node_width / 2.0) - 5.0
         start_y = node_y + node_height
-
-        # End point (slightly to the right of start)
         end_x = start_x + 10.0
         end_y = start_y
 
         section.start_point = Geometry::Point.new(x: start_x, y: start_y)
         section.end_point = Geometry::Point.new(x: end_x, y: end_y)
 
-        # Bend points forming rectangular loop
         section.bend_points = [
           Geometry::Point.new(x: start_x, y: start_y + height),
-          Geometry::Point.new(x: start_x - width, y: start_y + height),
-          Geometry::Point.new(x: start_x + width, y: start_y + height),
-          Geometry::Point.new(x: end_x - 5.0, y: end_y),
+          Geometry::Point.new(x: end_x, y: start_y + height),
         ]
       end
 
       # Route spline self-loop (curved path)
       def route_spline_self_loop(section, edge, node, loop_index)
         # Calculate offset based on loop index
-        offset = calculate_loop_offset(loop_index)
+        offset = calculate_loop_offset(loop_index, edge, node)
 
         # Get self-loop side
         side = get_self_loop_side(edge, node)
@@ -613,7 +768,7 @@ module Elkrb
         case side
         when "EAST"
           start_x = node_x + node_width
-          start_y = node_y + (node_height / 2.0)
+          start_y = node_y + (node_height / 2.0) - 5.0
           end_x = start_x
           end_y = start_y + 10.0
 
@@ -628,7 +783,7 @@ module Elkrb
           )
         when "WEST"
           start_x = node_x
-          start_y = node_y + (node_height / 2.0)
+          start_y = node_y + (node_height / 2.0) - 5.0
           end_x = start_x
           end_y = start_y + 10.0
 
@@ -642,7 +797,7 @@ module Elkrb
             y: start_y + radius,
           )
         when "NORTH"
-          start_x = node_x + (node_width / 2.0)
+          start_x = node_x + (node_width / 2.0) - 5.0
           start_y = node_y
           end_x = start_x + 10.0
           end_y = start_y
@@ -657,7 +812,7 @@ module Elkrb
             y: start_y - radius,
           )
         when "SOUTH"
-          start_x = node_x + (node_width / 2.0)
+          start_x = node_x + (node_width / 2.0) - 5.0
           start_y = node_y + node_height
           end_x = start_x + 10.0
           end_y = start_y
@@ -674,7 +829,7 @@ module Elkrb
         else
           # Default: EAST
           start_x = node_x + node_width
-          start_y = node_y + (node_height / 2.0)
+          start_y = node_y + (node_height / 2.0) - 5.0
           end_x = start_x
           end_y = start_y + 10.0
 
@@ -694,35 +849,21 @@ module Elkrb
       end
 
       # Route polyline self-loop (simple path)
-      def route_polyline_self_loop(section, edge, node, loop_index)
+      def route_polyline_self_loop(section, edge, node, loop_index,
+                                   graph = nil)
         # For polyline, use orthogonal routing
-        route_orthogonal_self_loop(section, edge, node, loop_index)
+        route_orthogonal_self_loop(section, edge, node, loop_index, graph)
       end
 
       # Calculate offset for multiple self-loops on same node
-      def calculate_loop_offset(loop_index)
-        base_offset = 20.0
+      def calculate_loop_offset(loop_index, edge, node)
+        base_offset = @resolver.get("elk.selfLoopOffset", edge, node)
         base_offset * (loop_index + 1)
       end
 
       # Get self-loop side from options or default
       def get_self_loop_side(edge, node)
-        # Check edge layout options first
-        if edge.layout_options
-          side = edge.layout_options["elk.selfLoopSide"] ||
-            edge.layout_options["selfLoopSide"]
-          return side if side
-        end
-
-        # Check node layout options
-        if node.layout_options
-          side = node.layout_options["elk.selfLoopSide"] ||
-            node.layout_options["selfLoopSide"]
-          return side if side
-        end
-
-        # Default: EAST
-        "EAST"
+        @resolver.get("elk.selfLoopSide", edge, node)
       end
 
       # Check if self-loop edge uses ports
@@ -750,27 +891,12 @@ module Elkrb
         source_port = find_port_by_id(source_id, node)
         target_port = find_port_by_id(target_id, node)
 
-        # Get port positions
-        start_point = if source_port
-                        get_port_absolute_position(source_port, node)
-                      else
-                        get_node_center(node)
-                      end
-
-        end_point = if target_port
-                      get_port_absolute_position(target_port, node)
-                    else
-                      get_node_center(node)
-                    end
-
-        section.start_point = start_point
-        section.end_point = end_point
-
-        # Calculate offset
-        offset = calculate_loop_offset(loop_index)
-
-        # Route between ports with appropriate style
+        offset = calculate_loop_offset(loop_index, edge, node)
         if source_port && target_port
+          start_point = get_port_absolute_position(source_port, node)
+          end_point = get_port_absolute_position(target_port, node)
+          section.start_point = start_point
+          section.end_point = end_point
           route_port_to_port_self_loop(
             section,
             start_point,
@@ -781,33 +907,52 @@ module Elkrb
             routing_style,
           )
         else
-          # Fallback to regular self-loop routing
-          case routing_style
-          when "SPLINES"
-            route_spline_self_loop(section, edge, node, loop_index)
+          port = source_port || target_port
+          port_point = get_port_absolute_position(port, node)
+          side = port.side || get_self_loop_side(edge, node)
+          node_x = node.x || 0.0
+          node_y = node.y || 0.0
+          node_width = node.width || 0.0
+          node_height = node.height || 0.0
+          node_point = case side
+                       when "WEST", "EAST"
+                         candidate = [port_point.y + 10.0,
+                                      node_y + node_height].min
+                         Geometry::Point.new(
+                           x: side == "EAST" ? node_x + node_width : node_x,
+                           y: candidate,
+                         )
+                       else
+                         candidate = [port_point.x + 10.0,
+                                      node_x + node_width].min
+                         Geometry::Point.new(
+                           x: candidate,
+                           y: side == "SOUTH" ? node_y + node_height : node_y,
+                         )
+                       end
+          start_point = source_port ? port_point : node_point
+          end_point = target_port ? port_point : node_point
+          section.start_point = start_point
+          section.end_point = end_point
+          if routing_style == "SPLINES"
+            route_spline_port_self_loop(section, start_point, end_point,
+                                        side, side, offset)
           else
-            route_orthogonal_self_loop(section, edge, node, loop_index)
+            route_orthogonal_port_self_loop(section, start_point, end_point,
+                                            side, side, offset)
           end
         end
       end
 
       # Get absolute position of a port
       def get_port_absolute_position(port, node)
-        Geometry::Point.new(
-          x: (node.x || 0.0) + (port.x || 0.0),
-          y: (node.y || 0.0) + (port.y || 0.0),
-        )
+        get_port_position(port.id, node, nil)
       end
 
       # Route self-loop from port to port
       def route_port_to_port_self_loop(section, start_point, end_point,
                                          source_port, target_port, offset,
                                          routing_style)
-        # Calculate midpoint for loop
-        (start_point.x + end_point.x) / 2.0
-        (start_point.y + end_point.y) / 2.0
-
-        # Determine loop direction based on port sides
         source_side = source_port.side || "EAST"
         target_side = target_port.side || "EAST"
 
@@ -837,43 +982,84 @@ module Elkrb
       # Route orthogonal self-loop between ports
       def route_orthogonal_port_self_loop(section, start_point, end_point,
                                             source_side, target_side, offset)
-        section.bend_points = []
-
-        # Create bend points based on port sides
+        extension = offset + 30.0
         case [source_side, target_side]
         when ["EAST", "EAST"], ["WEST", "WEST"]
-          # Both on same vertical side - create horizontal loop
-          extension = offset + 30.0
-          mid_y = (start_point.y + end_point.y) / 2.0
-
-          if source_side == "EAST"
-            section.add_bend_point(start_point.x + extension, start_point.y)
-            section.add_bend_point(start_point.x + extension, mid_y)
-            section.add_bend_point(end_point.x + extension, end_point.y)
-          else
-            section.add_bend_point(start_point.x - extension, start_point.y)
-            section.add_bend_point(start_point.x - extension, mid_y)
-            section.add_bend_point(end_point.x - extension, end_point.y)
+          direction = source_side == "EAST" ? 1 : -1
+          outer_x = start_point.x + (direction * extension)
+          section.bend_points = [
+            Geometry::Point.new(x: outer_x, y: start_point.y),
+            Geometry::Point.new(x: outer_x, y: end_point.y),
+          ]
+          if start_point.x == end_point.x && start_point.y == end_point.y
+            section.bend_points[1].y += 10.0
+            section.bend_points << Geometry::Point.new(
+              x: end_point.x, y: end_point.y + 10.0,
+            )
           end
         when ["NORTH", "NORTH"], ["SOUTH", "SOUTH"]
-          # Both on same horizontal side - create vertical loop
-          extension = offset + 30.0
-          mid_x = (start_point.x + end_point.x) / 2.0
-
-          if source_side == "NORTH"
-            section.add_bend_point(start_point.x, start_point.y - extension)
-            section.add_bend_point(mid_x, start_point.y - extension)
-            section.add_bend_point(end_point.x, end_point.y - extension)
-          else
-            section.add_bend_point(start_point.x, start_point.y + extension)
-            section.add_bend_point(mid_x, start_point.y + extension)
-            section.add_bend_point(end_point.x, end_point.y + extension)
+          direction = source_side == "SOUTH" ? 1 : -1
+          outer_y = start_point.y + (direction * extension)
+          section.bend_points = [
+            Geometry::Point.new(x: start_point.x, y: outer_y),
+            Geometry::Point.new(x: end_point.x, y: outer_y),
+          ]
+          if start_point.x == end_point.x && start_point.y == end_point.y
+            section.bend_points[1].x += 10.0
+            section.bend_points << Geometry::Point.new(
+              x: end_point.x + 10.0, y: end_point.y,
+            )
           end
         else
-          # Different sides - create L-shaped path
-          mid_x = (start_point.x + end_point.x) / 2.0
-          section.add_bend_point(mid_x, start_point.y)
-          section.add_bend_point(mid_x, end_point.y)
+          deltas = {
+            "EAST" => [extension, 0.0],
+            "WEST" => [-extension, 0.0],
+            "SOUTH" => [0.0, extension],
+            "NORTH" => [0.0, -extension],
+          }
+          source_delta = deltas.fetch(source_side, [0.0, 0.0])
+          target_delta = deltas.fetch(target_side, [0.0, 0.0])
+          source_outer = Geometry::Point.new(
+            x: start_point.x + source_delta[0],
+            y: start_point.y + source_delta[1],
+          )
+          target_outer = Geometry::Point.new(
+            x: end_point.x + target_delta[0],
+            y: end_point.y + target_delta[1],
+          )
+          opposite = [["EAST", "WEST"], ["WEST", "EAST"],
+                      ["NORTH", "SOUTH"], ["SOUTH", "NORTH"]]
+            .include?([source_side, target_side])
+          vertical_sides = %w[EAST WEST].include?(source_side)
+          section.bend_points = if opposite && vertical_sides
+                                  corridor = [source_outer.y,
+                                              target_outer.y].min - extension
+                                  [source_outer,
+                                   Geometry::Point.new(x: source_outer.x,
+                                                       y: corridor),
+                                   Geometry::Point.new(x: target_outer.x,
+                                                       y: corridor),
+                                   target_outer]
+                                elsif opposite
+                                  corridor = [source_outer.x,
+                                              target_outer.x].max + extension
+                                  [source_outer,
+                                   Geometry::Point.new(x: corridor,
+                                                       y: source_outer.y),
+                                   Geometry::Point.new(x: corridor,
+                                                       y: target_outer.y),
+                                   target_outer]
+                                elsif vertical_sides
+                                  [source_outer,
+                                   Geometry::Point.new(x: source_outer.x,
+                                                       y: target_outer.y),
+                                   target_outer]
+                                else
+                                  [source_outer,
+                                   Geometry::Point.new(x: target_outer.x,
+                                                       y: source_outer.y),
+                                   target_outer]
+                                end
         end
       end
 
@@ -928,6 +1114,16 @@ module Elkrb
           control2 = Geometry::Point.new(x: mid_x, y: end_point.y)
         end
 
+        if start_point.x == end_point.x && start_point.y == end_point.y
+          if %w[EAST WEST].include?(source_side)
+            control1.y -= 5.0
+            control2.y += 5.0
+          else
+            control1.x -= 5.0
+            control2.x += 5.0
+          end
+        end
+
         section.bend_points = [control1, control2]
       end
     end