mloskot · September 30, 2023 16:19 · Dec 11, 2013 · Dec 4, 2013 · Nov 15, 2013 · Nov 13, 2013
diff --git a/postgis_formats_test.sql b/postgis_formats_test.sql
@@ -4,6 +4,25 @@ ST_AsText(g),
 --ST_AsGeoJSON(g),
 encode(ST_AsBinary(g), 'hex')
 FROM (SELECT 
+------------ EMPTY by PostGIS and SQL Server:
+------------ http://blog.cleverelephant.ca/2010/03/nothing-nada-zip-bupkus.html
+------ OGC 1.0
+--'POINT EMPTY'::geometry --"010400000000000000"
+--'LINESTRING EMPTY'::geometry --"010200000000000000"
+--'POLYGON EMPTY'::geometry --"010300000000000000"
+--'MULTIPOINT EMPTY'::geometry --"010400000000000000"
+--'MULTILINESTRING EMPTY'::geometry --"010500000000000000"
+--'MULTIPOLYGON EMPTY'::geometry --"010600000000000000"
+--'GEOMETRYCOLLECTION EMPTY'::geometry --"010700000000000000"
+------ SQL/MM + OGC 1.2+
+--'CIRCULARSTRING EMPTY'::geometry --"010800000000000000"
+--'COMPOUNDCURVE EMPTY'::geometry --"010900000000000000"
+--'MULTICURVE EMPTY'::geometry --"010b00000000000000"
+--'CURVEPOLYGON EMPTY'::geometry --"010a00000000000000"
+--'MULTISURFACE EMPTY'::geometry --"010c00000000000000"
+--'POLYHEDRALSURFACE EMPTY'::geometry --"010f00000000000000"
+--'TIN EMPTY'::geometry --"011000000000000000"
+------------ Miscellaneous
 --'POINT (2 4)'::geometry
 --'POINT Z (2 4 99)'::geometry
 --'POINT Z(30 10 99)'::geometry
@@ -32,6 +51,8 @@ FROM (SELECT
 --'CIRCULARSTRING(1 5, 6 2, 7 3)'::geometry
 --'CIRCULARSTRING Z(16.6766014097188 3.43358367065917 0,16.8327680831925 3.37080305999423 0,16.834876007397 3.20250275804901 0)'::geometry
 --'COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))'::geometry
+--'MULTICURVE((5 5,3 5,3 3,0 3),CIRCULARSTRING(0 0,2 1,2 2))'::geometry
+--'CURVEPOLYGON(CIRCULARSTRING(-2 0,-1 -1,0 0,1 -1,2 0,0 2,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))'::geometry
 --'CURVEPOLYGON Z(COMPOUNDCURVE Z((17.8147981115353 2.71152512038783 0,17.8147981115353 2.30414709002736 0,18.1863626886773 2.30414709002736 0),CIRCULARSTRING Z(18.1863626886773 2.30414709002736 0,18.2299678694879 2.71705764321499 0,17.8147981115353 2.71152512038783 0)))'::geometry
 --'MULTISURFACE (CURVEPOLYGON (COMPOUNDCURVE ((14.8154214044856 1.62369147887578,14.8154214044856 1.21631344851531,15.1869859816276 1.21631344851531),CIRCULARSTRING (15.1869859816276 1.21631344851531,15.2305911624382 1.62922400170295,14.8154214044856 1.62369147887578)),(15.1735559366707 1.63264484218043,15.1735559366707 1.52072780087259,15.0616388953628 1.52072780087259,15.0616388953628 1.63264484218043,15.1735559366707 1.63264484218043),CIRCULARSTRING (14.878094947618 1.45805425774022,14.963151899012 1.46700762104484,14.9721052623166 1.38195066965089,14.8870483109227 1.37299730634627,14.878094947618 1.45805425774022),COMPOUNDCURVE (CIRCULARSTRING (15.1511725284091 1.37747398799858,15.1293747852776 1.30215500987973,15.0571622137106 1.33270717147545),(15.0571622137106 1.33270717147545,15.0929756669291 1.44014753113096,15.1511725284091 1.37747398799858))),((14.6384032547087 1.32643682103399,14.5845898914981 1.09535590842381,14.7365335052692 1.18082419117005,14.6384032547087 1.32643682103399)),((14.7575898130455 1.80043970494728,14.4707169172576 1.80043970494728,14.4707169172576 1.44678185441455,14.7575898130455 1.44678185441455,14.7575898130455 1.80043970494728),(14.7083463148701 1.68404598198714,14.7083463148701 1.54526885076544,14.5203256854729 1.54526885076544,14.5203256854729 1.68404598198714,14.7083463148701 1.68404598198714)))'::geometry
 --'MULTISURFACE Z(CURVEPOLYGON Z(COMPOUNDCURVE Z((14.8154214044856 1.62369147887578 0,14.8154214044856 1.21631344851531 0,15.1869859816276 1.21631344851531 0),CIRCULARSTRING Z(15.1869859816276 1.21631344851531 0,15.2305911624382 1.62922400170295 0,14.8154214044856 1.62369147887578 0)),(15.1735559366707 1.63264484218043 0,15.1735559366707 1.52072780087259 0,15.0616388953628 1.52072780087259 0,15.0616388953628 1.63264484218043 0,15.1735559366707 1.63264484218043 0),CIRCULARSTRING Z(14.878094947618 1.45805425774022 0,14.963151899012 1.46700762104484 0,14.9721052623166 1.38195066965089 0,14.8870483109227 1.37299730634627 0,14.878094947618 1.45805425774022 0),COMPOUNDCURVE Z(CIRCULARSTRING Z(15.1511725284091 1.37747398799858 0,15.1293747852776 1.30215500987973 0,15.0571622137106 1.33270717147545 0),(15.0571622137106 1.33270717147545 0,15.0929756669291 1.44014753113096 0,15.1511725284091 1.37747398799858 0))),((14.6384032547087 1.32643682103399 0,14.5845898914981 1.09535590842381 0,14.7365335052692 1.18082419117005 0,14.6384032547087 1.32643682103399 0)),((14.7575898130455 1.80043970494728 0,14.4707169172576 1.80043970494728 0,14.4707169172576 1.44678185441455 0,14.7575898130455 1.44678185441455 0,14.7575898130455 1.80043970494728 0),(14.7083463148701 1.68404598198714 0,14.7083463148701 1.54526885076544 0,14.5203256854729 1.54526885076544 0,14.5203256854729 1.68404598198714 0,14.7083463148701 1.68404598198714 0)))'::geometry
@@ -78,4 +99,8 @@ FROM (SELECT
 --ST_GeomFromWKB(decode('01100000000600000001030000000100000004000000a45c2fdf40bb1bc024807fb7604827404cebf9c01dc142c000bc23d8350fc3bf99bee5bb1e1236c0f8be7c63762c2fc0a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274099bee5bb1e1236c0f8be7c63762c2fc060a7e7c71383434098ce6898693b2bc0a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274060a7e7c71383434098ce6898693b2bc008c3da5f154a4740a02a79ba7c702140a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274008c3da5f154a4740a02a79ba7c702140cfc02ac63acc3f40d85a365ac2c44540a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb760482740cfc02ac63acc3f40d85a365ac2c44540c081cf621bf5d03f428ee1bc084f4e40a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb760482740c081cf621bf5d03f428ee1bc084f4e40c090005a771144c0567e9f8c3d934740a45c2fdf40bb1bc024807fb760482740', 'hex'))
 --'POLYHEDRALSURFACE (((-54.8342450573701 -40.6182068194833,-45.3087081960562 -2.84452616254895,-60.7466472471511 8.98027821701309,-54.8342450573701 -40.6182068194833)),((-73.2283852033555 -45.2167418559796,-54.8342450573701 -40.6182068194833,-60.7466472471511 8.98027821701309,-73.2283852033555 -45.2167418559796)),((-73.2283852033555 -45.2167418559796,-60.7466472471511 8.98027821701309,-112.315933013574 14.5642136184729,-73.2283852033555 -45.2167418559796)),((-112.315933013574 14.5642136184729,-136.29400856102 -18.610932001965,-73.2283852033555 -45.2167418559796,-112.315933013574 14.5642136184729)))'::geometry
 --ST_GeomFromWKB(decode('010f00000004000000010300000001000000040000008820c38ac86a4bc021ecab66214f44c0c8080bc083a746c0f01cc6ee96c106c0c8141223925f4ec0d81ac606e7f521408820c38ac86a4bc021ecab66214f44c00103000000010000000400000056d3f8dc9d4e52c0a98d7732be9b46c08820c38ac86a4bc021ecab66214f44c0c8141223925f4ec0d81ac606e7f5214056d3f8dc9d4e52c0a98d7732be9b46c00103000000010000000400000056d3f8dc9d4e52c0a98d7732be9b46c0c8141223925f4ec0d81ac606e7f52140db411a3f38145cc028997e9be0202d4056d3f8dc9d4e52c0a98d7732be9b46c001030000000100000004000000db411a3f38145cc028997e9be0202d405b4aa484680961c0fe84280a669c32c056d3f8dc9d4e52c0a98d7732be9b46c0db411a3f38145cc028997e9be0202d40', 'hex'))
+--'GEOMETRYCOLLECTION (TIN (((0 0, 0 1, 1 0, 0 0)), ((0 1, 1 1, 1 0, 0 1))))'::geometry
+--'GEOMETRYCOLLECTION (POLYGON ((30 10,10 20,10 20,40 40,30 10)),TIN (((0 0, 0 1, 1 0, 0 0)), ((0 1, 1 1, 1 0, 0 1))))'::geometry
+--'GEOMETRYCOLLECTION (POLYGON ((30 10,10 20,10 20,40 40,30 10)),TIN (((0 0, 0 1, 1 0, 0 0)), ((0 1, 1 1, 1 0, 0 1))), TRIANGLE((0 0,0 1,1 1,0 0)))'::geometry
+--'GEOMETRYCOLLECTION (POLYGON ((30 10,10 20,10 20,40 40,30 10)),TIN (((0 0, 0 1, 1 0, 0 0)), ((0 1, 1 1, 1 0, 0 1))), TRIANGLE((0 0,0 1,1 1,0 0)), TIN EMPTY)'::geometry
 AS g) AS t
diff --git a/postgis_formats_test.sql b/postgis_formats_test.sql
@@ -5,14 +5,30 @@ ST_AsText(g),
 encode(ST_AsBinary(g), 'hex')
 FROM (SELECT 
 --'POINT (2 4)'::geometry
+--'POINT Z (2 4 99)'::geometry
 --'POINT Z(30 10 99)'::geometry
 --'POINT M(30 10 99)'::geometry
 --'MULTIPOINT((2 4),(6 8))'::geometry
---'POLYGON((30 10,10 20,10 20,40 40,30 10))'::geometry
+--'MULTIPOINT(2 4,6 8)'::geometry -- NOT VALID per OGC 1.2.0
 --'LINESTRING(2 4,6 8)'::geometry
 --'MULTILINESTRING((10 10,20 20,10 40),(40 40,30 30,40 20,30 10))'::geometry
---'GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))'::geometry
+--'POLYGON EMPTY'::geometry
+--'POLYGON((30 10,10 20,10 20,40 40,30 10))'::geometry
+--'POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),(20 30, 35 35, 30 20, 20 30))'::geometry
+--'POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),EMPTY,(20 30, 35 35, 30 20, 20 30))'::geometry
+--'POLYGON (EMPTY, (35 10, 45 45, 15 40, 10 20, 35 10),EMPTY,(20 30, 35 35, 30 20, 20 30))'::geometry
+--'POLYGON ((35 10, 45 45, 15 40, 10 20, 35 10),EMPTY,(20 30, 35 35, 30 20, 20 30),    EMPTY)'::geometry
+--'POLYGON (EMPTY,EMPTY,EMPTY)'::geometry
+--'MULTIPOLYGON EMPTY'::geometry
+--'MULTIPOLYGON (EMPTY, EMPTY)'::geometry
+--'MULTIPOLYGON (((40 40, 20 45, 45 30, 40 40)),((20 35, 10 30, 10 10, 30 5, 45 20, 20 35), (30 20, 20 15, 20 25, 30 20)))'::geometry
+--'MULTIPOLYGON (EMPTY,((40 40, 20 45, 45 30, 40 40)),EMPTY,((30 20, 20 15, 20 25, 30 20)))'::geometry
+--'GEOMETRYCOLLECTION EMPTY'::geometry
+--'GEOMETRYCOLLECTION(POINT EMPTY, LINESTRING(4 6,7 10), POLYGON EMPTY)'::geometry
+--'GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(4 6,7 10), POLYGON((30 10,10 20,10 20,40 40,30 10)))'::geometry
+--'GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(4 6,7 10))'::geometry
 --'GEOMETRYCOLLECTION Z(POINT Z(30 10 99),LINESTRING Z(2 4 99,6 8 99))'::geometry
+--'GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(4 6,7 10), CIRCULARSTRING(1 5, 6 2, 7 3))'::geometry
 --'CIRCULARSTRING(1 5, 6 2, 7 3)'::geometry
 --'CIRCULARSTRING Z(16.6766014097188 3.43358367065917 0,16.8327680831925 3.37080305999423 0,16.834876007397 3.20250275804901 0)'::geometry
 --'COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))'::geometry
@@ -54,10 +70,11 @@ FROM (SELECT
 --'CURVEPOLYGON (COMPOUNDCURVE ((17.8147981115353 2.71152512038783,17.8147981115353 2.30414709002736,18.1863626886773 2.30414709002736),CIRCULARSTRING (18.1863626886773 2.30414709002736,18.2299678694879 2.71705764321499,17.8147981115353 2.71152512038783)))'::geometry
 --'CURVEPOLYGON (COMPOUNDCURVE ((17.8550882464061 1.55206457243878,17.8550882464061 1.1446865420783,18.2266528235481 1.1446865420783),CIRCULARSTRING (18.2266528235481 1.1446865420783,18.2702580043587 1.55759709526594,17.8550882464061 1.55206457243878)),(18.2132227785912 1.56101793574342,18.2132227785912 1.44910089443559,18.1013057372833 1.44910089443559,18.1013057372833 1.56101793574342,18.2132227785912 1.56101793574342))'::geometry
 --ST_GeomFromWKB(decode('010a0000000200000001090000000200000001020000000300000020823510e7da3140007a3ea941d5f83f20823510e7da3140c05ce6d5a250f23f68af60eb053a3240c05ce6d5a250f23f01080000000300000068af60eb053a3240c05ce6d5a250f23ff233eaa02f453240643088eeeaebf83f20823510e7da3140007a3ea941d5f83f010200000005000000b0cf9cc49536324080cc67f1edf9f83fb0cf9cc4953632408048636b842ff73f70873c2cef1932408048636b842ff73f70873c2cef19324080cc67f1edf9f83fb0cf9cc49536324080cc67f1edf9f83f', 'hex'))
---'TIN (((0 0 0, 0 0 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 0 0 0)))'::geometry
+--'TIN (((0 0, 0 1, 1 0, 0 0)), ((0 1, 1 1, 1 0, 0 1)))'::geometry
+--'TIN (((0 0, 0 1, 1 0)), ((0 1, 1 1, 1 0)))'::geometry -- ERROR:  triangle must have exactly 4 points
 --'TIN (((-6.93286465384077 11.641362890543,-37.5087205143269 -0.14890168241206,-22.070781463232 -15.5868407335069,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,-22.070781463232 -15.5868407335069,39.0240411645052 -13.6160400035799,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,39.0240411645052 -13.6160400035799,46.5787772958921 8.71970160225948,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,46.5787772958921 8.71970160225948,31.7977718214395 43.5371811643033,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,31.7977718214395 43.5371811643033,0.264960142607404 60.617454157004,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,0.264960142607404 60.617454157004,-40.1364548208962 47.1503158358361,-6.93286465384077 11.641362890543)))'::geometry
 --'TIN Z(((-6.93286465384077 11.641362890543 100,-37.5087205143269 -0.14890168241206 0,-22.070781463232 -15.5868407335069 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,-22.070781463232 -15.5868407335069 0,39.0240411645052 -13.6160400035799 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,39.0240411645052 -13.6160400035799 0,46.5787772958921 8.71970160225948 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,46.5787772958921 8.71970160225948 0,31.7977718214395 43.5371811643033 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,31.7977718214395 43.5371811643033 0,0.264960142607404 60.617454157004 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,0.264960142607404 60.617454157004 0,-40.1364548208962 47.1503158358361 0,-6.93286465384077 11.641362890543 100)))'::geometry
--- ERROR:  Tin cannot contain Polygon element
+--ERROR:  Tin cannot contain Polygon element
 --ST_GeomFromWKB(decode('01100000000600000001030000000100000004000000a45c2fdf40bb1bc024807fb7604827404cebf9c01dc142c000bc23d8350fc3bf99bee5bb1e1236c0f8be7c63762c2fc0a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274099bee5bb1e1236c0f8be7c63762c2fc060a7e7c71383434098ce6898693b2bc0a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274060a7e7c71383434098ce6898693b2bc008c3da5f154a4740a02a79ba7c702140a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274008c3da5f154a4740a02a79ba7c702140cfc02ac63acc3f40d85a365ac2c44540a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb760482740cfc02ac63acc3f40d85a365ac2c44540c081cf621bf5d03f428ee1bc084f4e40a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb760482740c081cf621bf5d03f428ee1bc084f4e40c090005a771144c0567e9f8c3d934740a45c2fdf40bb1bc024807fb760482740', 'hex'))
 --'POLYHEDRALSURFACE (((-54.8342450573701 -40.6182068194833,-45.3087081960562 -2.84452616254895,-60.7466472471511 8.98027821701309,-54.8342450573701 -40.6182068194833)),((-73.2283852033555 -45.2167418559796,-54.8342450573701 -40.6182068194833,-60.7466472471511 8.98027821701309,-73.2283852033555 -45.2167418559796)),((-73.2283852033555 -45.2167418559796,-60.7466472471511 8.98027821701309,-112.315933013574 14.5642136184729,-73.2283852033555 -45.2167418559796)),((-112.315933013574 14.5642136184729,-136.29400856102 -18.610932001965,-73.2283852033555 -45.2167418559796,-112.315933013574 14.5642136184729)))'::geometry
 --ST_GeomFromWKB(decode('010f00000004000000010300000001000000040000008820c38ac86a4bc021ecab66214f44c0c8080bc083a746c0f01cc6ee96c106c0c8141223925f4ec0d81ac606e7f521408820c38ac86a4bc021ecab66214f44c00103000000010000000400000056d3f8dc9d4e52c0a98d7732be9b46c08820c38ac86a4bc021ecab66214f44c0c8141223925f4ec0d81ac606e7f5214056d3f8dc9d4e52c0a98d7732be9b46c00103000000010000000400000056d3f8dc9d4e52c0a98d7732be9b46c0c8141223925f4ec0d81ac606e7f52140db411a3f38145cc028997e9be0202d4056d3f8dc9d4e52c0a98d7732be9b46c001030000000100000004000000db411a3f38145cc028997e9be0202d405b4aa484680961c0fe84280a669c32c056d3f8dc9d4e52c0a98d7732be9b46c0db411a3f38145cc028997e9be0202d40', 'hex'))

diff --git a/postgis_formats_test.sql b/postgis_formats_test.sql
@@ -20,6 +20,7 @@ FROM (SELECT
 --'MULTISURFACE (CURVEPOLYGON (COMPOUNDCURVE ((14.8154214044856 1.62369147887578,14.8154214044856 1.21631344851531,15.1869859816276 1.21631344851531),CIRCULARSTRING (15.1869859816276 1.21631344851531,15.2305911624382 1.62922400170295,14.8154214044856 1.62369147887578)),(15.1735559366707 1.63264484218043,15.1735559366707 1.52072780087259,15.0616388953628 1.52072780087259,15.0616388953628 1.63264484218043,15.1735559366707 1.63264484218043),CIRCULARSTRING (14.878094947618 1.45805425774022,14.963151899012 1.46700762104484,14.9721052623166 1.38195066965089,14.8870483109227 1.37299730634627,14.878094947618 1.45805425774022),COMPOUNDCURVE (CIRCULARSTRING (15.1511725284091 1.37747398799858,15.1293747852776 1.30215500987973,15.0571622137106 1.33270717147545),(15.0571622137106 1.33270717147545,15.0929756669291 1.44014753113096,15.1511725284091 1.37747398799858))),((14.6384032547087 1.32643682103399,14.5845898914981 1.09535590842381,14.7365335052692 1.18082419117005,14.6384032547087 1.32643682103399)),((14.7575898130455 1.80043970494728,14.4707169172576 1.80043970494728,14.4707169172576 1.44678185441455,14.7575898130455 1.44678185441455,14.7575898130455 1.80043970494728),(14.7083463148701 1.68404598198714,14.7083463148701 1.54526885076544,14.5203256854729 1.54526885076544,14.5203256854729 1.68404598198714,14.7083463148701 1.68404598198714)))'::geometry
 --'MULTISURFACE Z(CURVEPOLYGON Z(COMPOUNDCURVE Z((14.8154214044856 1.62369147887578 0,14.8154214044856 1.21631344851531 0,15.1869859816276 1.21631344851531 0),CIRCULARSTRING Z(15.1869859816276 1.21631344851531 0,15.2305911624382 1.62922400170295 0,14.8154214044856 1.62369147887578 0)),(15.1735559366707 1.63264484218043 0,15.1735559366707 1.52072780087259 0,15.0616388953628 1.52072780087259 0,15.0616388953628 1.63264484218043 0,15.1735559366707 1.63264484218043 0),CIRCULARSTRING Z(14.878094947618 1.45805425774022 0,14.963151899012 1.46700762104484 0,14.9721052623166 1.38195066965089 0,14.8870483109227 1.37299730634627 0,14.878094947618 1.45805425774022 0),COMPOUNDCURVE Z(CIRCULARSTRING Z(15.1511725284091 1.37747398799858 0,15.1293747852776 1.30215500987973 0,15.0571622137106 1.33270717147545 0),(15.0571622137106 1.33270717147545 0,15.0929756669291 1.44014753113096 0,15.1511725284091 1.37747398799858 0))),((14.6384032547087 1.32643682103399 0,14.5845898914981 1.09535590842381 0,14.7365335052692 1.18082419117005 0,14.6384032547087 1.32643682103399 0)),((14.7575898130455 1.80043970494728 0,14.4707169172576 1.80043970494728 0,14.4707169172576 1.44678185441455 0,14.7575898130455 1.44678185441455 0,14.7575898130455 1.80043970494728 0),(14.7083463148701 1.68404598198714 0,14.7083463148701 1.54526885076544 0,14.5203256854729 1.54526885076544 0,14.5203256854729 1.68404598198714 0,14.7083463148701 1.68404598198714 0)))'::geometry
 --ST_GeomFromGeoJSON('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[2,4]},{"type":"LineString","coordinates":[[2,4],[6,8]]}]}')
+--ST_GeomFromWKB(decode('', 'hex'))
 --ST_GeomFromWKB(decode('010100000000000000000000400000000000001040', 'hex'))
 --ST_GeomFromWKB(decode('01e90300000000000000003e4000000000000024400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('01d10700000000000000003e4000000000000024400000000000c05840', 'hex'))
@@ -53,5 +54,11 @@ FROM (SELECT
 --'CURVEPOLYGON (COMPOUNDCURVE ((17.8147981115353 2.71152512038783,17.8147981115353 2.30414709002736,18.1863626886773 2.30414709002736),CIRCULARSTRING (18.1863626886773 2.30414709002736,18.2299678694879 2.71705764321499,17.8147981115353 2.71152512038783)))'::geometry
 --'CURVEPOLYGON (COMPOUNDCURVE ((17.8550882464061 1.55206457243878,17.8550882464061 1.1446865420783,18.2266528235481 1.1446865420783),CIRCULARSTRING (18.2266528235481 1.1446865420783,18.2702580043587 1.55759709526594,17.8550882464061 1.55206457243878)),(18.2132227785912 1.56101793574342,18.2132227785912 1.44910089443559,18.1013057372833 1.44910089443559,18.1013057372833 1.56101793574342,18.2132227785912 1.56101793574342))'::geometry
 --ST_GeomFromWKB(decode('010a0000000200000001090000000200000001020000000300000020823510e7da3140007a3ea941d5f83f20823510e7da3140c05ce6d5a250f23f68af60eb053a3240c05ce6d5a250f23f01080000000300000068af60eb053a3240c05ce6d5a250f23ff233eaa02f453240643088eeeaebf83f20823510e7da3140007a3ea941d5f83f010200000005000000b0cf9cc49536324080cc67f1edf9f83fb0cf9cc4953632408048636b842ff73f70873c2cef1932408048636b842ff73f70873c2cef19324080cc67f1edf9f83fb0cf9cc49536324080cc67f1edf9f83f', 'hex'))
---ST_GeomFromWKB(decode('', 'hex'))
+--'TIN (((0 0 0, 0 0 1, 0 1 0, 0 0 0)), ((0 0 0, 0 1 0, 1 1 0, 0 0 0)))'::geometry
+--'TIN (((-6.93286465384077 11.641362890543,-37.5087205143269 -0.14890168241206,-22.070781463232 -15.5868407335069,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,-22.070781463232 -15.5868407335069,39.0240411645052 -13.6160400035799,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,39.0240411645052 -13.6160400035799,46.5787772958921 8.71970160225948,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,46.5787772958921 8.71970160225948,31.7977718214395 43.5371811643033,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,31.7977718214395 43.5371811643033,0.264960142607404 60.617454157004,-6.93286465384077 11.641362890543)),((-6.93286465384077 11.641362890543,0.264960142607404 60.617454157004,-40.1364548208962 47.1503158358361,-6.93286465384077 11.641362890543)))'::geometry
+--'TIN Z(((-6.93286465384077 11.641362890543 100,-37.5087205143269 -0.14890168241206 0,-22.070781463232 -15.5868407335069 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,-22.070781463232 -15.5868407335069 0,39.0240411645052 -13.6160400035799 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,39.0240411645052 -13.6160400035799 0,46.5787772958921 8.71970160225948 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,46.5787772958921 8.71970160225948 0,31.7977718214395 43.5371811643033 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,31.7977718214395 43.5371811643033 0,0.264960142607404 60.617454157004 0,-6.93286465384077 11.641362890543 100)),((-6.93286465384077 11.641362890543 100,0.264960142607404 60.617454157004 0,-40.1364548208962 47.1503158358361 0,-6.93286465384077 11.641362890543 100)))'::geometry
+-- ERROR:  Tin cannot contain Polygon element
+--ST_GeomFromWKB(decode('01100000000600000001030000000100000004000000a45c2fdf40bb1bc024807fb7604827404cebf9c01dc142c000bc23d8350fc3bf99bee5bb1e1236c0f8be7c63762c2fc0a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274099bee5bb1e1236c0f8be7c63762c2fc060a7e7c71383434098ce6898693b2bc0a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274060a7e7c71383434098ce6898693b2bc008c3da5f154a4740a02a79ba7c702140a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb76048274008c3da5f154a4740a02a79ba7c702140cfc02ac63acc3f40d85a365ac2c44540a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb760482740cfc02ac63acc3f40d85a365ac2c44540c081cf621bf5d03f428ee1bc084f4e40a45c2fdf40bb1bc024807fb76048274001030000000100000004000000a45c2fdf40bb1bc024807fb760482740c081cf621bf5d03f428ee1bc084f4e40c090005a771144c0567e9f8c3d934740a45c2fdf40bb1bc024807fb760482740', 'hex'))
+--'POLYHEDRALSURFACE (((-54.8342450573701 -40.6182068194833,-45.3087081960562 -2.84452616254895,-60.7466472471511 8.98027821701309,-54.8342450573701 -40.6182068194833)),((-73.2283852033555 -45.2167418559796,-54.8342450573701 -40.6182068194833,-60.7466472471511 8.98027821701309,-73.2283852033555 -45.2167418559796)),((-73.2283852033555 -45.2167418559796,-60.7466472471511 8.98027821701309,-112.315933013574 14.5642136184729,-73.2283852033555 -45.2167418559796)),((-112.315933013574 14.5642136184729,-136.29400856102 -18.610932001965,-73.2283852033555 -45.2167418559796,-112.315933013574 14.5642136184729)))'::geometry
+--ST_GeomFromWKB(decode('010f00000004000000010300000001000000040000008820c38ac86a4bc021ecab66214f44c0c8080bc083a746c0f01cc6ee96c106c0c8141223925f4ec0d81ac606e7f521408820c38ac86a4bc021ecab66214f44c00103000000010000000400000056d3f8dc9d4e52c0a98d7732be9b46c08820c38ac86a4bc021ecab66214f44c0c8141223925f4ec0d81ac606e7f5214056d3f8dc9d4e52c0a98d7732be9b46c00103000000010000000400000056d3f8dc9d4e52c0a98d7732be9b46c0c8141223925f4ec0d81ac606e7f52140db411a3f38145cc028997e9be0202d4056d3f8dc9d4e52c0a98d7732be9b46c001030000000100000004000000db411a3f38145cc028997e9be0202d405b4aa484680961c0fe84280a669c32c056d3f8dc9d4e52c0a98d7732be9b46c0db411a3f38145cc028997e9be0202d40', 'hex'))
 AS g) AS t
diff --git a/postgis_formats_test.sql b/postgis_formats_test.sql
@@ -1,5 +1,9 @@
 -- SQL script to quickly generate and test PostGIS geometry formats in pgAdmin
-SELECT ST_AsText(g), ST_AsGeoJSON(g), encode(ST_AsBinary(g), 'hex') FROM (SELECT 
+SELECT
+ST_AsText(g),
+--ST_AsGeoJSON(g),
+encode(ST_AsBinary(g), 'hex')
+FROM (SELECT 
 --'POINT (2 4)'::geometry
 --'POINT Z(30 10 99)'::geometry
 --'POINT M(30 10 99)'::geometry
@@ -10,14 +14,18 @@ SELECT ST_AsText(g), ST_AsGeoJSON(g), encode(ST_AsBinary(g), 'hex') FROM (SELECT
 --'GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))'::geometry
 --'GEOMETRYCOLLECTION Z(POINT Z(30 10 99),LINESTRING Z(2 4 99,6 8 99))'::geometry
 --'CIRCULARSTRING(1 5, 6 2, 7 3)'::geometry
+--'CIRCULARSTRING Z(16.6766014097188 3.43358367065917 0,16.8327680831925 3.37080305999423 0,16.834876007397 3.20250275804901 0)'::geometry
 --'COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))'::geometry
+--'CURVEPOLYGON Z(COMPOUNDCURVE Z((17.8147981115353 2.71152512038783 0,17.8147981115353 2.30414709002736 0,18.1863626886773 2.30414709002736 0),CIRCULARSTRING Z(18.1863626886773 2.30414709002736 0,18.2299678694879 2.71705764321499 0,17.8147981115353 2.71152512038783 0)))'::geometry
+--'MULTISURFACE (CURVEPOLYGON (COMPOUNDCURVE ((14.8154214044856 1.62369147887578,14.8154214044856 1.21631344851531,15.1869859816276 1.21631344851531),CIRCULARSTRING (15.1869859816276 1.21631344851531,15.2305911624382 1.62922400170295,14.8154214044856 1.62369147887578)),(15.1735559366707 1.63264484218043,15.1735559366707 1.52072780087259,15.0616388953628 1.52072780087259,15.0616388953628 1.63264484218043,15.1735559366707 1.63264484218043),CIRCULARSTRING (14.878094947618 1.45805425774022,14.963151899012 1.46700762104484,14.9721052623166 1.38195066965089,14.8870483109227 1.37299730634627,14.878094947618 1.45805425774022),COMPOUNDCURVE (CIRCULARSTRING (15.1511725284091 1.37747398799858,15.1293747852776 1.30215500987973,15.0571622137106 1.33270717147545),(15.0571622137106 1.33270717147545,15.0929756669291 1.44014753113096,15.1511725284091 1.37747398799858))),((14.6384032547087 1.32643682103399,14.5845898914981 1.09535590842381,14.7365335052692 1.18082419117005,14.6384032547087 1.32643682103399)),((14.7575898130455 1.80043970494728,14.4707169172576 1.80043970494728,14.4707169172576 1.44678185441455,14.7575898130455 1.44678185441455,14.7575898130455 1.80043970494728),(14.7083463148701 1.68404598198714,14.7083463148701 1.54526885076544,14.5203256854729 1.54526885076544,14.5203256854729 1.68404598198714,14.7083463148701 1.68404598198714)))'::geometry
+--'MULTISURFACE Z(CURVEPOLYGON Z(COMPOUNDCURVE Z((14.8154214044856 1.62369147887578 0,14.8154214044856 1.21631344851531 0,15.1869859816276 1.21631344851531 0),CIRCULARSTRING Z(15.1869859816276 1.21631344851531 0,15.2305911624382 1.62922400170295 0,14.8154214044856 1.62369147887578 0)),(15.1735559366707 1.63264484218043 0,15.1735559366707 1.52072780087259 0,15.0616388953628 1.52072780087259 0,15.0616388953628 1.63264484218043 0,15.1735559366707 1.63264484218043 0),CIRCULARSTRING Z(14.878094947618 1.45805425774022 0,14.963151899012 1.46700762104484 0,14.9721052623166 1.38195066965089 0,14.8870483109227 1.37299730634627 0,14.878094947618 1.45805425774022 0),COMPOUNDCURVE Z(CIRCULARSTRING Z(15.1511725284091 1.37747398799858 0,15.1293747852776 1.30215500987973 0,15.0571622137106 1.33270717147545 0),(15.0571622137106 1.33270717147545 0,15.0929756669291 1.44014753113096 0,15.1511725284091 1.37747398799858 0))),((14.6384032547087 1.32643682103399 0,14.5845898914981 1.09535590842381 0,14.7365335052692 1.18082419117005 0,14.6384032547087 1.32643682103399 0)),((14.7575898130455 1.80043970494728 0,14.4707169172576 1.80043970494728 0,14.4707169172576 1.44678185441455 0,14.7575898130455 1.44678185441455 0,14.7575898130455 1.80043970494728 0),(14.7083463148701 1.68404598198714 0,14.7083463148701 1.54526885076544 0,14.5203256854729 1.54526885076544 0,14.5203256854729 1.68404598198714 0,14.7083463148701 1.68404598198714 0)))'::geometry
 --ST_GeomFromGeoJSON('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[2,4]},{"type":"LineString","coordinates":[[2,4],[6,8]]}]}')
---ST_GeomFromWKB(decode('', 'hex'))
 --ST_GeomFromWKB(decode('010100000000000000000000400000000000001040', 'hex'))
 --ST_GeomFromWKB(decode('01e90300000000000000003e4000000000000024400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('01d10700000000000000003e4000000000000024400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('0102000000020000000000000000000040000000000000104000000000000018400000000000002040', 'hex'))
 --ST_GeomFromWKB(decode('01ea03000002000000000000000000004000000000000010400000000000c05840000000000000184000000000000020400000000000c05840', 'hex'))
+--ST_GeomFromWKB(decode('01ea03000002000000482e49b054552e40a07c2cb7fa770b4000000000000000006067196cec4e2f40a07c2cb7fa770b400000000000000000', 'hex'))
 --ST_GeomFromWKB(decode('010300000001000000050000000000000000003e4000000000000024400000000000002440000000000000344000000000000024400000000000003440000000000000444000000000000044400000000000003e400000000000002440', 'hex'))
 --ST_GeomFromWKB(decode('01eb03000001000000050000000000000000003e40000000000000244000000000000000000000000000002440000000000000344000000000000000000000000000002440000000000000344000000000000000000000000000004440000000000000444000000000000000000000000000003e4000000000000024400000000000000000', 'hex'))
 --ST_GeomFromWKB(decode('0103000000020000000500000000000000008041400000000000002440000000000000244000000000000034400000000000002e40000000000000444000000000008046400000000000804640000000000080414000000000000024400400000000000000000034400000000000003e40000000000080414000000000008041400000000000003e40000000000000344000000000000034400000000000003e40', 'hex'))
@@ -37,4 +45,13 @@ SELECT ST_AsText(g), ST_AsGeoJSON(g), encode(ST_AsBinary(g), 'hex') FROM (SELECT
 --ST_GeomFromWKB(decode('01090000000200000001080000000300000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f0000000000000000010200000002000000000000000000f03f00000000000000000000000000000000000000000000f03f', 'hex'))
 --ST_GeomFromWKB(decode('01f10300000200000001f003000003000000000000000000000000000000000000000000000000c05840000000000000f03f000000000000f03f0000000000c05840000000000000f03f00000000000000000000000000c0584001ea03000002000000000000000000f03f00000000000000000000000000c058400000000000000000000000000000f03f0000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('', 'hex'))
+--ST_GeomFromWKB(decode('01f20300000100000001f10300000200000001ea0300000300000000e3e99b96d0314020c9121534b10540000000000000000000e3e99b96d0314080ba66abe46e0240000000000000000048101577b52f324080ba66abe46e0240000000000000000001f00300000300000048101577b52f324080ba66abe46e02400000000000000000d2949e2cdf3a324052a4b7b788bc0540000000000000000000e3e99b96d0314020c9121534b105400000000000000000', 'hex'))
+--ST_GeomFromWKB(decode('010b0000000200000001020000000400000000000000000014400000000000001440000000000000084000000000000014400000000000000840000000000000084000000000000000000000000000000840010800000003000000000000000000000000000000000000000000000000000040000000000000f03f00000000000000400000000000000040', 'hex'))
+--'GEOMETRYCOLLECTION (POLYGON ((30 10,10 20,10 20,40 40,30 10)),MULTICURVE ((5 5,3 5,3 3,0 3),CIRCULARSTRING (0 0,2 1,2 2)))'::geometry
+--ST_GeomFromWKB(decode('010700000002000000010300000001000000050000000000000000003e4000000000000024400000000000002440000000000000344000000000000024400000000000003440000000000000444000000000000044400000000000003e400000000000002440010b0000000200000001020000000400000000000000000014400000000000001440000000000000084000000000000014400000000000000840000000000000084000000000000000000000000000000840010800000003000000000000000000000000000000000000000000000000000040000000000000f03f00000000000000400000000000000040', 'hex'))
+--ST_GeomFromWKB(decode('01070000000200000001030000000100000005000000583dde458da3344048f9ab2eb45a0540c681d49a9b823440dcc172066c3e0340ecf8e7f07ec43440dcc172066c3e03404664e54a16e73440c08ce70ac0c90440583dde458da3344048f9ab2eb45a0540010b000000020000000102000000020000006d446867d76e3440f4dc83a88b2d06402449f441d9c23440f4dc83a88b2d06400108000000030000001c91afa78c87344017bd9611be1a0740e589b047be4934400f819b9afc2b0640e340a3563289344048f9ab2eb45a0540', 'hex'))
+--'CURVEPOLYGON (COMPOUNDCURVE ((17.8147981115353 2.71152512038783,17.8147981115353 2.30414709002736,18.1863626886773 2.30414709002736),CIRCULARSTRING (18.1863626886773 2.30414709002736,18.2299678694879 2.71705764321499,17.8147981115353 2.71152512038783)))'::geometry
+--'CURVEPOLYGON (COMPOUNDCURVE ((17.8550882464061 1.55206457243878,17.8550882464061 1.1446865420783,18.2266528235481 1.1446865420783),CIRCULARSTRING (18.2266528235481 1.1446865420783,18.2702580043587 1.55759709526594,17.8550882464061 1.55206457243878)),(18.2132227785912 1.56101793574342,18.2132227785912 1.44910089443559,18.1013057372833 1.44910089443559,18.1013057372833 1.56101793574342,18.2132227785912 1.56101793574342))'::geometry
+--ST_GeomFromWKB(decode('010a0000000200000001090000000200000001020000000300000020823510e7da3140007a3ea941d5f83f20823510e7da3140c05ce6d5a250f23f68af60eb053a3240c05ce6d5a250f23f01080000000300000068af60eb053a3240c05ce6d5a250f23ff233eaa02f453240643088eeeaebf83f20823510e7da3140007a3ea941d5f83f010200000005000000b0cf9cc49536324080cc67f1edf9f83fb0cf9cc4953632408048636b842ff73f70873c2cef1932408048636b842ff73f70873c2cef19324080cc67f1edf9f83fb0cf9cc49536324080cc67f1edf9f83f', 'hex'))
+--ST_GeomFromWKB(decode('', 'hex'))
 AS g) AS t
diff --git a/postgis_formats_test.sql b/postgis_formats_test.sql
@@ -1,20 +1,40 @@
 -- SQL script to quickly generate and test PostGIS geometry formats in pgAdmin
-SELECT ST_AsText(g), encode(ST_AsBinary(g), 'hex') FROM (SELECT 
+SELECT ST_AsText(g), ST_AsGeoJSON(g), encode(ST_AsBinary(g), 'hex') FROM (SELECT 
 --'POINT (2 4)'::geometry
+--'POINT Z(30 10 99)'::geometry
+--'POINT M(30 10 99)'::geometry
 --'MULTIPOINT((2 4),(6 8))'::geometry
 --'POLYGON((30 10,10 20,10 20,40 40,30 10))'::geometry
 --'LINESTRING(2 4,6 8)'::geometry
 --'MULTILINESTRING((10 10,20 20,10 40),(40 40,30 30,40 20,30 10))'::geometry
 --'GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))'::geometry
+--'GEOMETRYCOLLECTION Z(POINT Z(30 10 99),LINESTRING Z(2 4 99,6 8 99))'::geometry
 --'CIRCULARSTRING(1 5, 6 2, 7 3)'::geometry
 --'COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))'::geometry
 --ST_GeomFromGeoJSON('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[2,4]},{"type":"LineString","coordinates":[[2,4],[6,8]]}]}')
+--ST_GeomFromWKB(decode('', 'hex'))
 --ST_GeomFromWKB(decode('010100000000000000000000400000000000001040', 'hex'))
+--ST_GeomFromWKB(decode('01e90300000000000000003e4000000000000024400000000000c05840', 'hex'))
+--ST_GeomFromWKB(decode('01d10700000000000000003e4000000000000024400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('0102000000020000000000000000000040000000000000104000000000000018400000000000002040', 'hex'))
+--ST_GeomFromWKB(decode('01ea03000002000000000000000000004000000000000010400000000000c05840000000000000184000000000000020400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('010300000001000000050000000000000000003e4000000000000024400000000000002440000000000000344000000000000024400000000000003440000000000000444000000000000044400000000000003e400000000000002440', 'hex'))
+--ST_GeomFromWKB(decode('01eb03000001000000050000000000000000003e40000000000000244000000000000000000000000000002440000000000000344000000000000000000000000000002440000000000000344000000000000000000000000000004440000000000000444000000000000000000000000000003e4000000000000024400000000000000000', 'hex'))
 --ST_GeomFromWKB(decode('0103000000020000000500000000000000008041400000000000002440000000000000244000000000000034400000000000002e40000000000000444000000000008046400000000000804640000000000080414000000000000024400400000000000000000034400000000000003e40000000000080414000000000008041400000000000003e40000000000000344000000000000034400000000000003e40', 'hex'))
+--ST_GeomFromWKB(decode('01eb0300000200000005000000000000000080414000000000000024400000000000c05840000000000000244000000000000034400000000000c058400000000000002e4000000000000044400000000000c05840000000000080464000000000008046400000000000c05840000000000080414000000000000024400000000000c058400400000000000000000034400000000000003e400000000000c05840000000000080414000000000008041400000000000c058400000000000003e4000000000000034400000000000c0584000000000000034400000000000003e400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('010400000002000000010100000000000000000000400000000000001040010100000000000000000018400000000000002040', 'hex'))
+--ST_GeomFromWKB(decode('01ec0300000200000001e9030000000000000000004000000000000010400000000000c0584001e9030000000000000000184000000000000020400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('010500000002000000010200000003000000000000000000244000000000000024400000000000003440000000000000344000000000000024400000000000004440010200000004000000000000000000444000000000000044400000000000003e400000000000003e40000000000000444000000000000034400000000000003e400000000000002440', 'hex'))
+--ST_GeomFromWKB(decode('01ed0300000200000001ea03000003000000000000000000244000000000000024400000000000c05840000000000000344000000000000034400000000000c05840000000000000244000000000000044400000000000c0584001ea03000004000000000000000000444000000000000044400000000000c058400000000000003e400000000000003e400000000000c05840000000000000444000000000000034400000000000c058400000000000003e4000000000000024400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('010600000002000000010300000001000000040000000000000000003e40000000000000344000000000000024400000000000004440000000000080464000000000000044400000000000003e400000000000003440010300000001000000050000000000000000002e4000000000000014400000000000004440000000000000244000000000000024400000000000003440000000000000144000000000000024400000000000002e400000000000001440', 'hex'))
+--ST_GeomFromWKB(decode('01ee0300000200000001eb03000001000000040000000000000000003e40000000000000344000000000000000000000000000002440000000000000444000000000000000000000000000804640000000000000444000000000000000000000000000003e400000000000003440000000000000000001eb03000001000000050000000000000000002e40000000000000144000000000000000000000000000004440000000000000244000000000000000000000000000002440000000000000344000000000000000000000000000001440000000000000244000000000000000000000000000002e4000000000000014400000000000000000', 'hex'))
+--ST_GeomFromWKB(decode('01060000000200000001030000000100000004000000000000000000444000000000000044400000000000003440000000000080464000000000008046400000000000003e40000000000000444000000000000044400103000000020000000600000000000000000034400000000000804140000000000080464000000000000034400000000000003e4000000000000014400000000000002440000000000000244000000000000024400000000000003e4000000000000034400000000000804140040000000000000000003e4000000000000034400000000000003440000000000000394000000000000034400000000000002e400000000000003e400000000000003440', 'hex'))
+--ST_GeomFromWKB(decode('01ee0300000200000001eb0300000100000004000000000000000000444000000000000044400000000000c05840000000000000344000000000008046400000000000c0584000000000008046400000000000003e400000000000c05840000000000000444000000000000044400000000000c0584001eb0300000200000006000000000000000000344000000000008041400000000000c05840000000000080464000000000000034400000000000c058400000000000003e4000000000000014400000000000c05840000000000000244000000000000024400000000000c0584000000000000024400000000000003e400000000000c05840000000000000344000000000008041400000000000c05840040000000000000000003e4000000000000034400000000000c05840000000000000344000000000000039400000000000c0584000000000000034400000000000002e400000000000c058400000000000003e4000000000000034400000000000c05840', 'hex'))
 --ST_GeomFromWKB(decode('0107000000020000000101000000000000000000004000000000000010400102000000020000000000000000000040000000000000104000000000000018400000000000002040', 'hex'))
-AS g) AS t
+--ST_GeomFromWKB(decode('01ef0300000200000001e90300000000000000003e4000000000000024400000000000c0584001ea03000002000000000000000000004000000000000010400000000000c05840000000000000184000000000000020400000000000c05840', 'hex'))
+--ST_GeomFromWKB(decode('010800000003000000000000000000f03f0000000000001440000000000000184000000000000000400000000000001c400000000000000840', 'hex'))
+--ST_GeomFromWKB(decode('01f003000003000000000000000000f03f00000000000014400000000000c05840000000000000184000000000000000400000000000c058400000000000001c4000000000000008400000000000c05840', 'hex'))
+--ST_GeomFromWKB(decode('01090000000200000001080000000300000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f0000000000000000010200000002000000000000000000f03f00000000000000000000000000000000000000000000f03f', 'hex'))
+--ST_GeomFromWKB(decode('01f10300000200000001f003000003000000000000000000000000000000000000000000000000c05840000000000000f03f000000000000f03f0000000000c05840000000000000f03f00000000000000000000000000c0584001ea03000002000000000000000000f03f00000000000000000000000000c058400000000000000000000000000000f03f0000000000c05840', 'hex'))
+--ST_GeomFromWKB(decode('', 'hex'))
+AS g) AS t
diff --git a/postgis_formats_test.sql b/postgis_formats_test.sql
@@ -0,0 +1,20 @@
+-- SQL script to quickly generate and test PostGIS geometry formats in pgAdmin
+SELECT ST_AsText(g), encode(ST_AsBinary(g), 'hex') FROM (SELECT 
+--'POINT (2 4)'::geometry
+--'MULTIPOINT((2 4),(6 8))'::geometry
+--'POLYGON((30 10,10 20,10 20,40 40,30 10))'::geometry
+--'LINESTRING(2 4,6 8)'::geometry
+--'MULTILINESTRING((10 10,20 20,10 40),(40 40,30 30,40 20,30 10))'::geometry
+--'GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))'::geometry
+--'CIRCULARSTRING(1 5, 6 2, 7 3)'::geometry
+--'COMPOUNDCURVE(CIRCULARSTRING(0 0,1 1,1 0),(1 0,0 1))'::geometry
+--ST_GeomFromGeoJSON('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[2,4]},{"type":"LineString","coordinates":[[2,4],[6,8]]}]}')
+--ST_GeomFromWKB(decode('010100000000000000000000400000000000001040', 'hex'))
+--ST_GeomFromWKB(decode('0102000000020000000000000000000040000000000000104000000000000018400000000000002040', 'hex'))
+--ST_GeomFromWKB(decode('010300000001000000050000000000000000003e4000000000000024400000000000002440000000000000344000000000000024400000000000003440000000000000444000000000000044400000000000003e400000000000002440', 'hex'))
+--ST_GeomFromWKB(decode('0103000000020000000500000000000000008041400000000000002440000000000000244000000000000034400000000000002e40000000000000444000000000008046400000000000804640000000000080414000000000000024400400000000000000000034400000000000003e40000000000080414000000000008041400000000000003e40000000000000344000000000000034400000000000003e40', 'hex'))
+--ST_GeomFromWKB(decode('010400000002000000010100000000000000000000400000000000001040010100000000000000000018400000000000002040', 'hex'))
+--ST_GeomFromWKB(decode('010500000002000000010200000003000000000000000000244000000000000024400000000000003440000000000000344000000000000024400000000000004440010200000004000000000000000000444000000000000044400000000000003e400000000000003e40000000000000444000000000000034400000000000003e400000000000002440', 'hex'))
+--ST_GeomFromWKB(decode('010600000002000000010300000001000000040000000000000000003e40000000000000344000000000000024400000000000004440000000000080464000000000000044400000000000003e400000000000003440010300000001000000050000000000000000002e4000000000000014400000000000004440000000000000244000000000000024400000000000003440000000000000144000000000000024400000000000002e400000000000001440', 'hex'))
+--ST_GeomFromWKB(decode('0107000000020000000101000000000000000000004000000000000010400102000000020000000000000000000040000000000000104000000000000018400000000000002040', 'hex'))
+AS g) AS t