Changeset: 53d501e1fb09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53d501e1fb09
Modified Files:
geom/sql/Tests/All
geom/sql/Tests/T6.sql
geom/sql/Tests/conformance_load.sql
Branch: geo
Log Message:
changing the test in conformance load
diffs (truncated from 425 to 300 lines):
diff --git a/geom/sql/Tests/All b/geom/sql/Tests/All
--- a/geom/sql/Tests/All
+++ b/geom/sql/Tests/All
@@ -18,56 +18,62 @@ normalized
binary
conformance_load
+
+#query the geometry_columns table
T1
T2
T3
T4
-T5
-T6
-# T7 no such unary operator 'geometrytype(multilinestring)'
-T8
-# T9 no such unary operator 'asbinary(polygon)'
-T10
-T11
-T12
-T13
-T14
-T15
-T16
-T17
-T18
-# T19 no such unary operator 'asbinary(geometry)'
-# T20 no such unary operator 'asbinary(geometry)'
-T21
-T22
-T23
-T24
-# T25 no such unary operator 'pointonsurface(polygon)'
-T26
-# T27 no such unary operator 'exteriorring(polygon)'
-# T28 no such unary operator 'numinteriorring(polygon)'
-# T29 no such binary operator 'interiorringn(polygon,tinyint)'
-# T30 no such unary operator 'numgeometries(multilinestring)'
-# T31 no such binary operator 'geometryn(multilinestring,tinyint)'
-# T32 no such unary operator 'isclosed(multilinestring)'
-T33
-T34
-# T35 no such unary operator 'pointonsurface(multipolygon)'
-T36
-T37
-T38
-T39
-T40
-T41
-T42
-# T43 no such binary operator 'intersects(linestring,multilinestring)'
-T44
-T45
-T46
-T47
-T48
-T49
-T50
-T51
-T52
+
+T5 //query the spatial_ref_sys table
+
+#Geometry Constructors
+
+T6 //Dimension
+# T7 //GeometryType
+T8 //AsText
+# T9 //PolyFromWKB no such unary operator 'asbinary(polygon)'
+T10 //SRID
+T11 //IsEmpty
+T12 //IsSimple
+T13 //Boundary
+T14 //Envelope
+T15 //X
+T16 //Y
+T17 //StartPoint
+T18 //EndPoint
+# T19 //IsClosed no such unary operator 'asbinary(geometry)'
+# T20 //IsRing no such unary operator 'asbinary(geometry)'
+T21 //Length
+T22 //NumPoints
+T23 //PointN
+T24 //Centroid
+# T25 //Contains no such unary operator 'pointonsurface(polygon)'
+T26 //Area
+# T27 //ExteriorRing no such unary operator 'exteriorring(polygon)'
+# T28 //NumInteriorRing no such unary operator
'numinteriorring(polygon)'
+# T29 //InteriorRingN no such binary operator 'interiorringn(polygon,tinyint)'
+# T30 //NumGeometries no such unary operator 'numgeometries(multilinestring)'
+# T31 //GeometryN no such binary operator
'geometryn(multilinestring,tinyint)'
+# T32 IsClosed no such unary operator 'isclosed(multilinestring)'
+T33 //Lenght
+T34 //Centroid
+# T35 //Contains no such unary operator 'pointonsurface(multipolygon)'
+T36 //Area
+T37 //Equals
+T38 //Disjoint
+T39 //Touches
+T40 //Within
+T41 //Overlaps
+T42 //Crosses
+# T43 //Intersects no such binary operator
'intersects(linestring,multilinestring)'
+T44 //Contains
+T45 //Relate
+T46 //Distance
+T47 //Intersection
+T48 //Difference
+T49 //Union
+T50 //SymDifference
+T51 //Contains
+T52 //ConvexHull
conformance_drop
diff --git a/geom/sql/Tests/T6.sql b/geom/sql/Tests/T6.sql
--- a/geom/sql/Tests/T6.sql
+++ b/geom/sql/Tests/T6.sql
@@ -1,2 +1,2 @@
-- Conformance Item T6
-SELECT Dimension(shore) FROM lakes WHERE name = 'Blue Lake';
+SELECT Dimension(shore) FROM lakes2d WHERE name = 'Blue Lake';
diff --git a/geom/sql/Tests/conformance_load.sql
b/geom/sql/Tests/conformance_load.sql
--- a/geom/sql/Tests/conformance_load.sql
+++ b/geom/sql/Tests/conformance_load.sql
@@ -5,78 +5,6 @@ CREATE TABLE spatial_ref_sys (
auth_name CHARACTER LARGE OBJECT,
auth_srid INTEGER,
srtext CHARACTER VARYING(2048));
--- Geometry Columns
-CREATE TABLE geometry_columns (
- f_table_schema CHARACTER LARGE OBJECT,
- f_table_name CHARACTER LARGE OBJECT,
- f_geometry_column CHARACTER LARGE OBJECT,
- g_table_schema CHARACTER LARGE OBJECT,
- g_table_name CHARACTER LARGE OBJECT,
- storage_type INTEGER,
- geometry_type INTEGER,
- coord_dimension INTEGER,
- max_ppr INTEGER,
- srid INTEGER REFERENCES spatial_ref_sys,
- CONSTRAINT gc_pk PRIMARY KEY (f_table_schema, f_table_name,
f_geometry_column));
--- Lakes
-CREATE TABLE lakes (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- shore POLYGON);
--- Road Segments
-CREATE TABLE road_segments (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- aliases CHARACTER VARYING(64),
- num_lanes INTEGER,
- centerline LINESTRING);
--- Divided Routes
-CREATE TABLE divided_routes (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- num_lanes INTEGER,
- centerlines MULTILINESTRING);
--- Forests
-CREATE TABLE forests (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- boundary MULTIPOLYGON);
--- Bridges
-CREATE TABLE bridges (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- "position" POINT);
--- Streams
-CREATE TABLE streams (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- centerline LINESTRING);
--- Buildings
-CREATE TABLE buildings (
- fid INTEGER NOT NULL PRIMARY KEY,
- address CHARACTER VARYING(64),
- "position" POINT,
- footprint POLYGON);
--- Ponds
-CREATE TABLE ponds (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- type CHARACTER VARYING(64),
- shores MULTIPOLYGON);
--- Named Places
-CREATE TABLE named_places (
- fid INTEGER NOT NULL PRIMARY KEY,
- name CHARACTER VARYING(64),
- boundary POLYGON);
--- Map Neatline
-CREATE TABLE map_neatlines (
- fid INTEGER NOT NULL PRIMARY KEY,
- neatline POLYGON);
-
-
--- C.3.3.2 Geometry types and functions schema data loading
-
--- Spatial Reference System
INSERT INTO spatial_ref_sys VALUES
(101, 'POSC', 32214, 'PROJCS["UTM_ZONE_14N",
GEOGCS["World Geodetic System 72",
@@ -91,38 +19,173 @@ PARAMETER["Central_Meridian", -99.0],
PARAMETER["Scale_Factor", 0.9996],
PARAMETER["Latitude_of_origin", 0.0],
UNIT["Meter", 1.0]]');
--- Lakes
-INSERT INTO lakes VALUES (
-101, 'Blue Lake',
-PolyFromText(
-'POLYGON(
-(52 18,66 23,73 9,48 6,52 18),
-(59 18,67 18,67 13,59 13,59 18)
-)', 101));
--- Road segments
-INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2,
-LineFromText('LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101));
-INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4,
-LineFromText('LINESTRING( 44 31, 56 34, 70 38 )' ,101));
-INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2,
-LineFromText('LINESTRING( 70 38, 72 48 )' ,101));
-INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4,
-LineFromText('LINESTRING( 70 38, 84 42 )' ,101));
-INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, 1,
-LineFromText('LINESTRING( 28 26, 28 0 )',101));
--- DividedRoutes
-INSERT INTO divided_routes VALUES(119, 'Route 75', 4,
-MLineFromText(
-'MULTILINESTRING((10 48,10 21,10 0),
-(16 0,16 23,16 48))', 101));
--- Forests
-INSERT INTO forests VALUES(109, 'Green Forest',
-MPolyFromText(
-'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),
-(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', 101));
--- Bridges
-INSERT INTO bridges VALUES(110, 'Cam Bridge',
-PointFromText('POINT( 44 31 )', 101));
+
+-- Geometry Columns
+CREATE TABLE geometry_columns (
+ f_table_schema CHARACTER LARGE OBJECT,
+ f_table_name CHARACTER LARGE OBJECT,
+ f_geometry_column CHARACTER LARGE OBJECT,
+ g_table_schema CHARACTER LARGE OBJECT,
+ g_table_name CHARACTER LARGE OBJECT,
+ storage_type INTEGER,
+ geometry_type INTEGER,
+ coord_dimension INTEGER,
+ max_ppr INTEGER,
+ srid INTEGER REFERENCES spatial_ref_sys,
+ CONSTRAINT gc_pk PRIMARY KEY (f_table_schema, f_table_name,
f_geometry_column));
+
+-- POINT (1)
+-- Bridges 2D
+CREATE TABLE bridges (
+ fid INTEGER NOT NULL PRIMARY KEY,
+ name CHARACTER VARYING(64),
+ "position" POINT);
+INSERT INTO geometry_columns VALUES ('schema', 'bridges', 'position',
'schema', 'bridge_geom',NULL, 1, 2, 0, 101);
+INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText('POINT( 44 31 )',
101));
+-- Bridges 3D
+CREATE TABLE bridges3d (
+ fid INTEGER NOT NULL PRIMARY KEY,
+ name CHARACTER VARYING(64),
+ "position" POINT);
+INSERT INTO geometry_columns VALUES ('schema', 'bridges3d', 'position',
'schema', 'bridge3d_geom',NULL, 1, 3, 0, 101);
+INSERT INTO bridges3d VALUES(110, 'Cam Bridge', PointFromText('POINT( 44 31
49)', 101));
+
+-- LINESTRING (2)
+-- Road Segments 2D
+CREATE TABLE road_segments (
+ fid INTEGER NOT NULL PRIMARY KEY,
+ name CHARACTER VARYING(64),
+ aliases CHARACTER VARYING(64),
+ num_lanes INTEGER,
+ centerline LINESTRING);
+INSERT INTO geometry_columns VALUES ('schema', 'road_segments', 'centerline',
'schema', 'road_segment_geom',NULL, 2, 2, 0, 101);
+INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2,
LineFromText('LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101));
+INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4,
LineFromText('LINESTRING( 44 31, 56 34, 70 38 )' ,101));
+INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2,
LineFromText('LINESTRING( 70 38, 72 48 )' ,101));
+INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4,
LineFromText('LINESTRING( 70 38, 84 42 )' ,101));
+INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, 1,
LineFromText('LINESTRING( 28 26, 28 0 )',101));
+-- Road Segments 3D
+CREATE TABLE road_segments3d (
+ fid INTEGER NOT NULL PRIMARY KEY,
+ name CHARACTER VARYING(64),
+ aliases CHARACTER VARYING(64),
+ num_lanes INTEGER,
+ centerline LINESTRING);
+INSERT INTO geometry_columns VALUES ('schema', 'road_segments3d',
'centerline', 'schema', 'road_segment3d_geom',NULL, 2, 3, 0, 101);
+INSERT INTO road_segments3d VALUES(102, 'Route 5', NULL, 2,
LineFromText('LINESTRING( 0 18 10, 21 16 23, 28 26 44 )' ,101));
+INSERT INTO road_segments3d VALUES(103, 'Route 5', 'Main Street', 4,
LineFromText('LINESTRING( 44 31 56, 34 70 38 )' ,101));
+INSERT INTO road_segments3d VALUES(104, 'Route 5', NULL, 2,
LineFromText('LINESTRING( 70 38 72, 48 12 56 )' ,101));
+INSERT INTO road_segments3d VALUES(105, 'Main Street', NULL, 4,
LineFromText('LINESTRING( 70 38 56, 84 42 12)' ,101));
+INSERT INTO road_segments3d VALUES(106, 'Dirt Road by Green Forest', NULL, 1,
LineFromText('LINESTRING( 28 26 28, 45 13 75 )',101));
+
+-- LINEARRING
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
