From: Mark Cave-Ayland Date: Wed, 24 Jun 2009 11:18:00 +0000 (+0000) Subject: Remove validation from shapefile to WKT/WKB conversion to retain same behaviour as... X-Git-Tag: 1.5.0b1~632 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2adac1fd40a21dd792ff3457baa9ab073692ef6c;p=postgis Remove validation from shapefile to WKT/WKB conversion to retain same behaviour as 1.3. Final resolution for #198. git-svn-id: http://svn.osgeo.org/postgis/trunk@4203 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/loader/shp2pgsql-core.c b/loader/shp2pgsql-core.c index 91f058a04..a28025851 100644 --- a/loader/shp2pgsql-core.c +++ b/loader/shp2pgsql-core.c @@ -988,7 +988,7 @@ InsertLineString() serialized_lwgeom = lwgeom_serialize(lwmultilinestrings[0]); } - result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL, -1); + result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE, -1); if (result) { @@ -1280,7 +1280,7 @@ InsertPolygon(void) serialized_lwgeom = lwgeom_serialize(lwpolygons[0]); } - result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL, -1); + result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE, -1); if (result) { @@ -1367,7 +1367,7 @@ InsertPoint(void) serialized_lwgeom = lwgeom_serialize(lwmultipoints[0]); } - result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL, -1); + result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE, -1); if (result) { diff --git a/loader/shp2pgsql.c b/loader/shp2pgsql.c index d58429c40..49007a8d9 100644 --- a/loader/shp2pgsql.c +++ b/loader/shp2pgsql.c @@ -894,9 +894,9 @@ InsertLineString() } if (!hwgeom) - result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL, -1); + result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE, -1); else - result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL); + result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE); if (result) { @@ -1187,9 +1187,9 @@ InsertPolygon(void) } if (!hwgeom) - result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL, -1); + result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE, -1); else - result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL); + result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE); if (result) { @@ -1277,9 +1277,9 @@ InsertPoint(void) } if (!hwgeom) - result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL, -1); + result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE, -1); else - result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_ALL); + result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, serialized_lwgeom, PARSER_CHECK_NONE); if (result) {