@@ -494,15 +494,6 @@ sline_sline_pos(const SLine *l1, const SLine *l2)
494
494
vector3d_spoint (& p [2 ], & v [1 ][0 ]);
495
495
vector3d_spoint (& p [3 ], & v [1 ][1 ]);
496
496
497
- /* check connected lines */
498
- if (FPgt (il2 -> length , 0.0 ) && (vector3d_eq (& v [0 ][0 ], & v [1 ][0 ]) ||
499
- vector3d_eq (& v [0 ][0 ], & v [1 ][1 ]) ||
500
- vector3d_eq (& v [0 ][1 ], & v [1 ][0 ]) ||
501
- vector3d_eq (& v [0 ][1 ], & v [1 ][1 ])))
502
- {
503
- return PGS_LINE_CONNECT ;
504
- }
505
-
506
497
/* Check, sl2 is at equator */
507
498
if (FPzero (p [2 ].lat ) && FPzero (p [3 ].lat ))
508
499
{
@@ -527,6 +518,15 @@ sline_sline_pos(const SLine *l1, const SLine *l2)
527
518
return PGS_LINE_AVOID ;
528
519
}
529
520
521
+ /* check connected lines */
522
+ if (FPgt (il2 -> length , 0.0 ) && (vector3d_eq (& v [0 ][0 ], & v [1 ][0 ]) ||
523
+ vector3d_eq (& v [0 ][0 ], & v [1 ][1 ]) ||
524
+ vector3d_eq (& v [0 ][1 ], & v [1 ][0 ]) ||
525
+ vector3d_eq (& v [0 ][1 ], & v [1 ][1 ])))
526
+ {
527
+ return PGS_LINE_CONNECT ;
528
+ }
529
+
530
530
/* Now sl2 is not at equator */
531
531
532
532
if (FPle (il2 -> length , seg_length ))
0 commit comments