From: Paul Ramsey Date: Fri, 18 Mar 2011 16:24:33 +0000 (+0000) Subject: Jeff Adams: Increasing precision due to tests failing in automatic build. X-Git-Tag: 2.0.0alpha1~1877 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=359ab99a415bff35ce10e5db3f1b894138021162;p=postgis Jeff Adams: Increasing precision due to tests failing in automatic build. git-svn-id: http://svn.osgeo.org/postgis/trunk@6925 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/loader/shp2pgsql-core.c b/loader/shp2pgsql-core.c index 9f016dfd4..84c4e48cf 100644 --- a/loader/shp2pgsql-core.c +++ b/loader/shp2pgsql-core.c @@ -301,7 +301,7 @@ GeneratePointGeometry(SHPLOADERSTATE *state, SHPObject *obj, char **geometry, in if (state->config->use_wkt) { - mem = lwgeom_to_wkt(lwgeom, WKT_EXTENDED, 12, &mem_length); + mem = lwgeom_to_wkt(lwgeom, WKT_EXTENDED, WKT_PRECISION, &mem_length); } else { @@ -400,7 +400,7 @@ GenerateLineStringGeometry(SHPLOADERSTATE *state, SHPObject *obj, char **geometr if (!state->config->use_wkt) mem = lwgeom_to_hexwkb(lwgeom, WKB_EXTENDED, &mem_length); else - mem = lwgeom_to_wkt(lwgeom, WKT_EXTENDED, 12, &mem_length); + mem = lwgeom_to_wkt(lwgeom, WKT_EXTENDED, WKT_PRECISION, &mem_length); if ( !mem ) { @@ -711,7 +711,7 @@ GeneratePolygonGeometry(SHPLOADERSTATE *state, SHPObject *obj, char **geometry) if (!state->config->use_wkt) mem = lwgeom_to_hexwkb(lwgeom, WKB_EXTENDED, &mem_length); else - mem = lwgeom_to_wkt(lwgeom, WKT_EXTENDED, 12, &mem_length); + mem = lwgeom_to_wkt(lwgeom, WKT_EXTENDED, WKT_PRECISION, &mem_length); if ( !mem ) { diff --git a/loader/shp2pgsql-core.h b/loader/shp2pgsql-core.h index d44325d75..85a90fff9 100644 --- a/loader/shp2pgsql-core.h +++ b/loader/shp2pgsql-core.h @@ -43,6 +43,9 @@ #define RCSID "$Id$" +/* Number of digits of precision in WKT produced. */ +#define WKT_PRECISION 15 + /* Loader policy constants */ #define POLICY_NULL_ABORT 0x0 #define POLICY_NULL_INSERT 0x1 diff --git a/regress/loader/MultiToSinglePoint-w.select.expected b/regress/loader/MultiToSinglePoint-w.select.expected index 38fcb4035..b80e20e69 100644 --- a/regress/loader/MultiToSinglePoint-w.select.expected +++ b/regress/loader/MultiToSinglePoint-w.select.expected @@ -1,66 +1,66 @@ -POINT(580936.142823 819465.261819) -POINT(506358.893822 607539.2573) -POINT(630565.963577 527840.45893) -POINT(315456.492218 345306.814089) -POINT(471022.700766 736736.493044) -POINT(500018.609208 615679.275076) -POINT(219498.722492 315980.37513) -POINT(319224.669259 318928.062446) -POINT(568650.774422 460462.130344) -POINT(556409.113539 729253.309903) -POINT(513863.46763 702618.742175) -POINT(578737.939007 752848.936015) -POINT(574438.608452 769113.196327) -POINT(542424.351008 668316.880131) -POINT(400265.835331 734407.033596) -POINT(451759.863004 412686.100724) -POINT(569910.583609 459856.20941) -POINT(463382.922609 699974.019885) -POINT(604477.021809 740527.999129) -POINT(507899.651882 708318.275563) -POINT(417174.241779 505305.090948) -POINT(577806.699527 694316.933395) -POINT(576210.383288 714992.288047) -POINT(577656.942501 695830.735896) -POINT(581803.779115 693852.464253) -POINT(483239.070139 239264.868231) -POINT(584627.388419 693322.924134) -POINT(531622.192358 716647.040901) -POINT(581975.365599 694284.048852) -POINT(446160.135881 550892.865026) -POINT(529311.590366 610942.506187) -POINT(581808.726988 695841.703111) -POINT(504782.468511 615893.186212) -POINT(622500.156248 752230.030257) -POINT(349366.222335 363016.921232) -POINT(594903.330738 545923.436928) -POINT(441308.570186 229022.749014) -POINT(605633.269659 771823.45975) -POINT(318054.396825 406677.968765) -POINT(606814.490943 683559.837391) -POINT(427202.245584 526355.921119) -POINT(585605.654583 428734.299959) -POINT(348498.220291 696622.254661) -POINT(447753.888233 552268.218021) -POINT(562081.950511 696159.347585) -POINT(449917.461534 516567.922516) -POINT(509151.607038 594632.163261) -POINT(565466.435276 673573.123642) -POINT(492421.362356 719117.799265) -POINT(613346.499962 691449.747539) -POINT(341505.393226 347633.860111) -POINT(335130.109224 221738.458568) -POINT(520476.8592 607380.893421) -POINT(610931.065288 690104.943361) -POINT(577692.981622 695342.840693) -POINT(623744.425212 697297.799336) -POINT(439667.994099 646984.255696) -POINT(507141.1403 606418.246119) -POINT(575383.92723 737533.321867) -POINT(413215.495254 523736.836314) -POINT(561887.180888 504214.422383) -POINT(583428.220764 759656.92773) -POINT(421018.925049 813910.215413) -POINT(621373.929808 690044.792874) -POINT(470983.159332 620692.73333) -POINT(508947.758357 706720.507141) +POINT(580936.142822989 819465.261818573) +POINT(506358.893822162 607539.257299624) +POINT(630565.963576575 527840.458930382) +POINT(315456.492217951 345306.814088522) +POINT(471022.700765905 736736.493043649) +POINT(500018.609208153 615679.275075901) +POINT(219498.722491731 315980.375130241) +POINT(319224.669258993 318928.062445705) +POINT(568650.774421983 460462.130343988) +POINT(556409.113539159 729253.30990305) +POINT(513863.467629622 702618.742174883) +POINT(578737.93900689 752848.936014613) +POINT(574438.608452132 769113.196326717) +POINT(542424.351008234 668316.880130952) +POINT(400265.835331173 734407.03359561) +POINT(451759.863004144 412686.100723883) +POINT(569910.583609289 459856.209410486) +POINT(463382.922608931 699974.019885147) +POINT(604477.021809125 740527.999129056) +POINT(507899.651882106 708318.275562585) +POINT(417174.241778919 505305.090947582) +POINT(577806.69952663 694316.933395063) +POINT(576210.383288164 714992.288047029) +POINT(577656.942500652 695830.735895674) +POINT(581803.77911474 693852.464252684) +POINT(483239.070139275 239264.868230516) +POINT(584627.388419181 693322.924133717) +POINT(531622.192358354 716647.04090078) +POINT(581975.365599073 694284.048851616) +POINT(446160.135881017 550892.865025523) +POINT(529311.59036645 610942.506187195) +POINT(581808.72698778 695841.703111349) +POINT(504782.468510898 615893.18621198) +POINT(622500.156247537 752230.030256728) +POINT(349366.222335089 363016.921231509) +POINT(594903.330738372 545923.436927693) +POINT(441308.570185706 229022.749014213) +POINT(605633.269658534 771823.459750208) +POINT(318054.396825439 406677.968765208) +POINT(606814.490943 683559.837390652) +POINT(427202.24558416 526355.921118875) +POINT(585605.654583162 428734.299958661) +POINT(348498.220290712 696622.254661199) +POINT(447753.888233448 552268.218021069) +POINT(562081.950510856 696159.347584696) +POINT(449917.461533751 516567.922516446) +POINT(509151.60703826 594632.163260898) +POINT(565466.43527563 673573.123642044) +POINT(492421.362355858 719117.799265052) +POINT(613346.499961959 691449.747538779) +POINT(341505.39322594 347633.860111487) +POINT(335130.109224021 221738.458568427) +POINT(520476.859199935 607380.893420555) +POINT(610931.065287928 690104.943360865) +POINT(577692.981621935 695342.840693476) +POINT(623744.425211874 697297.79933633) +POINT(439667.99409899 646984.255696235) +POINT(507141.140300172 606418.246119218) +POINT(575383.927230225 737533.321867288) +POINT(413215.495253968 523736.836314417) +POINT(561887.180888466 504214.422382654) +POINT(583428.220763956 759656.927730192) +POINT(421018.925048973 813910.215413168) +POINT(621373.929808485 690044.79287378) +POINT(470983.159331542 620692.733330001) +POINT(508947.758356538 706720.507141173) diff --git a/regress/loader/NotReallyMultiPoint-w.select.expected b/regress/loader/NotReallyMultiPoint-w.select.expected index e145e3150..ea5570206 100644 --- a/regress/loader/NotReallyMultiPoint-w.select.expected +++ b/regress/loader/NotReallyMultiPoint-w.select.expected @@ -1,66 +1,66 @@ -MULTIPOINT(580936.142823 819465.261819) -MULTIPOINT(506358.893822 607539.2573) -MULTIPOINT(630565.963577 527840.45893) -MULTIPOINT(315456.492218 345306.814089) -MULTIPOINT(471022.700766 736736.493044) -MULTIPOINT(500018.609208 615679.275076) -MULTIPOINT(219498.722492 315980.37513) -MULTIPOINT(319224.669259 318928.062446) -MULTIPOINT(568650.774422 460462.130344) -MULTIPOINT(556409.113539 729253.309903) -MULTIPOINT(513863.46763 702618.742175) -MULTIPOINT(578737.939007 752848.936015) -MULTIPOINT(574438.608452 769113.196327) -MULTIPOINT(542424.351008 668316.880131) -MULTIPOINT(400265.835331 734407.033596) -MULTIPOINT(451759.863004 412686.100724) -MULTIPOINT(569910.583609 459856.20941) -MULTIPOINT(463382.922609 699974.019885) -MULTIPOINT(604477.021809 740527.999129) -MULTIPOINT(507899.651882 708318.275563) -MULTIPOINT(417174.241779 505305.090948) -MULTIPOINT(577806.699527 694316.933395) -MULTIPOINT(576210.383288 714992.288047) -MULTIPOINT(577656.942501 695830.735896) -MULTIPOINT(581803.779115 693852.464253) -MULTIPOINT(483239.070139 239264.868231) -MULTIPOINT(584627.388419 693322.924134) -MULTIPOINT(531622.192358 716647.040901) -MULTIPOINT(581975.365599 694284.048852) -MULTIPOINT(446160.135881 550892.865026) -MULTIPOINT(529311.590366 610942.506187) -MULTIPOINT(581808.726988 695841.703111) -MULTIPOINT(504782.468511 615893.186212) -MULTIPOINT(622500.156248 752230.030257) -MULTIPOINT(349366.222335 363016.921232) -MULTIPOINT(594903.330738 545923.436928) -MULTIPOINT(441308.570186 229022.749014) -MULTIPOINT(605633.269659 771823.45975) -MULTIPOINT(318054.396825 406677.968765) -MULTIPOINT(606814.490943 683559.837391) -MULTIPOINT(427202.245584 526355.921119) -MULTIPOINT(585605.654583 428734.299959) -MULTIPOINT(348498.220291 696622.254661) -MULTIPOINT(447753.888233 552268.218021) -MULTIPOINT(562081.950511 696159.347585) -MULTIPOINT(449917.461534 516567.922516) -MULTIPOINT(509151.607038 594632.163261) -MULTIPOINT(565466.435276 673573.123642) -MULTIPOINT(492421.362356 719117.799265) -MULTIPOINT(613346.499962 691449.747539) -MULTIPOINT(341505.393226 347633.860111) -MULTIPOINT(335130.109224 221738.458568) -MULTIPOINT(520476.8592 607380.893421) -MULTIPOINT(610931.065288 690104.943361) -MULTIPOINT(577692.981622 695342.840693) -MULTIPOINT(623744.425212 697297.799336) -MULTIPOINT(439667.994099 646984.255696) -MULTIPOINT(507141.1403 606418.246119) -MULTIPOINT(575383.92723 737533.321867) -MULTIPOINT(413215.495254 523736.836314) -MULTIPOINT(561887.180888 504214.422383) -MULTIPOINT(583428.220764 759656.92773) -MULTIPOINT(421018.925049 813910.215413) -MULTIPOINT(621373.929808 690044.792874) -MULTIPOINT(470983.159332 620692.73333) -MULTIPOINT(508947.758357 706720.507141) +MULTIPOINT(580936.142822989 819465.261818573) +MULTIPOINT(506358.893822162 607539.257299624) +MULTIPOINT(630565.963576575 527840.458930382) +MULTIPOINT(315456.492217951 345306.814088522) +MULTIPOINT(471022.700765905 736736.493043649) +MULTIPOINT(500018.609208153 615679.275075901) +MULTIPOINT(219498.722491731 315980.375130241) +MULTIPOINT(319224.669258993 318928.062445705) +MULTIPOINT(568650.774421983 460462.130343988) +MULTIPOINT(556409.113539159 729253.30990305) +MULTIPOINT(513863.467629622 702618.742174883) +MULTIPOINT(578737.93900689 752848.936014613) +MULTIPOINT(574438.608452132 769113.196326717) +MULTIPOINT(542424.351008234 668316.880130952) +MULTIPOINT(400265.835331173 734407.03359561) +MULTIPOINT(451759.863004144 412686.100723883) +MULTIPOINT(569910.583609289 459856.209410486) +MULTIPOINT(463382.922608931 699974.019885147) +MULTIPOINT(604477.021809125 740527.999129056) +MULTIPOINT(507899.651882106 708318.275562585) +MULTIPOINT(417174.241778919 505305.090947582) +MULTIPOINT(577806.69952663 694316.933395063) +MULTIPOINT(576210.383288164 714992.288047029) +MULTIPOINT(577656.942500652 695830.735895674) +MULTIPOINT(581803.77911474 693852.464252684) +MULTIPOINT(483239.070139275 239264.868230516) +MULTIPOINT(584627.388419181 693322.924133717) +MULTIPOINT(531622.192358354 716647.04090078) +MULTIPOINT(581975.365599073 694284.048851616) +MULTIPOINT(446160.135881017 550892.865025523) +MULTIPOINT(529311.59036645 610942.506187195) +MULTIPOINT(581808.72698778 695841.703111349) +MULTIPOINT(504782.468510898 615893.18621198) +MULTIPOINT(622500.156247537 752230.030256728) +MULTIPOINT(349366.222335089 363016.921231509) +MULTIPOINT(594903.330738372 545923.436927693) +MULTIPOINT(441308.570185706 229022.749014213) +MULTIPOINT(605633.269658534 771823.459750208) +MULTIPOINT(318054.396825439 406677.968765208) +MULTIPOINT(606814.490943 683559.837390652) +MULTIPOINT(427202.24558416 526355.921118875) +MULTIPOINT(585605.654583162 428734.299958661) +MULTIPOINT(348498.220290712 696622.254661199) +MULTIPOINT(447753.888233448 552268.218021069) +MULTIPOINT(562081.950510856 696159.347584696) +MULTIPOINT(449917.461533751 516567.922516446) +MULTIPOINT(509151.60703826 594632.163260898) +MULTIPOINT(565466.43527563 673573.123642044) +MULTIPOINT(492421.362355858 719117.799265052) +MULTIPOINT(613346.499961959 691449.747538779) +MULTIPOINT(341505.39322594 347633.860111487) +MULTIPOINT(335130.109224021 221738.458568427) +MULTIPOINT(520476.859199935 607380.893420555) +MULTIPOINT(610931.065287928 690104.943360865) +MULTIPOINT(577692.981621935 695342.840693476) +MULTIPOINT(623744.425211874 697297.79933633) +MULTIPOINT(439667.99409899 646984.255696235) +MULTIPOINT(507141.140300172 606418.246119218) +MULTIPOINT(575383.927230225 737533.321867288) +MULTIPOINT(413215.495253968 523736.836314417) +MULTIPOINT(561887.180888466 504214.422382654) +MULTIPOINT(583428.220763956 759656.927730192) +MULTIPOINT(421018.925048973 813910.215413168) +MULTIPOINT(621373.929808485 690044.79287378) +MULTIPOINT(470983.159331542 620692.733330001) +MULTIPOINT(508947.758356538 706720.507141173) diff --git a/regress/loader/ReprojectPts-w.select.expected b/regress/loader/ReprojectPts-w.select.expected index 23abda98a..78557b99f 100644 --- a/regress/loader/ReprojectPts-w.select.expected +++ b/regress/loader/ReprojectPts-w.select.expected @@ -1,66 +1,66 @@ -SRID=4326;POINT(-74.1778249234186 41.0826336069621) -SRID=4326;POINT(-74.4488128587284 40.5013374405831) -SRID=4326;POINT(-74.0037635784151 40.2814968841599) -SRID=4326;POINT(-75.1286374176544 39.779738904917) -SRID=4326;POINT(-74.5762901403342 40.8559759516941) -SRID=4326;POINT(-74.4716040112965 40.5236906585587) -SRID=4326;POINT(-75.4689168308202 39.6968833405426) -SRID=4326;POINT(-75.1145861845468 39.7073923052707) -SRID=4326;POINT(-74.2264370070618 40.097265631898) -SRID=4326;POINT(-74.267669256308 40.835226153518) -SRID=4326;POINT(-74.4215203668629 40.7623218114584) -SRID=4326;POINT(-74.1866659762657 40.8998034100653) -SRID=4326;POINT(-74.2020187391779 40.9444882709976) -SRID=4326;POINT(-74.318666634379 40.668046504386) -SRID=4326;POINT(-74.8320596317968 40.8491289846163) -SRID=4326;POINT(-74.6440210088998 39.9663370779506) -SRID=4326;POINT(-74.2219402834666 40.0955914789689) -SRID=4326;POINT(-74.6037525547762 40.7550420759644) -SRID=4326;POINT(-74.0937601839482 40.8656933573937) -SRID=4326;POINT(-74.4430374038438 40.7779796708969) -SRID=4326;POINT(-74.7684170268845 40.2203845505147) -SRID=4326;POINT(-74.1907818170678 40.739145735004) -SRID=4326;POINT(-74.1962844392102 40.7959141570767) -SRID=4326;POINT(-74.1913030602141 40.7433025340713) -SRID=4326;POINT(-74.1763630799163 40.737831233597) -SRID=4326;POINT(-74.5314873084103 39.4902945583041) -SRID=4326;POINT(-74.1661805363706 40.7363486398654) -SRID=4326;POINT(-74.3573260684924 40.8007679302865) -SRID=4326;POINT(-74.1757381076133 40.7390141841291) -SRID=4326;POINT(-74.6649158055449 40.3457273489041) -SRID=4326;POINT(-74.3662532330192 40.5106137365586) -SRID=4326;POINT(-74.1763187562297 40.7432915904029) -SRID=4326;POINT(-74.4544664009791 40.5242723881508) -SRID=4326;POINT(-74.0283665597175 40.8975658415575) -SRID=4326;POINT(-75.0083397511198 39.8289502587993) -SRID=4326;POINT(-74.1313222061323 40.3316152829947) -SRID=4326;POINT(-74.6799952206859 39.4620385866365) -SRID=4326;POINT(-74.0890480643623 40.9515804026446) -SRID=4326;POINT(-75.1209106831221 39.9482691733624) -SRID=4326;POINT(-74.0862802471739 40.7092900894149) -SRID=4326;POINT(-74.7327024195045 40.2782515920205) -SRID=4326;POINT(-74.1662530255196 40.01000430686) -SRID=4326;POINT(-75.0183798167935 40.7447239779165) -SRID=4326;POINT(-74.6592065330533 40.3495109704879) -SRID=4326;POINT(-74.2475114317579 40.744341221767) -SRID=4326;POINT(-74.6512248373302 40.2515163382362) -SRID=4326;POINT(-74.4388020498744 40.4659008042768) -SRID=4326;POINT(-74.2355416979199 40.6823146575314) -SRID=4326;POINT(-74.4989293530256 40.8076383297076) -SRID=4326;POINT(-74.0625761975523 40.7308606221026) -SRID=4326;POINT(-75.0360016411834 39.7865925067772) -SRID=4326;POINT(-75.0559164322449 39.4408494224665) -SRID=4326;POINT(-74.3980433283985 40.5008690729179) -SRID=4326;POINT(-74.0713156694968 40.7272019085637) -SRID=4326;POINT(-74.1911791861301 40.7419629255487) -SRID=4326;POINT(-74.0249426200973 40.7467647928245) -SRID=4326;POINT(-74.688946675902 40.6094748964846) -SRID=4326;POINT(-74.4460022558058 40.49825883848) -SRID=4326;POINT(-74.198989906698 40.8577957099556) -SRID=4326;POINT(-74.7828046028596 40.2709499874624) -SRID=4326;POINT(-74.2501753633512 40.2174320022045) -SRID=4326;POINT(-74.169605505782 40.9184432569356) -SRID=4326;POINT(-74.7578885232984 41.0675476294558) -SRID=4326;POINT(-74.0336372902943 40.7268907140294) -SRID=4326;POINT(-74.5760699023108 40.537431636642) -SRID=4326;POINT(-74.4392566663626 40.7735918687511) +SRID=4326;POINT(-74.1778249234186 41.0826336069609) +SRID=4326;POINT(-74.4488128587278 40.5013374405821) +SRID=4326;POINT(-74.0037635784166 40.281496884161) +SRID=4326;POINT(-75.1286374176545 39.7797389049157) +SRID=4326;POINT(-74.5762901403345 40.8559759516931) +SRID=4326;POINT(-74.471604011296 40.5236906585584) +SRID=4326;POINT(-75.4689168308211 39.6968833405432) +SRID=4326;POINT(-75.1145861845469 39.7073923052699) +SRID=4326;POINT(-74.2264370070619 40.097265631898) +SRID=4326;POINT(-74.2676692563074 40.8352261535181) +SRID=4326;POINT(-74.4215203668643 40.7623218114581) +SRID=4326;POINT(-74.1866659762661 40.8998034100642) +SRID=4326;POINT(-74.2020187391775 40.9444882709968) +SRID=4326;POINT(-74.3186666343781 40.6680465043858) +SRID=4326;POINT(-74.8320596317961 40.8491289846152) +SRID=4326;POINT(-74.6440210088993 39.9663370779503) +SRID=4326;POINT(-74.2219402834656 40.0955914789703) +SRID=4326;POINT(-74.6037525547765 40.7550420759648) +SRID=4326;POINT(-74.0937601839477 40.8656933573938) +SRID=4326;POINT(-74.4430374038435 40.7779796708957) +SRID=4326;POINT(-74.7684170268848 40.2203845505135) +SRID=4326;POINT(-74.1907818170692 40.7391457350042) +SRID=4326;POINT(-74.1962844392096 40.7959141570767) +SRID=4326;POINT(-74.1913030602153 40.7433025340704) +SRID=4326;POINT(-74.1763630799173 40.7378312335961) +SRID=4326;POINT(-74.5314873084093 39.4902945583028) +SRID=4326;POINT(-74.1661805363699 40.7363486398646) +SRID=4326;POINT(-74.3573260684911 40.8007679302858) +SRID=4326;POINT(-74.175738107613 40.739014184128) +SRID=4326;POINT(-74.6649158055448 40.3457273489028) +SRID=4326;POINT(-74.3662532330176 40.5106137365591) +SRID=4326;POINT(-74.1763187562305 40.7432915904039) +SRID=4326;POINT(-74.4544664009795 40.5242723881507) +SRID=4326;POINT(-74.0283665597192 40.8975658415568) +SRID=4326;POINT(-75.0083397511195 39.828950258798) +SRID=4326;POINT(-74.131322206131 40.3316152829939) +SRID=4326;POINT(-74.6799952206869 39.4620385866371) +SRID=4326;POINT(-74.089048064364 40.9515804026451) +SRID=4326;POINT(-75.1209106831206 39.948269173363) +SRID=4326;POINT(-74.0862802471739 40.7092900894139) +SRID=4326;POINT(-74.7327024195039 40.2782515920201) +SRID=4326;POINT(-74.166253025519 40.0100043068591) +SRID=4326;POINT(-75.0183798167945 40.7447239779171) +SRID=4326;POINT(-74.6592065330517 40.3495109704881) +SRID=4326;POINT(-74.2475114317585 40.7443412217661) +SRID=4326;POINT(-74.6512248373311 40.2515163382374) +SRID=4326;POINT(-74.4388020498734 40.4659008042765) +SRID=4326;POINT(-74.2355416979212 40.6823146575315) +SRID=4326;POINT(-74.4989293530261 40.8076383297078) +SRID=4326;POINT(-74.0625761975525 40.730860622102) +SRID=4326;POINT(-75.0360016411836 39.7865925067785) +SRID=4326;POINT(-75.0559164322449 39.4408494224676) +SRID=4326;POINT(-74.3980433283988 40.5008690729166) +SRID=4326;POINT(-74.0713156694971 40.7272019085633) +SRID=4326;POINT(-74.1911791861303 40.74196292555) +SRID=4326;POINT(-74.0249426200977 40.7467647928254) +SRID=4326;POINT(-74.6889466759021 40.6094748964853) +SRID=4326;POINT(-74.4460022558052 40.4982588384806) +SRID=4326;POINT(-74.1989899066972 40.8577957099564) +SRID=4326;POINT(-74.7828046028598 40.2709499874636) +SRID=4326;POINT(-74.2501753633496 40.2174320022036) +SRID=4326;POINT(-74.1696055057822 40.9184432569361) +SRID=4326;POINT(-74.7578885232985 41.0675476294562) +SRID=4326;POINT(-74.0336372902925 40.7268907140288) +SRID=4326;POINT(-74.5760699023125 40.537431636642) +SRID=4326;POINT(-74.4392566663643 40.7735918687515) diff --git a/regress/loader/ReprojectPtsGeog-w.select.expected b/regress/loader/ReprojectPtsGeog-w.select.expected index 23abda98a..78557b99f 100644 --- a/regress/loader/ReprojectPtsGeog-w.select.expected +++ b/regress/loader/ReprojectPtsGeog-w.select.expected @@ -1,66 +1,66 @@ -SRID=4326;POINT(-74.1778249234186 41.0826336069621) -SRID=4326;POINT(-74.4488128587284 40.5013374405831) -SRID=4326;POINT(-74.0037635784151 40.2814968841599) -SRID=4326;POINT(-75.1286374176544 39.779738904917) -SRID=4326;POINT(-74.5762901403342 40.8559759516941) -SRID=4326;POINT(-74.4716040112965 40.5236906585587) -SRID=4326;POINT(-75.4689168308202 39.6968833405426) -SRID=4326;POINT(-75.1145861845468 39.7073923052707) -SRID=4326;POINT(-74.2264370070618 40.097265631898) -SRID=4326;POINT(-74.267669256308 40.835226153518) -SRID=4326;POINT(-74.4215203668629 40.7623218114584) -SRID=4326;POINT(-74.1866659762657 40.8998034100653) -SRID=4326;POINT(-74.2020187391779 40.9444882709976) -SRID=4326;POINT(-74.318666634379 40.668046504386) -SRID=4326;POINT(-74.8320596317968 40.8491289846163) -SRID=4326;POINT(-74.6440210088998 39.9663370779506) -SRID=4326;POINT(-74.2219402834666 40.0955914789689) -SRID=4326;POINT(-74.6037525547762 40.7550420759644) -SRID=4326;POINT(-74.0937601839482 40.8656933573937) -SRID=4326;POINT(-74.4430374038438 40.7779796708969) -SRID=4326;POINT(-74.7684170268845 40.2203845505147) -SRID=4326;POINT(-74.1907818170678 40.739145735004) -SRID=4326;POINT(-74.1962844392102 40.7959141570767) -SRID=4326;POINT(-74.1913030602141 40.7433025340713) -SRID=4326;POINT(-74.1763630799163 40.737831233597) -SRID=4326;POINT(-74.5314873084103 39.4902945583041) -SRID=4326;POINT(-74.1661805363706 40.7363486398654) -SRID=4326;POINT(-74.3573260684924 40.8007679302865) -SRID=4326;POINT(-74.1757381076133 40.7390141841291) -SRID=4326;POINT(-74.6649158055449 40.3457273489041) -SRID=4326;POINT(-74.3662532330192 40.5106137365586) -SRID=4326;POINT(-74.1763187562297 40.7432915904029) -SRID=4326;POINT(-74.4544664009791 40.5242723881508) -SRID=4326;POINT(-74.0283665597175 40.8975658415575) -SRID=4326;POINT(-75.0083397511198 39.8289502587993) -SRID=4326;POINT(-74.1313222061323 40.3316152829947) -SRID=4326;POINT(-74.6799952206859 39.4620385866365) -SRID=4326;POINT(-74.0890480643623 40.9515804026446) -SRID=4326;POINT(-75.1209106831221 39.9482691733624) -SRID=4326;POINT(-74.0862802471739 40.7092900894149) -SRID=4326;POINT(-74.7327024195045 40.2782515920205) -SRID=4326;POINT(-74.1662530255196 40.01000430686) -SRID=4326;POINT(-75.0183798167935 40.7447239779165) -SRID=4326;POINT(-74.6592065330533 40.3495109704879) -SRID=4326;POINT(-74.2475114317579 40.744341221767) -SRID=4326;POINT(-74.6512248373302 40.2515163382362) -SRID=4326;POINT(-74.4388020498744 40.4659008042768) -SRID=4326;POINT(-74.2355416979199 40.6823146575314) -SRID=4326;POINT(-74.4989293530256 40.8076383297076) -SRID=4326;POINT(-74.0625761975523 40.7308606221026) -SRID=4326;POINT(-75.0360016411834 39.7865925067772) -SRID=4326;POINT(-75.0559164322449 39.4408494224665) -SRID=4326;POINT(-74.3980433283985 40.5008690729179) -SRID=4326;POINT(-74.0713156694968 40.7272019085637) -SRID=4326;POINT(-74.1911791861301 40.7419629255487) -SRID=4326;POINT(-74.0249426200973 40.7467647928245) -SRID=4326;POINT(-74.688946675902 40.6094748964846) -SRID=4326;POINT(-74.4460022558058 40.49825883848) -SRID=4326;POINT(-74.198989906698 40.8577957099556) -SRID=4326;POINT(-74.7828046028596 40.2709499874624) -SRID=4326;POINT(-74.2501753633512 40.2174320022045) -SRID=4326;POINT(-74.169605505782 40.9184432569356) -SRID=4326;POINT(-74.7578885232984 41.0675476294558) -SRID=4326;POINT(-74.0336372902943 40.7268907140294) -SRID=4326;POINT(-74.5760699023108 40.537431636642) -SRID=4326;POINT(-74.4392566663626 40.7735918687511) +SRID=4326;POINT(-74.1778249234186 41.0826336069609) +SRID=4326;POINT(-74.4488128587278 40.5013374405821) +SRID=4326;POINT(-74.0037635784166 40.281496884161) +SRID=4326;POINT(-75.1286374176545 39.7797389049157) +SRID=4326;POINT(-74.5762901403345 40.8559759516931) +SRID=4326;POINT(-74.471604011296 40.5236906585584) +SRID=4326;POINT(-75.4689168308211 39.6968833405432) +SRID=4326;POINT(-75.1145861845469 39.7073923052699) +SRID=4326;POINT(-74.2264370070619 40.097265631898) +SRID=4326;POINT(-74.2676692563074 40.8352261535181) +SRID=4326;POINT(-74.4215203668643 40.7623218114581) +SRID=4326;POINT(-74.1866659762661 40.8998034100642) +SRID=4326;POINT(-74.2020187391775 40.9444882709968) +SRID=4326;POINT(-74.3186666343781 40.6680465043858) +SRID=4326;POINT(-74.8320596317961 40.8491289846152) +SRID=4326;POINT(-74.6440210088993 39.9663370779503) +SRID=4326;POINT(-74.2219402834656 40.0955914789703) +SRID=4326;POINT(-74.6037525547765 40.7550420759648) +SRID=4326;POINT(-74.0937601839477 40.8656933573938) +SRID=4326;POINT(-74.4430374038435 40.7779796708957) +SRID=4326;POINT(-74.7684170268848 40.2203845505135) +SRID=4326;POINT(-74.1907818170692 40.7391457350042) +SRID=4326;POINT(-74.1962844392096 40.7959141570767) +SRID=4326;POINT(-74.1913030602153 40.7433025340704) +SRID=4326;POINT(-74.1763630799173 40.7378312335961) +SRID=4326;POINT(-74.5314873084093 39.4902945583028) +SRID=4326;POINT(-74.1661805363699 40.7363486398646) +SRID=4326;POINT(-74.3573260684911 40.8007679302858) +SRID=4326;POINT(-74.175738107613 40.739014184128) +SRID=4326;POINT(-74.6649158055448 40.3457273489028) +SRID=4326;POINT(-74.3662532330176 40.5106137365591) +SRID=4326;POINT(-74.1763187562305 40.7432915904039) +SRID=4326;POINT(-74.4544664009795 40.5242723881507) +SRID=4326;POINT(-74.0283665597192 40.8975658415568) +SRID=4326;POINT(-75.0083397511195 39.828950258798) +SRID=4326;POINT(-74.131322206131 40.3316152829939) +SRID=4326;POINT(-74.6799952206869 39.4620385866371) +SRID=4326;POINT(-74.089048064364 40.9515804026451) +SRID=4326;POINT(-75.1209106831206 39.948269173363) +SRID=4326;POINT(-74.0862802471739 40.7092900894139) +SRID=4326;POINT(-74.7327024195039 40.2782515920201) +SRID=4326;POINT(-74.166253025519 40.0100043068591) +SRID=4326;POINT(-75.0183798167945 40.7447239779171) +SRID=4326;POINT(-74.6592065330517 40.3495109704881) +SRID=4326;POINT(-74.2475114317585 40.7443412217661) +SRID=4326;POINT(-74.6512248373311 40.2515163382374) +SRID=4326;POINT(-74.4388020498734 40.4659008042765) +SRID=4326;POINT(-74.2355416979212 40.6823146575315) +SRID=4326;POINT(-74.4989293530261 40.8076383297078) +SRID=4326;POINT(-74.0625761975525 40.730860622102) +SRID=4326;POINT(-75.0360016411836 39.7865925067785) +SRID=4326;POINT(-75.0559164322449 39.4408494224676) +SRID=4326;POINT(-74.3980433283988 40.5008690729166) +SRID=4326;POINT(-74.0713156694971 40.7272019085633) +SRID=4326;POINT(-74.1911791861303 40.74196292555) +SRID=4326;POINT(-74.0249426200977 40.7467647928254) +SRID=4326;POINT(-74.6889466759021 40.6094748964853) +SRID=4326;POINT(-74.4460022558052 40.4982588384806) +SRID=4326;POINT(-74.1989899066972 40.8577957099564) +SRID=4326;POINT(-74.7828046028598 40.2709499874636) +SRID=4326;POINT(-74.2501753633496 40.2174320022036) +SRID=4326;POINT(-74.1696055057822 40.9184432569361) +SRID=4326;POINT(-74.7578885232985 41.0675476294562) +SRID=4326;POINT(-74.0336372902925 40.7268907140288) +SRID=4326;POINT(-74.5760699023125 40.537431636642) +SRID=4326;POINT(-74.4392566663643 40.7735918687515)