upd linked-block

Author: olton

lib/metro.js

@@ -32055,19 +32055,42 @@
               break;
           }
         } else {
-          const direction = this._getDirection(parent1, parent2);
-          if (direction === "horizontal") {
-            const controlDistance = Math.abs(dx) * 0.4 + magic;
-            cp1x = x1 + (dx > 0 ? controlDistance : -controlDistance);
-            cp1y = y1;
-            cp2x = x22 - (dx > 0 ? controlDistance : -controlDistance);
-            cp2y = y22;
-          } else {
-            const controlDistance = Math.abs(dy) * 0.4 + magic;
-            cp1x = x1;
-            cp1y = y1 + (dy > 0 ? controlDistance : -controlDistance);
-            cp2x = x22;
-            cp2y = y22 - (dy > 0 ? controlDistance : -controlDistance);
+          const controlDistance = Math.max(60, distance * 0.3);
+          switch (side1) {
+            case "north":
+              cp1x = x1;
+              cp1y = y1 - controlDistance;
+              break;
+            case "south":
+              cp1x = x1;
+              cp1y = y1 + controlDistance;
+              break;
+            case "east":
+              cp1x = x1 + controlDistance;
+              cp1y = y1;
+              break;
+            case "west":
+              cp1x = x1 - controlDistance;
+              cp1y = y1;
+              break;
+          }
+          switch (side2) {
+            case "north":
+              cp2x = x22;
+              cp2y = y22 - controlDistance;
+              break;
+            case "south":
+              cp2x = x22;
+              cp2y = y22 + controlDistance;
+              break;
+            case "east":
+              cp2x = x22 + controlDistance;
+              cp2y = y22;
+              break;
+            case "west":
+              cp2x = x22 - controlDistance;
+              cp2y = y22;
+              break;
           }
         }
         const pathData = `M ${x1} ${y1} C ${cp1x} ${cp1y} ${cp2x} ${cp2y} ${x22} ${y22}`;

lib/metro.js.map

@@ -451,20 +451,63 @@
                 }
             } else {
                 // Стандартна логіка для точок на різних сторонах
-                const direction = this._getDirection(parent1, parent2);
+                // const direction = this._getDirection(parent1, parent2);
+                //
+                // if (direction === "horizontal") {
+                //     const controlDistance = Math.abs(dx) * 0.4 + magic;
+                //     cp1x = x1 + (dx > 0 ? controlDistance : -controlDistance);
+                //     cp1y = y1;
+                //     cp2x = x2 - (dx > 0 ? controlDistance : -controlDistance);
+                //     cp2y = y2;
+                // } else {
+                //     const controlDistance = Math.abs(dy) * 0.4 + magic;
+                //     cp1x = x1;
+                //     cp1y = y1 + (dy > 0 ? controlDistance : -controlDistance);
+                //     cp2x = x2;
+                //     cp2y = y2 - (dy > 0 ? controlDistance : -controlDistance);
+                // }
+
+                const controlDistance = Math.max(60, distance * 0.3);
+
+                // Контрольні точки базуються на сторонах точок, а не на загальному напрямку
+                // Перша контрольна точка (від першої точки)
+                switch (side1) {
+                    case "north":
+                        cp1x = x1;
+                        cp1y = y1 - controlDistance;
+                        break;
+                    case "south":
+                        cp1x = x1;
+                        cp1y = y1 + controlDistance;
+                        break;
+                    case "east":
+                        cp1x = x1 + controlDistance;
+                        cp1y = y1;
+                        break;
+                    case "west":
+                        cp1x = x1 - controlDistance;
+                        cp1y = y1;
+                        break;
+                }
 
-                if (direction === "horizontal") {
-                    const controlDistance = Math.abs(dx) * 0.4 + magic;
-                    cp1x = x1 + (dx > 0 ? controlDistance : -controlDistance);
-                    cp1y = y1;
-                    cp2x = x2 - (dx > 0 ? controlDistance : -controlDistance);
-                    cp2y = y2;
-                } else {
-                    const controlDistance = Math.abs(dy) * 0.4 + magic;
-                    cp1x = x1;
-                    cp1y = y1 + (dy > 0 ? controlDistance : -controlDistance);
-                    cp2x = x2;
-                    cp2y = y2 - (dy > 0 ? controlDistance : -controlDistance);
+                // Друга контрольна точка (до другої точки)
+                switch (side2) {
+                    case "north":
+                        cp2x = x2;
+                        cp2y = y2 - controlDistance;
+                        break;
+                    case "south":
+                        cp2x = x2;
+                        cp2y = y2 + controlDistance;
+                        break;
+                    case "east":
+                        cp2x = x2 + controlDistance;
+                        cp2y = y2;
+                        break;
+                    case "west":
+                        cp2x = x2 - controlDistance;
+                        cp2y = y2;
+                        break;
                 }
             }