Skip to content

Commit b6d7eb0

Browse files
committed
fix sline_sline_pos
1 parent 612f06b commit b6d7eb0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Diff for: src/line.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -494,15 +494,6 @@ sline_sline_pos(const SLine *l1, const SLine *l2)
494494
vector3d_spoint(&p[2], &v[1][0]);
495495
vector3d_spoint(&p[3], &v[1][1]);
496496

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-
506497
/* Check, sl2 is at equator */
507498
if (FPzero(p[2].lat) && FPzero(p[3].lat))
508499
{
@@ -527,6 +518,15 @@ sline_sline_pos(const SLine *l1, const SLine *l2)
527518
return PGS_LINE_AVOID;
528519
}
529520

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+
530530
/* Now sl2 is not at equator */
531531

532532
if (FPle(il2->length, seg_length))

0 commit comments

Comments
 (0)