Commit7e8a47d

authored

Merge pull request#36 from ggnmstr/spherepoly_check_fix

Fix sline_sline_pos

2 parents651896c +5e7111e commit7e8a47dCopy full SHA for 7e8a47d

File tree

+24

-9

lines changed

+24

-9

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,15 @@ SELECT spoly '{(0d,0d),(10d,10d),(0d,10d),(10d,0d)}';`
`350`	`350`	`ERROR: spherepoly_from_array: a line segment overlaps or polygon too large`
`351`	`351`	`LINE 1: SELECT spoly '{(0d,0d),(10d,10d),(0d,10d),(10d,0d)}';`
`352`	`352`	`^`
	`353`	`+--- degenerate polygons -----`
	`354`	`+SELECT spoly '{(0d,1d),(0d,2d),(0d,3d)}';`
	`355`	`+ERROR: spherepoly_from_array: a line segment overlaps or polygon too large`
	`356`	`+LINE 1: SELECT spoly '{(0d,1d),(0d,2d),(0d,3d)}';`
	`357`	`+ ^`
	`358`	`+SELECT spoly '{(1d,0d),(2d,0d),(3d,0d)}';`
	`359`	`+ERROR: spherepoly_from_array: a line segment overlaps or polygon too large`
	`360`	`+LINE 1: SELECT spoly '{(1d,0d),(2d,0d),(3d,0d)}';`
	`361`	`+ ^`
`353`	`362`	`--- functions`
`354`	`363`	`SELECT npoints( spoly '{(10d,0d),(10d,1d),(15d,0d)}');`
`355`	`364`	`npoints`

Lines changed: 6 additions & 0 deletions

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -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`		`-returnPGS_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`	`returnPGS_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`	`+returnPGS_LINE_CONNECT;`
	`528`	`+}`
	`529`	`+`
`530`	`530`	`/* Now sl2 is not at equator */`
`531`	`531`
`532`	`532`	`if (FPle(il2->length,seg_length))`

Comments

(0)