Changeset: ba5381fadcc7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba5381fadcc7 Modified Files: geom/sql/Tests/basic.stable.out geom/sql/Tests/relation.stable.out geom/sql/Tests/spatial.stable.out Branch: Feb2013 Log Message:
approve new table headers (also) with geom tests (assuming these changes were indeed intended; please revert and fix properly, otherwise) diffs (89 lines): diff --git a/geom/sql/Tests/basic.stable.out b/geom/sql/Tests/basic.stable.out --- a/geom/sql/Tests/basic.stable.out +++ b/geom/sql/Tests/basic.stable.out @@ -47,8 +47,9 @@ Ready. [ "LINESTRING (10 10, 20 20, 30 40)" ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))" ] -% sys., sys., sys., sys. # table_name -% or_or_=_dimension_g, geometrytypeid_g, srid_g, envelope_g # name +#SELECT CASE WHEN Dimension(g) IN (0,1,2) THEN 3 ELSE Dimension(g) END, GeometryTypeId(g), SRID(g), Envelope(g) FROM geoms where g is not NULL; +% sys.L3, sys.L4, sys.L5, sys.L5 # table_name +% L3, L4, L5, envelope_g # name % int, int, int, geometry # type % 1, 1, 1, 0 # length [ 3, 0, 0, "POINT (10 10)" ] @@ -56,8 +57,8 @@ Ready. [ 3, 3, 0, "POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))" ] [ 3, 3, 0, "POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))" ] #SELECT IsEmpty(g), IsSimple(g), Boundary(g) FROM geoms where g is not NULL; -% sys., sys., sys. # table_name -% isempty_g, issimple_g, boundary_g # name +% sys.L1, sys.L2, sys.L2 # table_name +% L1, L2, boundary_g # name % boolean, boolean, geometry # type % 5, 5, 0 # length [ false, true, "GEOMETRYCOLLECTION EMPTY" ] diff --git a/geom/sql/Tests/relation.stable.out b/geom/sql/Tests/relation.stable.out --- a/geom/sql/Tests/relation.stable.out +++ b/geom/sql/Tests/relation.stable.out @@ -40,8 +40,9 @@ Ready. [ "LINESTRING (10 10, 20 20, 30 40)" ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))" ] -% sys.a, sys.b, sys., sys., sys., sys. # table_name -% g, g, equals_g, disjoint_g, Intersect_g, touches_g # name +#SELECT a.g, b.g, Equals(a.g,b.g), Disjoint(a.g,b.g), "Intersect"(a.g,b.g), Touches(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not NULL; +% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L3 # table_name +% g, g, L1, L2, L3, touches_g # name % geometry, geometry, boolean, boolean, boolean, boolean # type % 0, 0, 5, 5, 5, 5 # length [ "POINT (10 10)", "POINT (10 10)", true, false, true, false ] @@ -60,8 +61,9 @@ Ready. [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", "LINESTRING (10 10, 20 20, 30 40)", false, false, true, false ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", false, false, true, false ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", true, false, true, false ] -% sys.a, sys.b, sys., sys., sys., sys. # table_name -% g, g, crosses_g, within_g, contains_g, overlaps_g # name +#SELECT a.g, b.g, Crosses(a.g,b.g), Within(a.g,b.g), Contains(a.g,b.g), Overlaps(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not NULL; +% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L3 # table_name +% g, g, L1, L2, L3, overlaps_g # name % geometry, geometry, boolean, boolean, boolean, boolean # type % 0, 0, 5, 5, 5, 5 # length [ "POINT (10 10)", "POINT (10 10)", false, true, true, false ] @@ -80,7 +82,8 @@ Ready. [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", "LINESTRING (10 10, 20 20, 30 40)", true, false, false, false ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", false, true, false, false ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", false, true, true, false ] -% sys.a, sys.b, sys. # table_name +#SELECT a.g, b.g, Relate(a.g,b.g,'*F**T**F*') FROM geoms a, geoms b where a.g is not NULL and b.g is not NULL; +% sys.a, sys.b, sys.L # table_name % g, g, relate_g # name % geometry, geometry, boolean # type % 0, 0, 5 # length diff --git a/geom/sql/Tests/spatial.stable.out b/geom/sql/Tests/spatial.stable.out --- a/geom/sql/Tests/spatial.stable.out +++ b/geom/sql/Tests/spatial.stable.out @@ -47,8 +47,9 @@ Ready. [ "LINESTRING (10 10, 20 20, 30 40)" ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))" ] -% sys., sys., sys., sys. # table_name -% area_g, length_g, buffer_g, convexhull_g # name +#SELECT Area(g), Length(g), Buffer(g, 2.0), ConvexHull(g) FROM geoms where g is not NULL; +% sys.L1, sys.L2, sys.L3, sys.L3 # table_name +% L1, L2, L3, convexhull_g # name % double, double, geometry, geometry # type % 24, 24, 0, 0 # length [ 0, 0, "POLYGON ((12 10, 11.96157056 9.609819356, 11.84775907 9.234633135, 11.66293922 8.888859534, 11.41421356 8.585786438, 11.11114047 8.337060775, 10.76536686 8.152240935, 10.39018064 8.038429439, 10 8, 9.609819356 8.038429439, 9.234633135 8.152240935, 8.888859534 8.337060775, 8.585786438 8.585786438, 8.337060775 8.888859534, 8.152240935 9.234633135, 8.038429439 9.609819356, 8 10, 8.038429439 10.39018064, 8.152240935 10.76536686, 8.337060775 11.11114047, 8.585786438 11.41421356, 8.888859534 11.66293922, 9.234633135 11.84775907, 9.609819356 11.96157056, 10 12, 10.39018064 11.96157056, 10.76536686 11.84775907, 11.11114047 11.66293922, 11.41421356 11.41421356, 11.66293922 11.11114047, 11.84775907 10.76536686, 11.96157056 10.39018064, 12 10))", "POINT (10 10)" ] @@ -56,8 +57,8 @@ Ready. [ 75, 36.18033989, "POLYGON ((9.755412201 7.800022564, 8.14166335 8.797374203, 8.171572875 21, 9 21.82842712, 21 21.82842712, 21.82842712 21, 21.85833665 14.2026258, 21.54426658 13.69444975, 9.755412201 7.800022564))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ] [ 62.5, 53.2514077, "POLYGON ((9.755412201 7.800022564, 8.14166335 8.797374203, 8.171572875 21, 9 21.82842712, 21 21.82842712, 21.82842712 21, 21.85833665 14.2026258, 21.54426658 13.69444975, 9.755412201 7.800022564))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ] #SELECT a.g, b.g, Distance(a.g,b.g), Intersection(a.g,b.g), "Union"(a.g,b.g), Difference(a.g,b.g), SymDifference(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not NULL; -% sys.a, sys.b, sys., sys., sys., sys., sys. # table_name -% g, g, distance_g, intersection_g, Union_g, difference_g, symdifference_g # name +% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L4, sys.L4 # table_name +% g, g, L1, L2, L3, L4, symdifference_g # name % geometry, geometry, double, geometry, geometry, geometry, geometry # type % 0, 0, 24, 0, 0, 0, 0 # length [ "POINT (10 10)", "POINT (10 10)", 0, "POINT (10 10)", "POINT (10 10)", "GEOMETRYCOLLECTION EMPTY", "GEOMETRYCOLLECTION EMPTY" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
