[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-11-g9cac001
git at osgeo.org
git at osgeo.org
Wed Jul 29 03:34:47 PDT 2020
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 9cac001ba8d0f874e96845315f56a0b6a4b6fe87 (commit)
from 510b23dc037e1ea3d225e4632461f374b71e8849 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9cac001ba8d0f874e96845315f56a0b6a4b6fe87
Author: Raúl Marín <git at rmr.ninja>
Date: Wed Jul 29 12:34:20 2020 +0200
Adapt regress tests to match Windows output
References #4660
diff --git a/regress/core/regress_buffer_params.sql b/regress/core/regress_buffer_params.sql
index 9c7291e..a1bbe24 100644
--- a/regress/core/regress_buffer_params.sql
+++ b/regress/core/regress_buffer_params.sql
@@ -5,19 +5,19 @@
-- Ouput is snapped to grid to account for small floating numbers
-- differences between architectures
-SELECT 'point quadsegs=2', ST_AsText(st_buffer('POINT(0 0)', 1, 'quad_segs=2'), 6);
-SELECT 'line quadsegs=2', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2'), 6);
-SELECT 'line quadsegs=2 endcap=flat', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=flat'), 6);
-SELECT 'line quadsegs=2 endcap=butt', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=butt'), 6);
-SELECT 'line quadsegs=2 endcap=square', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=square'), 6);
-SELECT 'line join=mitre mitre_limit=1.0 side=both', ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'join=mitre mitre_limit=1.0 side=both'), 6);
-SELECT 'line side=left',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left'), 6);
-SELECT 'line side=right',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=right'),6);
-SELECT 'line side=left join=mitre',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left join=mitre'),6);
-SELECT 'poly quadsegs=2 join=round', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=round'), 6);
-SELECT 'poly quadsegs=2 join=bevel', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=bevel'), 6);
-SELECT 'poly quadsegs=2 join=mitre', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=mitre'), 6);
-SELECT 'poly quadsegs=2 join=mitre mitre_limit=1', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=mitre mitre_limit=1'), 6);
-SELECT 'poly quadsegs=2 join=miter miter_limit=1', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=miter miter_limit=1'), 6);
-SELECT 'poly boundary rhr side=left', ST_AsText(ST_Buffer(ST_ForceRHR(ST_Boundary('POLYGON ((20 20, 20 40, 40 40, 40 40, 40 20, 20 20))')),10,'join=mitre side=left'),6);
+SELECT 'point quadsegs=2', ST_AsText(st_buffer('POINT(0 0)', 1, 'quad_segs=2'), 5);
+SELECT 'line quadsegs=2', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2'), 5);
+SELECT 'line quadsegs=2 endcap=flat', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=flat'), 5);
+SELECT 'line quadsegs=2 endcap=butt', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=butt'), 5);
+SELECT 'line quadsegs=2 endcap=square', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=square'), 5);
+SELECT 'line join=mitre mitre_limit=1.0 side=both', ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'join=mitre mitre_limit=1.0 side=both'), 5);
+SELECT 'line side=left',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left'), 5);
+SELECT 'line side=right',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=right'),5);
+SELECT 'line side=left join=mitre',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left join=mitre'),5);
+SELECT 'poly quadsegs=2 join=round', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=round'), 5);
+SELECT 'poly quadsegs=2 join=bevel', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=bevel'), 5);
+SELECT 'poly quadsegs=2 join=mitre', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=mitre'), 5);
+SELECT 'poly quadsegs=2 join=mitre mitre_limit=1', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=mitre mitre_limit=1'), 5);
+SELECT 'poly quadsegs=2 join=miter miter_limit=1', ST_AsText(st_buffer('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', 2, 'quad_segs=2 join=miter miter_limit=1'), 5);
+SELECT 'poly boundary rhr side=left', ST_AsText(ST_Buffer(ST_ForceRHR(ST_Boundary('POLYGON ((20 20, 20 40, 40 40, 40 40, 40 20, 20 20))')),10,'join=mitre side=left'),5);
diff --git a/regress/core/regress_buffer_params_expected b/regress/core/regress_buffer_params_expected
index 44dcf22..27c1e9f 100644
--- a/regress/core/regress_buffer_params_expected
+++ b/regress/core/regress_buffer_params_expected
@@ -1,15 +1,15 @@
-point quadsegs=2|POLYGON((1 0,0.707107 -0.707107,1.615545e-15 -1,-0.707107 -0.707107,-1 -3.231089e-15,-0.707107 0.707107,-4.624589e-15 1,0.707107 0.707107,1 0))
-line quadsegs=2|POLYGON((10 2,11.414214 1.414214,12 0,11.414214 -1.414214,10 -2,0 -2,-1.414214 -1.414214,-2 2.449294e-16,-1.414214 1.414214,0 2,10 2))
+point quadsegs=2|POLYGON((1 0,0.70711 -0.70711,1.61554e-15 -1,-0.70711 -0.70711,-1 -3.23109e-15,-0.70711 0.70711,-4.62459e-15 1,0.70711 0.70711,1 0))
+line quadsegs=2|POLYGON((10 2,11.41421 1.41421,12 0,11.41421 -1.41421,10 -2,0 -2,-1.41421 -1.41421,-2 2.44929e-16,-1.41421 1.41421,0 2,10 2))
line quadsegs=2 endcap=flat|POLYGON((10 2,10 -2,0 -2,0 2,10 2))
line quadsegs=2 endcap=butt|POLYGON((10 2,10 -2,0 -2,0 2,10 2))
line quadsegs=2 endcap=square|POLYGON((10 2,12 2,12 -2,0 -2,-2 -2,-2 2,10 2))
-line join=mitre mitre_limit=1.0 side=both|POLYGON((148.123573 161.601164,159.530096 156.876427,160 50,159.807853 48.049097,159.238795 46.173166,158.314696 44.444298,157.071068 42.928932,155.555702 41.685304,153.826834 40.761205,151.950903 40.192147,150 40,148.049097 40.192147,146.173166 40.761205,144.444298 41.685304,142.928932 42.928932,141.685304 44.444298,140.761205 46.173166,140.192147 48.049097,140 50,140 125.857864,57.071068 42.928932,55.555702 41.685304,53.826834 40.761205,51.950903 40.192147,50 40,48.049097 40.192147,46.173166 40.761205,44.444298 41.685304,42.928932 42.928932,41.685304 44.444298,40.761205 46.173166,40.192147 48.049097,40 50,40.192147 51.950903,40.761205 53.826834,41.685304 55.555702,42.928932 57.071068,148.123573 161.601164))
-line side=left|POLYGON((150 50,150 150,50 50,42.928932 57.071068,142.928932 157.071068,144.444298 158.314696,146.173166 159.238795,148.049097 159.807853,150 160,151.950903 159.807853,153.826834 159.238795,155.555702 158.314696,157.071068 157.071068,158.314696 155.555702,159.238795 153.826834,159.807853 151.950903,160 150,160 50,150 50))
-line side=right|POLYGON((50 50,150 150,150 50,140 50,140 125.857864,57.071068 42.928932,50 50))
-line side=left join=mitre|POLYGON((150 50,150 150,50 50,42.928932 57.071068,160 174.142136,160 50,150 50))
-poly quadsegs=2 join=round|POLYGON((-2 0,-2 10,-1.414214 11.414214,0 12,10 12,11.414214 11.414214,12 10,12 0,11.414214 -1.414214,10 -2,0 -2,-1.414214 -1.414214,-2 0))
+line join=mitre mitre_limit=1.0 side=both|POLYGON((148.12357 161.60116,159.5301 156.87643,160 50,159.80785 48.0491,159.2388 46.17317,158.3147 44.4443,157.07107 42.92893,155.5557 41.6853,153.82683 40.7612,151.9509 40.19215,150 40,148.0491 40.19215,146.17317 40.7612,144.4443 41.6853,142.92893 42.92893,141.6853 44.4443,140.7612 46.17317,140.19215 48.0491,140 50,140 125.85786,57.07107 42.92893,55.5557 41.6853,53.82683 40.7612,51.9509 40.19215,50 40,48.0491 40.19215,46.17317 40.7612,44.4443 41.6853,42.92893 42.92893,41.6853 44.4443,40.7612 46.17317,40.19215 48.0491,40 50,40.19215 51.9509,40.7612 53.82683,41.6853 55.5557,42.92893 57.07107,148.12357 161.60116))
+line side=left|POLYGON((150 50,150 150,50 50,42.92893 57.07107,142.92893 157.07107,144.4443 158.3147,146.17317 159.2388,148.0491 159.80785,150 160,151.9509 159.80785,153.82683 159.2388,155.5557 158.3147,157.07107 157.07107,158.3147 155.5557,159.2388 153.82683,159.80785 151.9509,160 150,160 50,150 50))
+line side=right|POLYGON((50 50,150 150,150 50,140 50,140 125.85786,57.07107 42.92893,50 50))
+line side=left join=mitre|POLYGON((150 50,150 150,50 50,42.92893 57.07107,160 174.14214,160 50,150 50))
+poly quadsegs=2 join=round|POLYGON((-2 0,-2 10,-1.41421 11.41421,0 12,10 12,11.41421 11.41421,12 10,12 0,11.41421 -1.41421,10 -2,0 -2,-1.41421 -1.41421,-2 0))
poly quadsegs=2 join=bevel|POLYGON((-2 0,-2 10,0 12,10 12,12 10,12 0,10 -2,0 -2,-2 0))
poly quadsegs=2 join=mitre|POLYGON((-2 -2,-2 12,12 12,12 -2,-2 -2))
-poly quadsegs=2 join=mitre mitre_limit=1|POLYGON((-1.828427 -1,-1.828427 11,-1 11.828427,11 11.828427,11.828427 11,11.828427 -1,11 -1.828427,-1 -1.828427,-1.828427 -1))
-poly quadsegs=2 join=miter miter_limit=1|POLYGON((-1.828427 -1,-1.828427 11,-1 11.828427,11 11.828427,11.828427 11,11.828427 -1,11 -1.828427,-1 -1.828427,-1.828427 -1))
+poly quadsegs=2 join=mitre mitre_limit=1|POLYGON((-1.82843 -1,-1.82843 11,-1 11.82843,11 11.82843,11.82843 11,11.82843 -1,11 -1.82843,-1 -1.82843,-1.82843 -1))
+poly quadsegs=2 join=miter miter_limit=1|POLYGON((-1.82843 -1,-1.82843 11,-1 11.82843,11 11.82843,11.82843 11,11.82843 -1,11 -1.82843,-1 -1.82843,-1.82843 -1))
poly boundary rhr side=left|POLYGON((20 20,10 20,10 50,50 50,50 10,20 10,20 20),(20 20,40 20,40 40,20 40,20 20))
diff --git a/regress/core/sql-mm-circularstring.sql b/regress/core/sql-mm-circularstring.sql
index d81ccb5..9898c16 100644
--- a/regress/core/sql-mm-circularstring.sql
+++ b/regress/core/sql-mm-circularstring.sql
@@ -178,20 +178,20 @@ SELECT 'asewkb02', encode(ST_AsEWKB(the_geom_3dm, 'xdr'), 'hex') FROM public.cir
SELECT 'asewkb03', encode(ST_AsEWKB(the_geom_3dz, 'ndr'), 'hex') FROM public.circularstring;
SELECT 'asewkb04', encode(ST_AsEWKB(the_geom_4d, 'xdr'), 'hex') FROM public.circularstring;
-SELECT 'ST_CurveToLine-201', ST_AsText(ST_CurveToLine(the_geom_2d, 2), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine-202', ST_AsText(ST_CurveToLine(the_geom_3dm, 2), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine-203', ST_AsText(ST_CurveToLine(the_geom_3dz, 2), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine-204', ST_AsText(ST_CurveToLine(the_geom_4d, 2), 8) FROM public.circularstring;
-
-SELECT 'ST_CurveToLine-401', ST_AsText(ST_CurveToLine(the_geom_2d, 4), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine-402', ST_AsText(ST_CurveToLine(the_geom_3dm, 4), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine-403', ST_AsText(ST_CurveToLine(the_geom_3dz, 4), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine-404', ST_AsText(ST_CurveToLine(the_geom_4d, 4), 8) FROM public.circularstring;
-
-SELECT 'ST_CurveToLine01', ST_AsText(ST_CurveToLine(the_geom_2d), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine02', ST_AsText(ST_CurveToLine(the_geom_3dm), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine03', ST_AsText(ST_CurveToLine(the_geom_3dz), 8) FROM public.circularstring;
-SELECT 'ST_CurveToLine04', ST_AsText(ST_CurveToLine(the_geom_4d), 8) FROM public.circularstring;
+SELECT 'ST_CurveToLine-201', ST_AsText(ST_CurveToLine(the_geom_2d, 2), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine-202', ST_AsText(ST_CurveToLine(the_geom_3dm, 2), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine-203', ST_AsText(ST_CurveToLine(the_geom_3dz, 2), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine-204', ST_AsText(ST_CurveToLine(the_geom_4d, 2), 3) FROM public.circularstring;
+
+SELECT 'ST_CurveToLine-401', ST_AsText(ST_CurveToLine(the_geom_2d, 4), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine-402', ST_AsText(ST_CurveToLine(the_geom_3dm, 4), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine-403', ST_AsText(ST_CurveToLine(the_geom_3dz, 4), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine-404', ST_AsText(ST_CurveToLine(the_geom_4d, 4), 3) FROM public.circularstring;
+
+SELECT 'ST_CurveToLine01', ST_AsText(ST_CurveToLine(the_geom_2d), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine02', ST_AsText(ST_CurveToLine(the_geom_3dm), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine03', ST_AsText(ST_CurveToLine(the_geom_3dz), 3) FROM public.circularstring;
+SELECT 'ST_CurveToLine04', ST_AsText(ST_CurveToLine(the_geom_4d), 3) FROM public.circularstring;
-- TODO: ST_SnapToGrid is required to remove platform dependent precision
-- issues. Until ST_SnapToGrid is updated to work against curves, these
diff --git a/regress/core/sql-mm-circularstring_expected b/regress/core/sql-mm-circularstring_expected
index e42fe2e..5a31f78 100644
--- a/regress/core/sql-mm-circularstring_expected
+++ b/regress/core/sql-mm-circularstring_expected
@@ -44,30 +44,30 @@ asewkb03|01080000800300000000000000000000000000000000000000000000000000000056cd9
asewkb03|01080000800500000000000000000014c00000000000000000000000000000000000000000000000000000000000001440000000000000f03f000000000000144000000000000000000000000000000040000000000000244000000000000014c000000000000008400000000000002e4000000000000000000000000000001040
asewkb04|00c00000080000000300000000000000000000000000000000000000000000000000000000000000003fd126145e9ecd563ff00000000000004008000000000000c0000000000000003fe2bec3330188673ff6a09e667f3bcd3ff00000000000004000000000000000
asewkb04|00c000000800000005c014000000000000000000000000000000000000000000004010000000000000000000000000000040140000000000003ff0000000000000400800000000000040140000000000000000000000000000400000000000000040000000000000004024000000000000c01400000000000040080000000000003ff0000000000000402e000000000000000000000000000040100000000000000000000000000000
-ST_CurveToLine-201|LINESTRING(0 0,0.15224093 0.76536686,0.58578644 1.41421356)
-ST_CurveToLine-201|LINESTRING(-5 0,-3.53553391 3.53553391,3.061617e-16 5,3.53553391 3.53553391,5 0,6.46446609 -3.53553391,10 -5,13.53553391 -3.53553391,15 0)
-ST_CurveToLine-202|LINESTRING M (0 0 0,0.15224093 0.76536686 -1.5,0.58578644 1.41421356 2)
-ST_CurveToLine-202|LINESTRING M (-5 0 4,-3.53553391 3.53553391 3.5,3.061617e-16 5 3,3.53553391 3.53553391 2.5,5 0 2,6.46446609 -3.53553391 1.5,10 -5 1,13.53553391 -3.53553391 0.5,15 0 0)
-ST_CurveToLine-203|LINESTRING Z (0 0 0,0.15224093 0.76536686 2.25,0.58578644 1.41421356 1)
-ST_CurveToLine-203|LINESTRING Z (-5 0 0,-3.53553391 3.53553391 0.5,3.061617e-16 5 1,3.53553391 3.53553391 1.5,5 0 2,6.46446609 -3.53553391 2.5,10 -5 3,13.53553391 -3.53553391 3.5,15 0 4)
-ST_CurveToLine-204|LINESTRING ZM (0 0 0 0,0.15224093 0.76536686 2.25 -1.5,0.58578644 1.41421356 1 2)
-ST_CurveToLine-204|LINESTRING ZM (-5 0 0 4,-3.53553391 3.53553391 0.5 3.5,3.061617e-16 5 1 3,3.53553391 3.53553391 1.5 2.5,5 0 2 2,6.46446609 -3.53553391 2.5 1.5,10 -5 3 1,13.53553391 -3.53553391 3.5 0.5,15 0 4 0)
-ST_CurveToLine-401|LINESTRING(0 0,0.15224093 0.76536686,0.58578644 1.41421356)
-ST_CurveToLine-401|LINESTRING(-5 0,-4.61939766 1.91341716,-3.53553391 3.53553391,-1.91341716 4.61939766,3.061617e-16 5,1.91341716 4.61939766,3.53553391 3.53553391,4.61939766 1.91341716,5 0,5.38060234 -1.91341716,6.46446609 -3.53553391,8.08658284 -4.61939766,10 -5,11.91341716 -4.61939766,13.53553391 -3.53553391,14.61939766 -1.91341716,15 0)
-ST_CurveToLine-402|LINESTRING M (0 0 0,0.15224093 0.76536686 -1.5,0.58578644 1.41421356 2)
-ST_CurveToLine-402|LINESTRING M (-5 0 4,-4.61939766 1.91341716 3.75,-3.53553391 3.53553391 3.5,-1.91341716 4.61939766 3.25,3.061617e-16 5 3,1.91341716 4.61939766 2.75,3.53553391 3.53553391 2.5,4.61939766 1.91341716 2.25,5 0 2,5.38060234 -1.91341716 1.75,6.46446609 -3.53553391 1.5,8.08658284 -4.61939766 1.25,10 -5 1,11.91341716 -4.61939766 0.75,13.53553391 -3.53553391 0.5,14.61939766 -1.91341716 0.25,15 0 0)
-ST_CurveToLine-403|LINESTRING Z (0 0 0,0.15224093 0.76536686 2.25,0.58578644 1.41421356 1)
-ST_CurveToLine-403|LINESTRING Z (-5 0 0,-4.61939766 1.91341716 0.25,-3.53553391 3.53553391 0.5,-1.91341716 4.61939766 0.75,3.061617e-16 5 1,1.91341716 4.61939766 1.25,3.53553391 3.53553391 1.5,4.61939766 1.91341716 1.75,5 0 2,5.38060234 -1.91341716 2.25,6.46446609 -3.53553391 2.5,8.08658284 -4.61939766 2.75,10 -5 3,11.91341716 -4.61939766 3.25,13.53553391 -3.53553391 3.5,14.61939766 -1.91341716 3.75,15 0 4)
-ST_CurveToLine-404|LINESTRING ZM (0 0 0 0,0.15224093 0.76536686 2.25 -1.5,0.58578644 1.41421356 1 2)
-ST_CurveToLine-404|LINESTRING ZM (-5 0 0 4,-4.61939766 1.91341716 0.25 3.75,-3.53553391 3.53553391 0.5 3.5,-1.91341716 4.61939766 0.75 3.25,3.061617e-16 5 1 3,1.91341716 4.61939766 1.25 2.75,3.53553391 3.53553391 1.5 2.5,4.61939766 1.91341716 1.75 2.25,5 0 2 2,5.38060234 -1.91341716 2.25 1.75,6.46446609 -3.53553391 2.5 1.5,8.08658284 -4.61939766 2.75 1.25,10 -5 3 1,11.91341716 -4.61939766 3.25 0.75,13.53553391 -3.53553391 3.5 0.5,14.61939766 -1.91341716 3.75 0.25,15 0 4 0)
-ST_CurveToLine01|LINESTRING(0 0,0.00240909 0.09813535,0.00963055 0.19603428,0.02164698 0.29346095,0.03842944 0.39018064,0.05993749 0.48596036,0.08611933 0.58056935,0.11691187 0.67377971,0.15224093 0.76536686,0.19202141 0.85511019,0.23615747 0.94279347,0.28454278 1.02820549,0.33706078 1.11114047,0.39358494 1.19139861,0.45397909 1.26878657,0.51809775 1.34311791,0.58578644 1.41421356)
-ST_CurveToLine01|LINESTRING(-5 0,-4.99397728 0.24533837,-4.97592363 0.4900857,-4.94588255 0.73365237,-4.9039264 0.97545161,-4.85015627 1.2149009,-4.78470168 1.45142339,-4.70772033 1.68444927,-4.61939766 1.91341716,-4.51994647 2.13777547,-4.40960632 2.35698368,-4.28864305 2.57051372,-4.15734806 2.77785117,-4.01603766 2.97849652,-3.86505227 3.17196642,-3.70475563 3.35779477,-3.53553391 3.53553391,-3.35779477 3.70475563,-3.17196642 3.86505227,-2.97849652 4.01603766,-2.77785117 4.15734806,-2.57051372 4.28864305,-2.35698368 4.40960632,-2.13777547 4.51994647,-1.91341716 4.61939766,-1.68444927 4.70772033,-1.45142339 4.78470168,-1.2149009 4.85015627,-0.97545161 4.9039264,-0.73365237 4.94588255,-0.4900857 4.97592363,-0.24533837 4.99397728,3.061617e-16 5,0.24533837 4.99397728,0.4900857 4.97592363,0.73365237 4.94588255,0.97545161 4.9039264,1.2149009 4.85015627,1.45142339 4.78470168,1.68444927 4.70772033,1.91341716 4.61939766,2.13777547 4.51994647,2.35698368 4.40960632,2.57051372 4.28864305,2.7
7785117 4.15734806,2.97849652 4.01603766,3.17196642 3.86505227,3.35779477 3.70475563,3.53553391 3.53553391,3.70475563 3.35779477,3.86505227 3.17196642,4.01603766 2.97849652,4.15734806 2.77785117,4.28864305 2.57051372,4.40960632 2.35698368,4.51994647 2.13777547,4.61939766 1.91341716,4.70772033 1.68444927,4.78470168 1.45142339,4.85015627 1.2149009,4.9039264 0.97545161,4.94588255 0.73365237,4.97592363 0.4900857,4.99397728 0.24533837,5 0,5.00602272 -0.24533837,5.02407637 -0.4900857,5.05411745 -0.73365237,5.0960736 -0.97545161,5.14984373 -1.2149009,5.21529832 -1.45142339,5.29227967 -1.68444927,5.38060234 -1.91341716,5.48005353 -2.13777547,5.59039368 -2.35698368,5.71135695 -2.57051372,5.84265194 -2.77785117,5.98396234 -2.97849652,6.13494773 -3.17196642,6.29524437 -3.35779477,6.46446609 -3.53553391,6.64220523 -3.70475563,6.82803358 -3.86505227,7.02150348 -4.01603766,7.22214883 -4.15734806,7.42948628 -4.28864305,7.64301632 -4.40960632,7.86222453 -4.51994647,8.08658284 -4.61939766,8.31555073
-4.70772033,8.54857661 -4.78470168,8.7850991 -4.85015627,9.02454839 -4.9039264,9.26634763 -4.94588255,9.5099143 -4.97592363,9.75466163 -4.99397728,10 -5,10.24533837 -4.99397728,10.4900857 -4.97592363,10.73365237 -4.94588255,10.97545161 -4.9039264,11.2149009 -4.85015627,11.45142339 -4.78470168,11.68444927 -4.70772033,11.91341716 -4.61939766,12.13777547 -4.51994647,12.35698368 -4.40960632,12.57051372 -4.28864305,12.77785117 -4.15734806,12.97849652 -4.01603766,13.17196642 -3.86505227,13.35779477 -3.70475563,13.53553391 -3.53553391,13.70475563 -3.35779477,13.86505227 -3.17196642,14.01603766 -2.97849652,14.15734806 -2.77785117,14.28864305 -2.57051372,14.40960632 -2.35698368,14.51994647 -2.13777547,14.61939766 -1.91341716,14.70772033 -1.68444927,14.78470168 -1.45142339,14.85015627 -1.2149009,14.9039264 -0.97545161,14.94588255 -0.73365237,14.97592363 -0.4900857,14.99397728 -0.24533837,15 0)
-ST_CurveToLine02|LINESTRING M (0 0 0,0.00240909 0.09813535 -0.1875,0.00963055 0.19603428 -0.375,0.02164698 0.29346095 -0.5625,0.03842944 0.39018064 -0.75,0.05993749 0.48596036 -0.9375,0.08611933 0.58056935 -1.125,0.11691187 0.67377971 -1.3125,0.15224093 0.76536686 -1.5,0.19202141 0.85511019 -1.6875,0.23615747 0.94279347 -1.875,0.28454278 1.02820549 -1.75,0.33706078 1.11114047 -1,0.39358494 1.19139861 -0.25,0.45397909 1.26878657 0.5,0.51809775 1.34311791 1.25,0.58578644 1.41421356 2)
-ST_CurveToLine02|LINESTRING M (-5 0 4,-4.99397728 0.24533837 3.96875,-4.97592363 0.4900857 3.9375,-4.94588255 0.73365237 3.90625,-4.9039264 0.97545161 3.875,-4.85015627 1.2149009 3.84375,-4.78470168 1.45142339 3.8125,-4.70772033 1.68444927 3.78125,-4.61939766 1.91341716 3.75,-4.51994647 2.13777547 3.71875,-4.40960632 2.35698368 3.6875,-4.28864305 2.57051372 3.65625,-4.15734806 2.77785117 3.625,-4.01603766 2.97849652 3.59375,-3.86505227 3.17196642 3.5625,-3.70475563 3.35779477 3.53125,-3.53553391 3.53553391 3.5,-3.35779477 3.70475563 3.46875,-3.17196642 3.86505227 3.4375,-2.97849652 4.01603766 3.40625,-2.77785117 4.15734806 3.375,-2.57051372 4.28864305 3.34375,-2.35698368 4.40960632 3.3125,-2.13777547 4.51994647 3.28125,-1.91341716 4.61939766 3.25,-1.68444927 4.70772033 3.21875,-1.45142339 4.78470168 3.1875,-1.2149009 4.85015627 3.15625,-0.97545161 4.9039264 3.125,-0.73365237 4.94588255 3.09375,-0.4900857 4.97592363 3.0625,-0.24533837 4.99397728 3.03125,3.061617e-16 5 3,0.24533837 4.
99397728 2.96875,0.4900857 4.97592363 2.9375,0.73365237 4.94588255 2.90625,0.97545161 4.9039264 2.875,1.2149009 4.85015627 2.84375,1.45142339 4.78470168 2.8125,1.68444927 4.70772033 2.78125,1.91341716 4.61939766 2.75,2.13777547 4.51994647 2.71875,2.35698368 4.40960632 2.6875,2.57051372 4.28864305 2.65625,2.77785117 4.15734806 2.625,2.97849652 4.01603766 2.59375,3.17196642 3.86505227 2.5625,3.35779477 3.70475563 2.53125,3.53553391 3.53553391 2.5,3.70475563 3.35779477 2.46875,3.86505227 3.17196642 2.4375,4.01603766 2.97849652 2.40625,4.15734806 2.77785117 2.375,4.28864305 2.57051372 2.34375,4.40960632 2.35698368 2.3125,4.51994647 2.13777547 2.28125,4.61939766 1.91341716 2.25,4.70772033 1.68444927 2.21875,4.78470168 1.45142339 2.1875,4.85015627 1.2149009 2.15625,4.9039264 0.97545161 2.125,4.94588255 0.73365237 2.09375,4.97592363 0.4900857 2.0625,4.99397728 0.24533837 2.03125,5 0 2,5.00602272 -0.24533837 1.96875,5.02407637 -0.4900857 1.9375,5.05411745 -0.73365237 1.90625,5.0960736 -0.97
545161 1.875,5.14984373 -1.2149009 1.84375,5.21529832 -1.45142339 1.8125,5.29227967 -1.68444927 1.78125,5.38060234 -1.91341716 1.75,5.48005353 -2.13777547 1.71875,5.59039368 -2.35698368 1.6875,5.71135695 -2.57051372 1.65625,5.84265194 -2.77785117 1.625,5.98396234 -2.97849652 1.59375,6.13494773 -3.17196642 1.5625,6.29524437 -3.35779477 1.53125,6.46446609 -3.53553391 1.5,6.64220523 -3.70475563 1.46875,6.82803358 -3.86505227 1.4375,7.02150348 -4.01603766 1.40625,7.22214883 -4.15734806 1.375,7.42948628 -4.28864305 1.34375,7.64301632 -4.40960632 1.3125,7.86222453 -4.51994647 1.28125,8.08658284 -4.61939766 1.25,8.31555073 -4.70772033 1.21875,8.54857661 -4.78470168 1.1875,8.7850991 -4.85015627 1.15625,9.02454839 -4.9039264 1.125,9.26634763 -4.94588255 1.09375,9.5099143 -4.97592363 1.0625,9.75466163 -4.99397728 1.03125,10 -5 1,10.24533837 -4.99397728 0.96875,10.4900857 -4.97592363 0.9375,10.73365237 -4.94588255 0.90625,10.97545161 -4.9039264 0.875,11.2149009 -4.85015627 0.84375,11.45142339
-4.78470168 0.8125,11.68444927 -4.70772033 0.78125,11.91341716 -4.61939766 0.75,12.13777547 -4.51994647 0.71875,12.35698368 -4.40960632 0.6875,12.57051372 -4.28864305 0.65625,12.77785117 -4.15734806 0.625,12.97849652 -4.01603766 0.59375,13.17196642 -3.86505227 0.5625,13.35779477 -3.70475563 0.53125,13.53553391 -3.53553391 0.5,13.70475563 -3.35779477 0.46875,13.86505227 -3.17196642 0.4375,14.01603766 -2.97849652 0.40625,14.15734806 -2.77785117 0.375,14.28864305 -2.57051372 0.34375,14.40960632 -2.35698368 0.3125,14.51994647 -2.13777547 0.28125,14.61939766 -1.91341716 0.25,14.70772033 -1.68444927 0.21875,14.78470168 -1.45142339 0.1875,14.85015627 -1.2149009 0.15625,14.9039264 -0.97545161 0.125,14.94588255 -0.73365237 0.09375,14.97592363 -0.4900857 0.0625,14.99397728 -0.24533837 0.03125,15 0 0)
-ST_CurveToLine03|LINESTRING Z (0 0 0,0.00240909 0.09813535 0.28125,0.00963055 0.19603428 0.5625,0.02164698 0.29346095 0.84375,0.03842944 0.39018064 1.125,0.05993749 0.48596036 1.40625,0.08611933 0.58056935 1.6875,0.11691187 0.67377971 1.96875,0.15224093 0.76536686 2.25,0.19202141 0.85511019 2.53125,0.23615747 0.94279347 2.8125,0.28454278 1.02820549 2.875,0.33706078 1.11114047 2.5,0.39358494 1.19139861 2.125,0.45397909 1.26878657 1.75,0.51809775 1.34311791 1.375,0.58578644 1.41421356 1)
-ST_CurveToLine03|LINESTRING Z (-5 0 0,-4.99397728 0.24533837 0.03125,-4.97592363 0.4900857 0.0625,-4.94588255 0.73365237 0.09375,-4.9039264 0.97545161 0.125,-4.85015627 1.2149009 0.15625,-4.78470168 1.45142339 0.1875,-4.70772033 1.68444927 0.21875,-4.61939766 1.91341716 0.25,-4.51994647 2.13777547 0.28125,-4.40960632 2.35698368 0.3125,-4.28864305 2.57051372 0.34375,-4.15734806 2.77785117 0.375,-4.01603766 2.97849652 0.40625,-3.86505227 3.17196642 0.4375,-3.70475563 3.35779477 0.46875,-3.53553391 3.53553391 0.5,-3.35779477 3.70475563 0.53125,-3.17196642 3.86505227 0.5625,-2.97849652 4.01603766 0.59375,-2.77785117 4.15734806 0.625,-2.57051372 4.28864305 0.65625,-2.35698368 4.40960632 0.6875,-2.13777547 4.51994647 0.71875,-1.91341716 4.61939766 0.75,-1.68444927 4.70772033 0.78125,-1.45142339 4.78470168 0.8125,-1.2149009 4.85015627 0.84375,-0.97545161 4.9039264 0.875,-0.73365237 4.94588255 0.90625,-0.4900857 4.97592363 0.9375,-0.24533837 4.99397728 0.96875,3.061617e-16 5 1,0.24533837 4.
99397728 1.03125,0.4900857 4.97592363 1.0625,0.73365237 4.94588255 1.09375,0.97545161 4.9039264 1.125,1.2149009 4.85015627 1.15625,1.45142339 4.78470168 1.1875,1.68444927 4.70772033 1.21875,1.91341716 4.61939766 1.25,2.13777547 4.51994647 1.28125,2.35698368 4.40960632 1.3125,2.57051372 4.28864305 1.34375,2.77785117 4.15734806 1.375,2.97849652 4.01603766 1.40625,3.17196642 3.86505227 1.4375,3.35779477 3.70475563 1.46875,3.53553391 3.53553391 1.5,3.70475563 3.35779477 1.53125,3.86505227 3.17196642 1.5625,4.01603766 2.97849652 1.59375,4.15734806 2.77785117 1.625,4.28864305 2.57051372 1.65625,4.40960632 2.35698368 1.6875,4.51994647 2.13777547 1.71875,4.61939766 1.91341716 1.75,4.70772033 1.68444927 1.78125,4.78470168 1.45142339 1.8125,4.85015627 1.2149009 1.84375,4.9039264 0.97545161 1.875,4.94588255 0.73365237 1.90625,4.97592363 0.4900857 1.9375,4.99397728 0.24533837 1.96875,5 0 2,5.00602272 -0.24533837 2.03125,5.02407637 -0.4900857 2.0625,5.05411745 -0.73365237 2.09375,5.0960736 -0.97
545161 2.125,5.14984373 -1.2149009 2.15625,5.21529832 -1.45142339 2.1875,5.29227967 -1.68444927 2.21875,5.38060234 -1.91341716 2.25,5.48005353 -2.13777547 2.28125,5.59039368 -2.35698368 2.3125,5.71135695 -2.57051372 2.34375,5.84265194 -2.77785117 2.375,5.98396234 -2.97849652 2.40625,6.13494773 -3.17196642 2.4375,6.29524437 -3.35779477 2.46875,6.46446609 -3.53553391 2.5,6.64220523 -3.70475563 2.53125,6.82803358 -3.86505227 2.5625,7.02150348 -4.01603766 2.59375,7.22214883 -4.15734806 2.625,7.42948628 -4.28864305 2.65625,7.64301632 -4.40960632 2.6875,7.86222453 -4.51994647 2.71875,8.08658284 -4.61939766 2.75,8.31555073 -4.70772033 2.78125,8.54857661 -4.78470168 2.8125,8.7850991 -4.85015627 2.84375,9.02454839 -4.9039264 2.875,9.26634763 -4.94588255 2.90625,9.5099143 -4.97592363 2.9375,9.75466163 -4.99397728 2.96875,10 -5 3,10.24533837 -4.99397728 3.03125,10.4900857 -4.97592363 3.0625,10.73365237 -4.94588255 3.09375,10.97545161 -4.9039264 3.125,11.2149009 -4.85015627 3.15625,11.45142339
-4.78470168 3.1875,11.68444927 -4.70772033 3.21875,11.91341716 -4.61939766 3.25,12.13777547 -4.51994647 3.28125,12.35698368 -4.40960632 3.3125,12.57051372 -4.28864305 3.34375,12.77785117 -4.15734806 3.375,12.97849652 -4.01603766 3.40625,13.17196642 -3.86505227 3.4375,13.35779477 -3.70475563 3.46875,13.53553391 -3.53553391 3.5,13.70475563 -3.35779477 3.53125,13.86505227 -3.17196642 3.5625,14.01603766 -2.97849652 3.59375,14.15734806 -2.77785117 3.625,14.28864305 -2.57051372 3.65625,14.40960632 -2.35698368 3.6875,14.51994647 -2.13777547 3.71875,14.61939766 -1.91341716 3.75,14.70772033 -1.68444927 3.78125,14.78470168 -1.45142339 3.8125,14.85015627 -1.2149009 3.84375,14.9039264 -0.97545161 3.875,14.94588255 -0.73365237 3.90625,14.97592363 -0.4900857 3.9375,14.99397728 -0.24533837 3.96875,15 0 4)
-ST_CurveToLine04|LINESTRING ZM (0 0 0 0,0.00240909 0.09813535 0.28125 -0.1875,0.00963055 0.19603428 0.5625 -0.375,0.02164698 0.29346095 0.84375 -0.5625,0.03842944 0.39018064 1.125 -0.75,0.05993749 0.48596036 1.40625 -0.9375,0.08611933 0.58056935 1.6875 -1.125,0.11691187 0.67377971 1.96875 -1.3125,0.15224093 0.76536686 2.25 -1.5,0.19202141 0.85511019 2.53125 -1.6875,0.23615747 0.94279347 2.8125 -1.875,0.28454278 1.02820549 2.875 -1.75,0.33706078 1.11114047 2.5 -1,0.39358494 1.19139861 2.125 -0.25,0.45397909 1.26878657 1.75 0.5,0.51809775 1.34311791 1.375 1.25,0.58578644 1.41421356 1 2)
-ST_CurveToLine04|LINESTRING ZM (-5 0 0 4,-4.99397728 0.24533837 0.03125 3.96875,-4.97592363 0.4900857 0.0625 3.9375,-4.94588255 0.73365237 0.09375 3.90625,-4.9039264 0.97545161 0.125 3.875,-4.85015627 1.2149009 0.15625 3.84375,-4.78470168 1.45142339 0.1875 3.8125,-4.70772033 1.68444927 0.21875 3.78125,-4.61939766 1.91341716 0.25 3.75,-4.51994647 2.13777547 0.28125 3.71875,-4.40960632 2.35698368 0.3125 3.6875,-4.28864305 2.57051372 0.34375 3.65625,-4.15734806 2.77785117 0.375 3.625,-4.01603766 2.97849652 0.40625 3.59375,-3.86505227 3.17196642 0.4375 3.5625,-3.70475563 3.35779477 0.46875 3.53125,-3.53553391 3.53553391 0.5 3.5,-3.35779477 3.70475563 0.53125 3.46875,-3.17196642 3.86505227 0.5625 3.4375,-2.97849652 4.01603766 0.59375 3.40625,-2.77785117 4.15734806 0.625 3.375,-2.57051372 4.28864305 0.65625 3.34375,-2.35698368 4.40960632 0.6875 3.3125,-2.13777547 4.51994647 0.71875 3.28125,-1.91341716 4.61939766 0.75 3.25,-1.68444927 4.70772033 0.78125 3.21875,-1.45142339 4.78470168 0.812
5 3.1875,-1.2149009 4.85015627 0.84375 3.15625,-0.97545161 4.9039264 0.875 3.125,-0.73365237 4.94588255 0.90625 3.09375,-0.4900857 4.97592363 0.9375 3.0625,-0.24533837 4.99397728 0.96875 3.03125,3.061617e-16 5 1 3,0.24533837 4.99397728 1.03125 2.96875,0.4900857 4.97592363 1.0625 2.9375,0.73365237 4.94588255 1.09375 2.90625,0.97545161 4.9039264 1.125 2.875,1.2149009 4.85015627 1.15625 2.84375,1.45142339 4.78470168 1.1875 2.8125,1.68444927 4.70772033 1.21875 2.78125,1.91341716 4.61939766 1.25 2.75,2.13777547 4.51994647 1.28125 2.71875,2.35698368 4.40960632 1.3125 2.6875,2.57051372 4.28864305 1.34375 2.65625,2.77785117 4.15734806 1.375 2.625,2.97849652 4.01603766 1.40625 2.59375,3.17196642 3.86505227 1.4375 2.5625,3.35779477 3.70475563 1.46875 2.53125,3.53553391 3.53553391 1.5 2.5,3.70475563 3.35779477 1.53125 2.46875,3.86505227 3.17196642 1.5625 2.4375,4.01603766 2.97849652 1.59375 2.40625,4.15734806 2.77785117 1.625 2.375,4.28864305 2.57051372 1.65625 2.34375,4.40960632 2.35698368 1.
6875 2.3125,4.51994647 2.13777547 1.71875 2.28125,4.61939766 1.91341716 1.75 2.25,4.70772033 1.68444927 1.78125 2.21875,4.78470168 1.45142339 1.8125 2.1875,4.85015627 1.2149009 1.84375 2.15625,4.9039264 0.97545161 1.875 2.125,4.94588255 0.73365237 1.90625 2.09375,4.97592363 0.4900857 1.9375 2.0625,4.99397728 0.24533837 1.96875 2.03125,5 0 2 2,5.00602272 -0.24533837 2.03125 1.96875,5.02407637 -0.4900857 2.0625 1.9375,5.05411745 -0.73365237 2.09375 1.90625,5.0960736 -0.97545161 2.125 1.875,5.14984373 -1.2149009 2.15625 1.84375,5.21529832 -1.45142339 2.1875 1.8125,5.29227967 -1.68444927 2.21875 1.78125,5.38060234 -1.91341716 2.25 1.75,5.48005353 -2.13777547 2.28125 1.71875,5.59039368 -2.35698368 2.3125 1.6875,5.71135695 -2.57051372 2.34375 1.65625,5.84265194 -2.77785117 2.375 1.625,5.98396234 -2.97849652 2.40625 1.59375,6.13494773 -3.17196642 2.4375 1.5625,6.29524437 -3.35779477 2.46875 1.53125,6.46446609 -3.53553391 2.5 1.5,6.64220523 -3.70475563 2.53125 1.46875,6.82803358 -3.86505227
2.5625 1.4375,7.02150348 -4.01603766 2.59375 1.40625,7.22214883 -4.15734806 2.625 1.375,7.42948628 -4.28864305 2.65625 1.34375,7.64301632 -4.40960632 2.6875 1.3125,7.86222453 -4.51994647 2.71875 1.28125,8.08658284 -4.61939766 2.75 1.25,8.31555073 -4.70772033 2.78125 1.21875,8.54857661 -4.78470168 2.8125 1.1875,8.7850991 -4.85015627 2.84375 1.15625,9.02454839 -4.9039264 2.875 1.125,9.26634763 -4.94588255 2.90625 1.09375,9.5099143 -4.97592363 2.9375 1.0625,9.75466163 -4.99397728 2.96875 1.03125,10 -5 3 1,10.24533837 -4.99397728 3.03125 0.96875,10.4900857 -4.97592363 3.0625 0.9375,10.73365237 -4.94588255 3.09375 0.90625,10.97545161 -4.9039264 3.125 0.875,11.2149009 -4.85015627 3.15625 0.84375,11.45142339 -4.78470168 3.1875 0.8125,11.68444927 -4.70772033 3.21875 0.78125,11.91341716 -4.61939766 3.25 0.75,12.13777547 -4.51994647 3.28125 0.71875,12.35698368 -4.40960632 3.3125 0.6875,12.57051372 -4.28864305 3.34375 0.65625,12.77785117 -4.15734806 3.375 0.625,12.97849652 -4.01603766 3.40625
0.59375,13.17196642 -3.86505227 3.4375 0.5625,13.35779477 -3.70475563 3.46875 0.53125,13.53553391 -3.53553391 3.5 0.5,13.70475563 -3.35779477 3.53125 0.46875,13.86505227 -3.17196642 3.5625 0.4375,14.01603766 -2.97849652 3.59375 0.40625,14.15734806 -2.77785117 3.625 0.375,14.28864305 -2.57051372 3.65625 0.34375,14.40960632 -2.35698368 3.6875 0.3125,14.51994647 -2.13777547 3.71875 0.28125,14.61939766 -1.91341716 3.75 0.25,14.70772033 -1.68444927 3.78125 0.21875,14.78470168 -1.45142339 3.8125 0.1875,14.85015627 -1.2149009 3.84375 0.15625,14.9039264 -0.97545161 3.875 0.125,14.94588255 -0.73365237 3.90625 0.09375,14.97592363 -0.4900857 3.9375 0.0625,14.99397728 -0.24533837 3.96875 0.03125,15 0 4 0)
+ST_CurveToLine-201|LINESTRING(0 0,0.152 0.765,0.586 1.414)
+ST_CurveToLine-201|LINESTRING(-5 0,-3.536 3.536,3.062e-16 5,3.536 3.536,5 0,6.464 -3.536,10 -5,13.536 -3.536,15 0)
+ST_CurveToLine-202|LINESTRING M (0 0 0,0.152 0.765 -1.5,0.586 1.414 2)
+ST_CurveToLine-202|LINESTRING M (-5 0 4,-3.536 3.536 3.5,3.062e-16 5 3,3.536 3.536 2.5,5 0 2,6.464 -3.536 1.5,10 -5 1,13.536 -3.536 0.5,15 0 0)
+ST_CurveToLine-203|LINESTRING Z (0 0 0,0.152 0.765 2.25,0.586 1.414 1)
+ST_CurveToLine-203|LINESTRING Z (-5 0 0,-3.536 3.536 0.5,3.062e-16 5 1,3.536 3.536 1.5,5 0 2,6.464 -3.536 2.5,10 -5 3,13.536 -3.536 3.5,15 0 4)
+ST_CurveToLine-204|LINESTRING ZM (0 0 0 0,0.152 0.765 2.25 -1.5,0.586 1.414 1 2)
+ST_CurveToLine-204|LINESTRING ZM (-5 0 0 4,-3.536 3.536 0.5 3.5,3.062e-16 5 1 3,3.536 3.536 1.5 2.5,5 0 2 2,6.464 -3.536 2.5 1.5,10 -5 3 1,13.536 -3.536 3.5 0.5,15 0 4 0)
+ST_CurveToLine-401|LINESTRING(0 0,0.152 0.765,0.586 1.414)
+ST_CurveToLine-401|LINESTRING(-5 0,-4.619 1.913,-3.536 3.536,-1.913 4.619,3.062e-16 5,1.913 4.619,3.536 3.536,4.619 1.913,5 0,5.381 -1.913,6.464 -3.536,8.087 -4.619,10 -5,11.913 -4.619,13.536 -3.536,14.619 -1.913,15 0)
+ST_CurveToLine-402|LINESTRING M (0 0 0,0.152 0.765 -1.5,0.586 1.414 2)
+ST_CurveToLine-402|LINESTRING M (-5 0 4,-4.619 1.913 3.75,-3.536 3.536 3.5,-1.913 4.619 3.25,3.062e-16 5 3,1.913 4.619 2.75,3.536 3.536 2.5,4.619 1.913 2.25,5 0 2,5.381 -1.913 1.75,6.464 -3.536 1.5,8.087 -4.619 1.25,10 -5 1,11.913 -4.619 0.75,13.536 -3.536 0.5,14.619 -1.913 0.25,15 0 0)
+ST_CurveToLine-403|LINESTRING Z (0 0 0,0.152 0.765 2.25,0.586 1.414 1)
+ST_CurveToLine-403|LINESTRING Z (-5 0 0,-4.619 1.913 0.25,-3.536 3.536 0.5,-1.913 4.619 0.75,3.062e-16 5 1,1.913 4.619 1.25,3.536 3.536 1.5,4.619 1.913 1.75,5 0 2,5.381 -1.913 2.25,6.464 -3.536 2.5,8.087 -4.619 2.75,10 -5 3,11.913 -4.619 3.25,13.536 -3.536 3.5,14.619 -1.913 3.75,15 0 4)
+ST_CurveToLine-404|LINESTRING ZM (0 0 0 0,0.152 0.765 2.25 -1.5,0.586 1.414 1 2)
+ST_CurveToLine-404|LINESTRING ZM (-5 0 0 4,-4.619 1.913 0.25 3.75,-3.536 3.536 0.5 3.5,-1.913 4.619 0.75 3.25,3.062e-16 5 1 3,1.913 4.619 1.25 2.75,3.536 3.536 1.5 2.5,4.619 1.913 1.75 2.25,5 0 2 2,5.381 -1.913 2.25 1.75,6.464 -3.536 2.5 1.5,8.087 -4.619 2.75 1.25,10 -5 3 1,11.913 -4.619 3.25 0.75,13.536 -3.536 3.5 0.5,14.619 -1.913 3.75 0.25,15 0 4 0)
+ST_CurveToLine01|LINESTRING(0 0,0.002 0.098,0.01 0.196,0.022 0.293,0.038 0.39,0.06 0.486,0.086 0.581,0.117 0.674,0.152 0.765,0.192 0.855,0.236 0.943,0.285 1.028,0.337 1.111,0.394 1.191,0.454 1.269,0.518 1.343,0.586 1.414)
+ST_CurveToLine01|LINESTRING(-5 0,-4.994 0.245,-4.976 0.49,-4.946 0.734,-4.904 0.975,-4.85 1.215,-4.785 1.451,-4.708 1.684,-4.619 1.913,-4.52 2.138,-4.41 2.357,-4.289 2.571,-4.157 2.778,-4.016 2.978,-3.865 3.172,-3.705 3.358,-3.536 3.536,-3.358 3.705,-3.172 3.865,-2.978 4.016,-2.778 4.157,-2.571 4.289,-2.357 4.41,-2.138 4.52,-1.913 4.619,-1.684 4.708,-1.451 4.785,-1.215 4.85,-0.975 4.904,-0.734 4.946,-0.49 4.976,-0.245 4.994,3.062e-16 5,0.245 4.994,0.49 4.976,0.734 4.946,0.975 4.904,1.215 4.85,1.451 4.785,1.684 4.708,1.913 4.619,2.138 4.52,2.357 4.41,2.571 4.289,2.778 4.157,2.978 4.016,3.172 3.865,3.358 3.705,3.536 3.536,3.705 3.358,3.865 3.172,4.016 2.978,4.157 2.778,4.289 2.571,4.41 2.357,4.52 2.138,4.619 1.913,4.708 1.684,4.785 1.451,4.85 1.215,4.904 0.975,4.946 0.734,4.976 0.49,4.994 0.245,5 0,5.006 -0.245,5.024 -0.49,5.054 -0.734,5.096 -0.975,5.15 -1.215,5.215 -1.451,5.292 -1.684,5.381 -1.913,5.48 -2.138,5.59 -2.357,5.711 -2.571,5.843 -2.778,5.984 -2.978,6.135 -3.172,6.295 -3.35
8,6.464 -3.536,6.642 -3.705,6.828 -3.865,7.022 -4.016,7.222 -4.157,7.429 -4.289,7.643 -4.41,7.862 -4.52,8.087 -4.619,8.316 -4.708,8.549 -4.785,8.785 -4.85,9.025 -4.904,9.266 -4.946,9.51 -4.976,9.755 -4.994,10 -5,10.245 -4.994,10.49 -4.976,10.734 -4.946,10.975 -4.904,11.215 -4.85,11.451 -4.785,11.684 -4.708,11.913 -4.619,12.138 -4.52,12.357 -4.41,12.571 -4.289,12.778 -4.157,12.978 -4.016,13.172 -3.865,13.358 -3.705,13.536 -3.536,13.705 -3.358,13.865 -3.172,14.016 -2.978,14.157 -2.778,14.289 -2.571,14.41 -2.357,14.52 -2.138,14.619 -1.913,14.708 -1.684,14.785 -1.451,14.85 -1.215,14.904 -0.975,14.946 -0.734,14.976 -0.49,14.994 -0.245,15 0)
+ST_CurveToLine02|LINESTRING M (0 0 0,0.002 0.098 -0.187,0.01 0.196 -0.375,0.022 0.293 -0.562,0.038 0.39 -0.75,0.06 0.486 -0.938,0.086 0.581 -1.125,0.117 0.674 -1.313,0.152 0.765 -1.5,0.192 0.855 -1.687,0.236 0.943 -1.875,0.285 1.028 -1.75,0.337 1.111 -1,0.394 1.191 -0.25,0.454 1.269 0.5,0.518 1.343 1.25,0.586 1.414 2)
+ST_CurveToLine02|LINESTRING M (-5 0 4,-4.994 0.245 3.969,-4.976 0.49 3.938,-4.946 0.734 3.906,-4.904 0.975 3.875,-4.85 1.215 3.844,-4.785 1.451 3.812,-4.708 1.684 3.781,-4.619 1.913 3.75,-4.52 2.138 3.719,-4.41 2.357 3.688,-4.289 2.571 3.656,-4.157 2.778 3.625,-4.016 2.978 3.594,-3.865 3.172 3.562,-3.705 3.358 3.531,-3.536 3.536 3.5,-3.358 3.705 3.469,-3.172 3.865 3.438,-2.978 4.016 3.406,-2.778 4.157 3.375,-2.571 4.289 3.344,-2.357 4.41 3.312,-2.138 4.52 3.281,-1.913 4.619 3.25,-1.684 4.708 3.219,-1.451 4.785 3.188,-1.215 4.85 3.156,-0.975 4.904 3.125,-0.734 4.946 3.094,-0.49 4.976 3.062,-0.245 4.994 3.031,3.062e-16 5 3,0.245 4.994 2.969,0.49 4.976 2.938,0.734 4.946 2.906,0.975 4.904 2.875,1.215 4.85 2.844,1.451 4.785 2.812,1.684 4.708 2.781,1.913 4.619 2.75,2.138 4.52 2.719,2.357 4.41 2.688,2.571 4.289 2.656,2.778 4.157 2.625,2.978 4.016 2.594,3.172 3.865 2.562,3.358 3.705 2.531,3.536 3.536 2.5,3.705 3.358 2.469,3.865 3.172 2.438,4.016 2.978 2.406,4.157 2.778 2.375,4.289 2.571 2.3
44,4.41 2.357 2.312,4.52 2.138 2.281,4.619 1.913 2.25,4.708 1.684 2.219,4.785 1.451 2.188,4.85 1.215 2.156,4.904 0.975 2.125,4.946 0.734 2.094,4.976 0.49 2.062,4.994 0.245 2.031,5 0 2,5.006 -0.245 1.969,5.024 -0.49 1.938,5.054 -0.734 1.906,5.096 -0.975 1.875,5.15 -1.215 1.844,5.215 -1.451 1.812,5.292 -1.684 1.781,5.381 -1.913 1.75,5.48 -2.138 1.719,5.59 -2.357 1.688,5.711 -2.571 1.656,5.843 -2.778 1.625,5.984 -2.978 1.594,6.135 -3.172 1.562,6.295 -3.358 1.531,6.464 -3.536 1.5,6.642 -3.705 1.469,6.828 -3.865 1.438,7.022 -4.016 1.406,7.222 -4.157 1.375,7.429 -4.289 1.344,7.643 -4.41 1.312,7.862 -4.52 1.281,8.087 -4.619 1.25,8.316 -4.708 1.219,8.549 -4.785 1.188,8.785 -4.85 1.156,9.025 -4.904 1.125,9.266 -4.946 1.094,9.51 -4.976 1.062,9.755 -4.994 1.031,10 -5 1,10.245 -4.994 0.969,10.49 -4.976 0.938,10.734 -4.946 0.906,10.975 -4.904 0.875,11.215 -4.85 0.844,11.451 -4.785 0.813,11.684 -4.708 0.781,11.913 -4.619 0.75,12.138 -4.52 0.719,12.357 -4.41 0.688,12.571 -4.289 0.656,12.778 -4.157
0.625,12.978 -4.016 0.594,13.172 -3.865 0.563,13.358 -3.705 0.531,13.536 -3.536 0.5,13.705 -3.358 0.469,13.865 -3.172 0.437,14.016 -2.978 0.406,14.157 -2.778 0.375,14.289 -2.571 0.344,14.41 -2.357 0.313,14.52 -2.138 0.281,14.619 -1.913 0.25,14.708 -1.684 0.219,14.785 -1.451 0.187,14.85 -1.215 0.156,14.904 -0.975 0.125,14.946 -0.734 0.094,14.976 -0.49 0.062,14.994 -0.245 0.031,15 0 0)
+ST_CurveToLine03|LINESTRING Z (0 0 0,0.002 0.098 0.281,0.01 0.196 0.563,0.022 0.293 0.844,0.038 0.39 1.125,0.06 0.486 1.406,0.086 0.581 1.687,0.117 0.674 1.969,0.152 0.765 2.25,0.192 0.855 2.531,0.236 0.943 2.813,0.285 1.028 2.875,0.337 1.111 2.5,0.394 1.191 2.125,0.454 1.269 1.75,0.518 1.343 1.375,0.586 1.414 1)
+ST_CurveToLine03|LINESTRING Z (-5 0 0,-4.994 0.245 0.031,-4.976 0.49 0.063,-4.946 0.734 0.094,-4.904 0.975 0.125,-4.85 1.215 0.156,-4.785 1.451 0.187,-4.708 1.684 0.219,-4.619 1.913 0.25,-4.52 2.138 0.281,-4.41 2.357 0.313,-4.289 2.571 0.344,-4.157 2.778 0.375,-4.016 2.978 0.406,-3.865 3.172 0.437,-3.705 3.358 0.469,-3.536 3.536 0.5,-3.358 3.705 0.531,-3.172 3.865 0.563,-2.978 4.016 0.594,-2.778 4.157 0.625,-2.571 4.289 0.656,-2.357 4.41 0.687,-2.138 4.52 0.719,-1.913 4.619 0.75,-1.684 4.708 0.781,-1.451 4.785 0.813,-1.215 4.85 0.844,-0.975 4.904 0.875,-0.734 4.946 0.906,-0.49 4.976 0.937,-0.245 4.994 0.969,3.062e-16 5 1,0.245 4.994 1.031,0.49 4.976 1.062,0.734 4.946 1.094,0.975 4.904 1.125,1.215 4.85 1.156,1.451 4.785 1.188,1.684 4.708 1.219,1.913 4.619 1.25,2.138 4.52 1.281,2.357 4.41 1.312,2.571 4.289 1.344,2.778 4.157 1.375,2.978 4.016 1.406,3.172 3.865 1.438,3.358 3.705 1.469,3.536 3.536 1.5,3.705 3.358 1.531,3.865 3.172 1.562,4.016 2.978 1.594,4.157 2.778 1.625,4.289 2.571 1.6
56,4.41 2.357 1.688,4.52 2.138 1.719,4.619 1.913 1.75,4.708 1.684 1.781,4.785 1.451 1.812,4.85 1.215 1.844,4.904 0.975 1.875,4.946 0.734 1.906,4.976 0.49 1.938,4.994 0.245 1.969,5 0 2,5.006 -0.245 2.031,5.024 -0.49 2.062,5.054 -0.734 2.094,5.096 -0.975 2.125,5.15 -1.215 2.156,5.215 -1.451 2.188,5.292 -1.684 2.219,5.381 -1.913 2.25,5.48 -2.138 2.281,5.59 -2.357 2.312,5.711 -2.571 2.344,5.843 -2.778 2.375,5.984 -2.978 2.406,6.135 -3.172 2.438,6.295 -3.358 2.469,6.464 -3.536 2.5,6.642 -3.705 2.531,6.828 -3.865 2.562,7.022 -4.016 2.594,7.222 -4.157 2.625,7.429 -4.289 2.656,7.643 -4.41 2.688,7.862 -4.52 2.719,8.087 -4.619 2.75,8.316 -4.708 2.781,8.549 -4.785 2.812,8.785 -4.85 2.844,9.025 -4.904 2.875,9.266 -4.946 2.906,9.51 -4.976 2.938,9.755 -4.994 2.969,10 -5 3,10.245 -4.994 3.031,10.49 -4.976 3.062,10.734 -4.946 3.094,10.975 -4.904 3.125,11.215 -4.85 3.156,11.451 -4.785 3.188,11.684 -4.708 3.219,11.913 -4.619 3.25,12.138 -4.52 3.281,12.357 -4.41 3.312,12.571 -4.289 3.344,12.778 -4.157
3.375,12.978 -4.016 3.406,13.172 -3.865 3.437,13.358 -3.705 3.469,13.536 -3.536 3.5,13.705 -3.358 3.531,13.865 -3.172 3.563,14.016 -2.978 3.594,14.157 -2.778 3.625,14.289 -2.571 3.656,14.41 -2.357 3.688,14.52 -2.138 3.719,14.619 -1.913 3.75,14.708 -1.684 3.781,14.785 -1.451 3.812,14.85 -1.215 3.844,14.904 -0.975 3.875,14.946 -0.734 3.906,14.976 -0.49 3.938,14.994 -0.245 3.969,15 0 4)
+ST_CurveToLine04|LINESTRING ZM (0 0 0 0,0.002 0.098 0.281 -0.187,0.01 0.196 0.563 -0.375,0.022 0.293 0.844 -0.562,0.038 0.39 1.125 -0.75,0.06 0.486 1.406 -0.938,0.086 0.581 1.687 -1.125,0.117 0.674 1.969 -1.313,0.152 0.765 2.25 -1.5,0.192 0.855 2.531 -1.687,0.236 0.943 2.813 -1.875,0.285 1.028 2.875 -1.75,0.337 1.111 2.5 -1,0.394 1.191 2.125 -0.25,0.454 1.269 1.75 0.5,0.518 1.343 1.375 1.25,0.586 1.414 1 2)
+ST_CurveToLine04|LINESTRING ZM (-5 0 0 4,-4.994 0.245 0.031 3.969,-4.976 0.49 0.063 3.938,-4.946 0.734 0.094 3.906,-4.904 0.975 0.125 3.875,-4.85 1.215 0.156 3.844,-4.785 1.451 0.187 3.812,-4.708 1.684 0.219 3.781,-4.619 1.913 0.25 3.75,-4.52 2.138 0.281 3.719,-4.41 2.357 0.313 3.688,-4.289 2.571 0.344 3.656,-4.157 2.778 0.375 3.625,-4.016 2.978 0.406 3.594,-3.865 3.172 0.437 3.562,-3.705 3.358 0.469 3.531,-3.536 3.536 0.5 3.5,-3.358 3.705 0.531 3.469,-3.172 3.865 0.563 3.438,-2.978 4.016 0.594 3.406,-2.778 4.157 0.625 3.375,-2.571 4.289 0.656 3.344,-2.357 4.41 0.687 3.312,-2.138 4.52 0.719 3.281,-1.913 4.619 0.75 3.25,-1.684 4.708 0.781 3.219,-1.451 4.785 0.813 3.188,-1.215 4.85 0.844 3.156,-0.975 4.904 0.875 3.125,-0.734 4.946 0.906 3.094,-0.49 4.976 0.937 3.062,-0.245 4.994 0.969 3.031,3.062e-16 5 1 3,0.245 4.994 1.031 2.969,0.49 4.976 1.062 2.938,0.734 4.946 1.094 2.906,0.975 4.904 1.125 2.875,1.215 4.85 1.156 2.844,1.451 4.785 1.188 2.812,1.684 4.708 1.219 2.781,1.913 4.619 1.2
5 2.75,2.138 4.52 1.281 2.719,2.357 4.41 1.312 2.688,2.571 4.289 1.344 2.656,2.778 4.157 1.375 2.625,2.978 4.016 1.406 2.594,3.172 3.865 1.438 2.562,3.358 3.705 1.469 2.531,3.536 3.536 1.5 2.5,3.705 3.358 1.531 2.469,3.865 3.172 1.562 2.438,4.016 2.978 1.594 2.406,4.157 2.778 1.625 2.375,4.289 2.571 1.656 2.344,4.41 2.357 1.688 2.312,4.52 2.138 1.719 2.281,4.619 1.913 1.75 2.25,4.708 1.684 1.781 2.219,4.785 1.451 1.812 2.188,4.85 1.215 1.844 2.156,4.904 0.975 1.875 2.125,4.946 0.734 1.906 2.094,4.976 0.49 1.938 2.062,4.994 0.245 1.969 2.031,5 0 2 2,5.006 -0.245 2.031 1.969,5.024 -0.49 2.062 1.938,5.054 -0.734 2.094 1.906,5.096 -0.975 2.125 1.875,5.15 -1.215 2.156 1.844,5.215 -1.451 2.188 1.812,5.292 -1.684 2.219 1.781,5.381 -1.913 2.25 1.75,5.48 -2.138 2.281 1.719,5.59 -2.357 2.312 1.688,5.711 -2.571 2.344 1.656,5.843 -2.778 2.375 1.625,5.984 -2.978 2.406 1.594,6.135 -3.172 2.438 1.562,6.295 -3.358 2.469 1.531,6.464 -3.536 2.5 1.5,6.642 -3.705 2.531 1.469,6.828 -3.865 2.562 1.438,7.
022 -4.016 2.594 1.406,7.222 -4.157 2.625 1.375,7.429 -4.289 2.656 1.344,7.643 -4.41 2.688 1.312,7.862 -4.52 2.719 1.281,8.087 -4.619 2.75 1.25,8.316 -4.708 2.781 1.219,8.549 -4.785 2.812 1.188,8.785 -4.85 2.844 1.156,9.025 -4.904 2.875 1.125,9.266 -4.946 2.906 1.094,9.51 -4.976 2.938 1.062,9.755 -4.994 2.969 1.031,10 -5 3 1,10.245 -4.994 3.031 0.969,10.49 -4.976 3.062 0.938,10.734 -4.946 3.094 0.906,10.975 -4.904 3.125 0.875,11.215 -4.85 3.156 0.844,11.451 -4.785 3.188 0.813,11.684 -4.708 3.219 0.781,11.913 -4.619 3.25 0.75,12.138 -4.52 3.281 0.719,12.357 -4.41 3.312 0.688,12.571 -4.289 3.344 0.656,12.778 -4.157 3.375 0.625,12.978 -4.016 3.406 0.594,13.172 -3.865 3.437 0.563,13.358 -3.705 3.469 0.531,13.536 -3.536 3.5 0.5,13.705 -3.358 3.531 0.469,13.865 -3.172 3.563 0.437,14.016 -2.978 3.594 0.406,14.157 -2.778 3.625 0.375,14.289 -2.571 3.656 0.344,14.41 -2.357 3.688 0.313,14.52 -2.138 3.719 0.281,14.619 -1.913 3.75 0.25,14.708 -1.684 3.781 0.219,14.785 -1.451 3.812 0.187,14.85 -1
.215 3.844 0.156,14.904 -0.975 3.875 0.125,14.946 -0.734 3.906 0.094,14.976 -0.49 3.938 0.062,14.994 -0.245 3.969 0.031,15 0 4 0)
isValid01|t
isValid01|t
isValid02|t
diff --git a/regress/core/tickets.sql b/regress/core/tickets.sql
index 538a979..61078b3 100644
--- a/regress/core/tickets.sql
+++ b/regress/core/tickets.sql
@@ -794,7 +794,7 @@ SELECT '#2420.2', ST_AsText(ST_LineToCurve('LINESTRING(0 0,10 0,10 10,0 10)'));
SELECT '#2423', ST_AsText(ST_CurveToLine(ST_LineToCurve(
ST_Intersection(ST_Buffer(ST_Point(0,0),10),ST_MakeEnvelope(-10,0,10,10))
-), 4), 5);
+), 4), 4);
SELECT '#2424', ST_AsText(ST_SnapToGrid(ST_CurveToLine(
'MULTICURVE(COMPOUNDCURVE((0 0, 10 0),CIRCULARSTRING(10 0, 20 1, 30 10)))',
diff --git a/regress/core/tickets_expected b/regress/core/tickets_expected
index ad889a3..917d374 100644
--- a/regress/core/tickets_expected
+++ b/regress/core/tickets_expected
@@ -252,7 +252,7 @@ ERROR: invalid GML representation
#2412|LINESTRING(0 0,10 0,20 0)
#2420.1|LINESTRING(0 0,10 0,10 10,0 10,0 0)
#2420.2|LINESTRING(0 0,10 0,10 10,0 10)
-#2423|POLYGON((-10 0,-9.2388 3.82683,-7.07107 7.07107,-3.82683 9.2388,1.71574e-15 10,3.82683 9.2388,7.07107 7.07107,9.2388 3.82683,10 0,-10 0))
+#2423|POLYGON((-10 0,-9.2388 3.8268,-7.0711 7.0711,-3.8268 9.2388,1.7157e-15 10,3.8268 9.2388,7.0711 7.0711,9.2388 3.8268,10 0,-10 0))
#2424|MULTILINESTRING((0 0,10 0,24 3,30 10))
#2427|POINT(-1 0)
#2168|5340.76237395|5340.76237395|0
-----------------------------------------------------------------------
Summary of changes:
regress/core/regress_buffer_params.sql | 30 +++++++++---------
regress/core/regress_buffer_params_expected | 18 +++++------
regress/core/sql-mm-circularstring.sql | 28 ++++++++---------
regress/core/sql-mm-circularstring_expected | 48 ++++++++++++++---------------
regress/core/tickets.sql | 2 +-
regress/core/tickets_expected | 2 +-
6 files changed, 64 insertions(+), 64 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list