Fix regression tests to account for changes made in r3522 (rename 'Curve' to 'Circula...

git-svn-id: http://svn.osgeo.org/postgis/trunk@3525 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/regress/geojson_expected b/regress/geojson_expected
index 6b21f0ad0fd7ec6756c124242292fc1df7106c88..153b7e89e261ea7d5742e9acf9c292db182b905f 100644 (file)
--- a/regress/geojson_expected
+++ b/regress/geojson_expected
@@ -52,7 +52,7 @@ geometrycollection_02|{"type":"GeometryCollection","geometries":[{"type":"MultiP
 geometrycollection_03|{"type":"GeometryCollection","bbox":[3428545,5789755,3440688,5799491],"geometries":[{"type":"MultiPoint","bbox":[3433276,5795309,3433276,5795309],"coordinates":[[3433276,5795309],[3428545,5795828],[3431577,5799084],[3431724,5797153],[3431984,5796565],[3435148,5797650],[3434661,5796942],[3434675,5797031],[3435714,5797023],[3436369,5796951],[3436730,5796769],[3435539,5796267],[3435847,5795918],[3434312,5794846],[3433122,5793671],[3433176,5793489],[3434316,5793940],[3433223,5793040],[3433416,5792892],[3430717,5792601],[3435384,5792878],[3435229,5792177],[3435120,5792319],[3435089,5792111],[3434485,5792110],[3435778,5792419],[3435717,5794318],[3436895,5794569],[3437622,5793932],[3435597,5793468],[3435247,5793395],[3434722,5793375],[3434712,5793810],[3434773,5793817],[3434630,5793855],[3434992,5794140],[3434927,5794252],[3434959,5794286],[3435120,5794163],[3435850,5791727],[3435931,5791636],[3436269,5791883],[3437110,5791664],[3435960,5790928],[3433546,5789755],[3439097,5790884],[3438577,5795047],[3438397,5794859],[3438193,5794696],[3438448,5796131],[3440688,5793670]]},{"type":"MultiLineString","bbox":[3429563,5798013,3431645,5799491],"coordinates":[[[3429563,5799491],[3429751,5799200],[3429825,5799078],[3429902,5798961],[3429996,5798823],[3430073,5798719],[3430216,5798559],[3430272,5798489],[3430394,5798329],[3430464,5798251],[3430532,5798190],[3430591,5798150],[3430668,5798109],[3430724,5798089],[3430797,5798068],[3430857,5798056],[3430913,5798052],[3430962,5798049],[3431053,5798053],[3431159,5798059],[3431218,5798061],[3431367,5798056],[3431474,5798044],[3431568,5798029],[3431645,5798013]],[[3433260,5797003],[3433235,5797070],[3433139,5797279],[3433074,5797399],[3433034,5797462],[3432961,5797552],[3432883,5797627],[3432780,5797701],[3432706,5797743],[3432543,5797808],[3432360,5797842],[3432259,5797837],[3432198,5797838],[3432082,5797866],[3431877,5797945],[3431865,5797949]],[[3431865,5797949],[3431645,5798013]],[[3431865,5797949],[3431816,5797808]],[[3433260,5797003],[3433361,5796789],[3433467,5796573],[3433671,5796160]],[[3433671,5796160],[3433709,5796097],[3433744,5796022],[3433862,5795869],[3434029,5795680],[3434229,5795456],[3434239,5795425],[3434296,5795363]]]}]}
 geometrycollection_04|{"type":"GeometryCollection","bbox":[3428545,5789755,3440688,5799491],"geometries":[{"type":"MultiPoint","bbox":[3433276,5795309,3433276,5795309],"coordinates":[[3433276,5795309],[3428545,5795828],[3431577,5799084],[3431724,5797153],[3431984,5796565],[3435148,5797650],[3434661,5796942],[3434675,5797031],[3435714,5797023],[3436369,5796951],[3436730,5796769],[3435539,5796267],[3435847,5795918],[3434312,5794846],[3433122,5793671],[3433176,5793489],[3434316,5793940],[3433223,5793040],[3433416,5792892],[3430717,5792601],[3435384,5792878],[3435229,5792177],[3435120,5792319],[3435089,5792111],[3434485,5792110],[3435778,5792419],[3435717,5794318],[3436895,5794569],[3437622,5793932],[3435597,5793468],[3435247,5793395],[3434722,5793375],[3434712,5793810],[3434773,5793817],[3434630,5793855],[3434992,5794140],[3434927,5794252],[3434959,5794286],[3435120,5794163],[3435850,5791727],[3435931,5791636],[3436269,5791883],[3437110,5791664],[3435960,5790928],[3433546,5789755],[3439097,5790884],[3438577,5795047],[3438397,5794859],[3438193,5794696],[3438448,5796131],[3440688,5793670]]},{"type":"MultiLineString","bbox":[3429563,5798013,3431645,5799491],"coordinates":[[[3429563,5799491],[3429751,5799200],[3429825,5799078],[3429902,5798961],[3429996,5798823],[3430073,5798719],[3430216,5798559],[3430272,5798489],[3430394,5798329],[3430464,5798251],[3430532,5798190],[3430591,5798150],[3430668,5798109],[3430724,5798089],[3430797,5798068],[3430857,5798056],[3430913,5798052],[3430962,5798049],[3431053,5798053],[3431159,5798059],[3431218,5798061],[3431367,5798056],[3431474,5798044],[3431568,5798029],[3431645,5798013]],[[3433260,5797003],[3433235,5797070],[3433139,5797279],[3433074,5797399],[3433034,5797462],[3432961,5797552],[3432883,5797627],[3432780,5797701],[3432706,5797743],[3432543,5797808],[3432360,5797842],[3432259,5797837],[3432198,5797838],[3432082,5797866],[3431877,5797945],[3431865,5797949]],[[3431865,5797949],[3431645,5798013]],[[3431865,5797949],[3431816,5797808]],[[3433260,5797003],[3433361,5796789],[3433467,5796573],[3433671,5796160]],[[3433671,5796160],[3433709,5796097],[3433744,5796022],[3433862,5795869],[3434029,5795680],[3434229,5795456],[3434239,5795425],[3434296,5795363]]]}]}
 geometrycollection_05|{"type":"GeometryCollection","crs":{"type":"EPSG","properties":{"EPSG":31467}},"bbox":[3428545,5789755,3440688,5799491],"geometries":[{"type":"MultiPoint","bbox":[3433276,5795309,3433276,5795309],"coordinates":[[3433276,5795309],[3428545,5795828],[3431577,5799084],[3431724,5797153],[3431984,5796565],[3435148,5797650],[3434661,5796942],[3434675,5797031],[3435714,5797023],[3436369,5796951],[3436730,5796769],[3435539,5796267],[3435847,5795918],[3434312,5794846],[3433122,5793671],[3433176,5793489],[3434316,5793940],[3433223,5793040],[3433416,5792892],[3430717,5792601],[3435384,5792878],[3435229,5792177],[3435120,5792319],[3435089,5792111],[3434485,5792110],[3435778,5792419],[3435717,5794318],[3436895,5794569],[3437622,5793932],[3435597,5793468],[3435247,5793395],[3434722,5793375],[3434712,5793810],[3434773,5793817],[3434630,5793855],[3434992,5794140],[3434927,5794252],[3434959,5794286],[3435120,5794163],[3435850,5791727],[3435931,5791636],[3436269,5791883],[3437110,5791664],[3435960,5790928],[3433546,5789755],[3439097,5790884],[3438577,5795047],[3438397,5794859],[3438193,5794696],[3438448,5796131],[3440688,5793670]]},{"type":"MultiLineString","bbox":[3429563,5798013,3431645,5799491],"coordinates":[[[3429563,5799491],[3429751,5799200],[3429825,5799078],[3429902,5798961],[3429996,5798823],[3430073,5798719],[3430216,5798559],[3430272,5798489],[3430394,5798329],[3430464,5798251],[3430532,5798190],[3430591,5798150],[3430668,5798109],[3430724,5798089],[3430797,5798068],[3430857,5798056],[3430913,5798052],[3430962,5798049],[3431053,5798053],[3431159,5798059],[3431218,5798061],[3431367,5798056],[3431474,5798044],[3431568,5798029],[3431645,5798013]],[[3433260,5797003],[3433235,5797070],[3433139,5797279],[3433074,5797399],[3433034,5797462],[3432961,5797552],[3432883,5797627],[3432780,5797701],[3432706,5797743],[3432543,5797808],[3432360,5797842],[3432259,5797837],[3432198,5797838],[3432082,5797866],[3431877,5797945],[3431865,5797949]],[[3431865,5797949],[3431645,5798013]],[[3431865,5797949],[3431816,5797808]],[[3433260,5797003],[3433361,5796789],[3433467,5796573],[3433671,5796160]],[[3433671,5796160],[3433709,5796097],[3433744,5796022],[3433862,5795869],[3434029,5795680],[3434229,5795456],[3434239,5795425],[3434296,5795363]]]}]}
-ERROR:  GeoJson: 'Curve' geometry type not supported.
+ERROR:  GeoJson: 'CircularString' geometry type not supported.
 ERROR:  GeoJson: 'CompoundString' geometry type not supported.
 ERROR:  GeoJson: 'CurvePolygon' geometry type not supported.
 ERROR:  GeoJson: 'MultiCurve' geometry type not supported.

diff --git a/regress/kml_expected b/regress/kml_expected
index 0c14632e4f4865071a71ab0a0a24b738e00431f4..b2f8833ede2d4a9e99dfb6c32698aa7ee006b1ff 100644 (file)
--- a/regress/kml_expected
+++ b/regress/kml_expected
@@ -1,6 +1,6 @@
 ERROR:  AddToPROJ4SRSCache: Cannot find SRID (4326) in spatial_ref_sys
 ERROR:  Input geometry has unknown (-1) SRID
-ERROR:  geometry_to_kml: 'Curve' geometry type not supported by Google Earth
+ERROR:  geometry_to_kml: 'CircularString' geometry type not supported by Google Earth
 ERROR:  geometry_to_kml: 'CompoundString' geometry type not supported by Google Earth
 ERROR:  geometry_to_kml: 'CurvePolygon' geometry type not supported by Google Earth
 ERROR:  geometry_to_kml: 'MultiCurve' geometry type not supported by Google Earth
@@ -20,7 +20,7 @@ ERROR:  Only KML 2 is supported
 <Point><coordinates>-73.1978481045547,6.76797715816346</coordinates></Point>
 <Point><coordinates>-74.0775046875181,4.59620005298432</coordinates></Point>
 ERROR:  Input geometry has unknown (-1) SRID
-ERROR:  geometry_to_kml: 'Curve' geometry type not supported by Google Earth
+ERROR:  geometry_to_kml: 'CircularString' geometry type not supported by Google Earth
 ERROR:  geometry_to_kml: 'CompoundString' geometry type not supported by Google Earth
 ERROR:  geometry_to_kml: 'CurvePolygon' geometry type not supported by Google Earth
 ERROR:  geometry_to_kml: 'MultiCurve' geometry type not supported by Google Earth