Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -81,12 +81,28 @@ public final strictfp class DefaultEngin public void testWKT2() { final DefaultEngineeringCRS crs = createSpherical(); assertWktEquals(Convention.WKT2, + "ENGCRS[“A spherical CRS”,\n" + + " EDATUM[“Centre”],\n" + + " CS[spherical, 3],\n" + + " AXIS[“Spherical latitude (U)”, north, ORDER[1], ANGLEUNIT[“degree”, 0.017453292519943295]],\n" + + " AXIS[“Spherical longitude (V)”, east, ORDER[2], ANGLEUNIT[“degree”, 0.017453292519943295]],\n" + + " AXIS[“Geocentric radius (r)”, up, ORDER[3], LENGTHUNIT[“metre”, 1]]]", + crs); + } + + /** + * Tests WKT 2 "simplified" formatting. + */ + @Test + public void testWKT2_Simplified() { + final DefaultEngineeringCRS crs = createSpherical(); + assertWktEquals(Convention.WKT2_SIMPLIFIED, "EngineeringCRS[“A spherical CRS”,\n" + " EngineeringDatum[“Centre”],\n" + " CS[spherical, 3],\n" + - " Axis[“Spherical latitude (U)”, north, Order[1], AngleUnit[“degree”, 0.017453292519943295]],\n" + - " Axis[“Spherical longitude (V)”, east, Order[2], AngleUnit[“degree”, 0.017453292519943295]],\n" + - " Axis[“Geocentric radius (r)”, up, Order[3], LengthUnit[“metre”, 1]]]", + " Axis[“Spherical latitude (U)”, north, Unit[“degree”, 0.017453292519943295]],\n" + + " Axis[“Spherical longitude (V)”, east, Unit[“degree”, 0.017453292519943295]],\n" + + " Axis[“Geocentric radius (r)”, up, Unit[“metre”, 1]]]", crs); }
Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -96,15 +96,15 @@ public final strictfp class DefaultGeoce @DependsOnMethod("testWKT1") public void testWKT2() { assertWktEquals(Convention.WKT2, - "GeodeticCRS[“Geocentric”,\n" + - " Datum[“World Geodetic System 1984”,\n" + - " Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”, 1]]],\n" + - " PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n" + + "GEODCRS[“Geocentric”,\n" + + " DATUM[“World Geodetic System 1984”,\n" + + " ELLIPSOID[“WGS84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”, 1]]],\n" + + " PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295]],\n" + " CS[Cartesian, 3],\n" + - " Axis[“(X)”, geocentricX, Order[1]],\n" + - " Axis[“(Y)”, geocentricY, Order[2]],\n" + - " Axis[“(Z)”, geocentricZ, Order[3]],\n" + - " LengthUnit[“metre”, 1]]", + " AXIS[“(X)”, geocentricX, ORDER[1]],\n" + + " AXIS[“(Y)”, geocentricY, ORDER[2]],\n" + + " AXIS[“(Z)”, geocentricZ, ORDER[3]],\n" + + " LENGTHUNIT[“metre”, 1]]", HardCodedCRS.GEOCENTRIC); } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -152,16 +152,16 @@ public final strictfp class DefaultGeogr @DependsOnMethod("testWKT1") public void testWKT2() { assertWktEquals(Convention.WKT2, - "GeodeticCRS[“WGS 84”,\n" + - " Datum[“World Geodetic System 1984”,\n" + - " Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”, 1]]],\n" + - " PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n" + + "GEODCRS[“WGS 84”,\n" + + " DATUM[“World Geodetic System 1984”,\n" + + " ELLIPSOID[“WGS84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”, 1]]],\n" + + " PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295]],\n" + " CS[ellipsoidal, 2],\n" + - " Axis[“Longitude (L)”, east, Order[1]],\n" + - " Axis[“Latitude (B)”, north, Order[2]],\n" + - " AngleUnit[“degree”, 0.017453292519943295],\n" + - " Area[“World”],\n" + - " BBox[-90.00, -180.00, 90.00, 180.00]]", + " AXIS[“Longitude (L)”, east, ORDER[1]],\n" + + " AXIS[“Latitude (B)”, north, ORDER[2]],\n" + + " ANGLEUNIT[“degree”, 0.017453292519943295],\n" + + " AREA[“World”],\n" + + " BBOX[-90.00, -180.00, 90.00, 180.00]]", HardCodedCRS.WGS84); } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -64,12 +64,21 @@ public final strictfp class DefaultImage public void testWKT2() { final DefaultImageCRS crs = create(true); assertWktEquals(Convention.WKT2, + "IMAGECRS[“An image CRS”,\n" + + " IDATUM[“C1”],\n" + + " CS[Cartesian, 2],\n" + + " AXIS[“Column (i)”, columnPositive, ORDER[1]],\n" + + " AXIS[“Row (j)”, rowPositive, ORDER[2]],\n" + + " SCALEUNIT[“unity”, 1]]", + crs); + + assertWktEquals(Convention.WKT2_SIMPLIFIED, "ImageCRS[“An image CRS”,\n" + " ImageDatum[“C1”],\n" + " CS[Cartesian, 2],\n" + - " Axis[“Column (i)”, columnPositive, Order[1]],\n" + - " Axis[“Row (j)”, rowPositive, Order[2]],\n" + - " ScaleUnit[“unity”, 1]]", + " Axis[“Column (i)”, columnPositive],\n" + + " Axis[“Row (j)”, rowPositive],\n" + + " Unit[“unity”, 1]]", crs); } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -298,22 +298,43 @@ public final strictfp class DefaultProje public void testWKT2_WithMixedUnits() throws FactoryException { final ProjectedCRS crs = create(HardCodedCRS.NTF_NORMALIZED_AXES); assertWktEquals(Convention.WKT2, + "PROJCRS[“NTF (Paris) / Lambert zone II”,\n" + + " BASEGEODCRS[“NTF (Paris)”,\n" + + " DATUM[“Nouvelle Triangulation Francaise”,\n" + + " ELLIPSOID[“NTF”, 6378249.2, 293.4660212936269, LENGTHUNIT[“metre”, 1]]],\n" + + " PRIMEM[“Paris”, 2.5969213, ANGLEUNIT[“grade”, 0.015707963267948967]]],\n" + + " CONVERSION[“Lambert zone II”,\n" + + " METHOD[“Lambert Conic Conformal (1SP)”, ID[“EPSG”, 9801]],\n" + + " PARAMETER[“Latitude of natural origin”, 52.0, ANGLEUNIT[“grade”, 0.015707963267948967], ID[“EPSG”, 8801]],\n" + + " PARAMETER[“Longitude of natural origin”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295], ID[“EPSG”, 8802]],\n" + + " PARAMETER[“Scale factor at natural origin”, 0.99987742, SCALEUNIT[“unity”, 1], ID[“EPSG”, 8805]],\n" + + " PARAMETER[“False easting”, 600000.0, LENGTHUNIT[“metre”, 1], ID[“EPSG”, 8806]],\n" + + " PARAMETER[“False northing”, 2200000.0, LENGTHUNIT[“metre”, 1], ID[“EPSG”, 8807]]],\n" + + " CS[Cartesian, 2],\n" + + " AXIS[“Easting (E)”, east, ORDER[1]],\n" + + " AXIS[“Northing (N)”, north, ORDER[2]],\n" + + " LENGTHUNIT[“metre”, 1],\n" + + " ID[“EPSG”, 27572, URI[“urn:ogc:def:crs:EPSG::27572”]]]", + crs); + + assertWktEquals(Convention.WKT2_SIMPLIFIED, "ProjectedCRS[“NTF (Paris) / Lambert zone II”,\n" + " BaseGeodCRS[“NTF (Paris)”,\n" + " Datum[“Nouvelle Triangulation Francaise”,\n" + - " Ellipsoid[“NTF”, 6378249.2, 293.4660212936269, LengthUnit[“metre”, 1]]],\n" + - " PrimeMeridian[“Paris”, 2.5969213, AngleUnit[“grade”, 0.015707963267948967]]],\n" + + " Ellipsoid[“NTF”, 6378249.2, 293.4660212936269]],\n" + + " PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 0.015707963267948967]],\n" + + " Unit[“degree”, 0.017453292519943295]],\n" + " Conversion[“Lambert zone II”,\n" + - " Method[“Lambert Conic Conformal (1SP)”, Id[“EPSG”, 9801]],\n" + - " Parameter[“Latitude of natural origin”, 52.0, AngleUnit[“grade”, 0.015707963267948967], Id[“EPSG”, 8801]],\n" + - " Parameter[“Longitude of natural origin”, 0.0, AngleUnit[“degree”, 0.017453292519943295], Id[“EPSG”, 8802]],\n" + - " Parameter[“Scale factor at natural origin”, 0.99987742, ScaleUnit[“unity”, 1], Id[“EPSG”, 8805]],\n" + - " Parameter[“False easting”, 600000.0, LengthUnit[“metre”, 1], Id[“EPSG”, 8806]],\n" + - " Parameter[“False northing”, 2200000.0, LengthUnit[“metre”, 1], Id[“EPSG”, 8807]]],\n" + + " Method[“Lambert Conic Conformal (1SP)”],\n" + + " Parameter[“Latitude of natural origin”, 52.0, Unit[“grade”, 0.015707963267948967]],\n" + + " Parameter[“Longitude of natural origin”, 0.0],\n" + + " Parameter[“Scale factor at natural origin”, 0.99987742],\n" + + " Parameter[“False easting”, 600000.0],\n" + + " Parameter[“False northing”, 2200000.0]],\n" + " CS[Cartesian, 2],\n" + - " Axis[“Easting (E)”, east, Order[1]],\n" + - " Axis[“Northing (N)”, north, Order[2]],\n" + - " LengthUnit[“metre”, 1],\n" + + " Axis[“Easting (E)”, east],\n" + + " Axis[“Northing (N)”, north],\n" + + " Unit[“metre”, 1],\n" + " Id[“EPSG”, 27572, URI[“urn:ogc:def:crs:EPSG::27572”]]]", crs); } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -40,7 +40,7 @@ public final strictfp class DefaultTempo public void testWKT1() { assertWktEquals(Convention.WKT1, "TIMECRS[“Time”,\n" + - " TIMEDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z]],\n" + + " TDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z]],\n" + " TIMEUNIT[“day”, 86400],\n" + " AXIS[“Time”, FUTURE]]", HardCodedCRS.TIME); @@ -52,11 +52,25 @@ public final strictfp class DefaultTempo @Test public void testWKT2() { assertWktEquals(Convention.WKT2, + "TIMECRS[“Time”,\n" + + " TDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z]],\n" + + " CS[temporal, 1],\n" + + " AXIS[“Time (t)”, future, ORDER[1]],\n" + + " TIMEUNIT[“day”, 86400]]", + HardCodedCRS.TIME); + } + + /** + * Tests WKT 2 "simplified" formatting. + */ + @Test + public void testWKT2_Simplified() { + assertWktEquals(Convention.WKT2_SIMPLIFIED, "TimeCRS[“Time”,\n" + " TimeDatum[“Modified Julian”, TimeOrigin[1858-11-17T00:00:00.0Z]],\n" + " CS[temporal, 1],\n" + - " Axis[“Time (t)”, future, Order[1]],\n" + - " TimeUnit[“day”, 86400]]", + " Axis[“Time (t)”, future],\n" + + " TimeUnit[“day”, 86400]]", // ISO 19162 does not allow "Unit" keyword here. HardCodedCRS.TIME); } } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -53,11 +53,26 @@ public final strictfp class DefaultVerti @DependsOnMethod("testWKT1") public void testWKT2() { assertWktEquals(Convention.WKT2, + "VERTCRS[“Depth”,\n" + + " VDATUM[“Mean Sea Level”],\n" + + " CS[vertical, 1],\n" + + " AXIS[“Depth (D)”, down, ORDER[1]],\n" + + " LENGTHUNIT[“metre”, 1]]", + HardCodedCRS.DEPTH); + } + + /** + * Tests WKT 2 "simplified" formatting. + */ + @Test + @DependsOnMethod("testWKT2") + public void testWKT2_Simplified() { + assertWktEquals(Convention.WKT2_SIMPLIFIED, "VerticalCRS[“Depth”,\n" + " VerticalDatum[“Mean Sea Level”],\n" + " CS[vertical, 1],\n" + - " Axis[“Depth (D)”, down, Order[1]],\n" + - " LengthUnit[“metre”, 1]]", + " Axis[“Depth (D)”, down],\n" + + " Unit[“metre”, 1]]", HardCodedCRS.DEPTH); } } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -89,17 +89,17 @@ public final strictfp class DefaultCoord */ @Test public void testWKT() { - assertWktEquals("Axis[“x”, east, LengthUnit[“metre”, 1]]", X); - assertWktEquals("Axis[“y”, north, LengthUnit[“metre”, 1]]", Y); - assertWktEquals("Axis[“z”, up, LengthUnit[“metre”, 1]]", Z); - assertWktEquals("Axis[“Longitude (λ)”, east, AngleUnit[“grade”, 0.015707963267948967]]", LONGITUDE_gon); - assertWktEquals("Axis[“Latitude (φ)”, north, AngleUnit[“grade”, 0.015707963267948967]]", LATITUDE_gon); - assertWktEquals("Axis[“Altitude (h)”, up, LengthUnit[“metre”, 1]]", ALTITUDE); - assertWktEquals("Axis[“Time (t)”, future, TimeUnit[“day”, 86400]]", TIME); - assertWktEquals("Axis[“Longitude (λ)”, east, AngleUnit[“degree”, 0.017453292519943295]]", GEODETIC_LONGITUDE); - assertWktEquals("Axis[“Spherical longitude (θ)”, east, AngleUnit[“degree”, 0.017453292519943295]]", SPHERICAL_LONGITUDE); - assertWktEquals("Axis[“Latitude (φ)”, north, AngleUnit[“degree”, 0.017453292519943295]]", GEODETIC_LATITUDE); - assertWktEquals("Axis[“Spherical latitude (φ')”, north, AngleUnit[“degree”, 0.017453292519943295]]", SPHERICAL_LATITUDE); + assertWktEquals("AXIS[“x”, east, LENGTHUNIT[“metre”, 1]]", X); + assertWktEquals("AXIS[“y”, north, LENGTHUNIT[“metre”, 1]]", Y); + assertWktEquals("AXIS[“z”, up, LENGTHUNIT[“metre”, 1]]", Z); + assertWktEquals("AXIS[“Longitude (λ)”, east, ANGLEUNIT[“grade”, 0.015707963267948967]]", LONGITUDE_gon); + assertWktEquals("AXIS[“Latitude (φ)”, north, ANGLEUNIT[“grade”, 0.015707963267948967]]", LATITUDE_gon); + assertWktEquals("AXIS[“Altitude (h)”, up, LENGTHUNIT[“metre”, 1]]", ALTITUDE); + assertWktEquals("AXIS[“Time (t)”, future, TIMEUNIT[“day”, 86400]]", TIME); + assertWktEquals("AXIS[“Longitude (λ)”, east, ANGLEUNIT[“degree”, 0.017453292519943295]]", GEODETIC_LONGITUDE); + assertWktEquals("AXIS[“Spherical longitude (θ)”, east, ANGLEUNIT[“degree”, 0.017453292519943295]]", SPHERICAL_LONGITUDE); + assertWktEquals("AXIS[“Latitude (φ)”, north, ANGLEUNIT[“degree”, 0.017453292519943295]]", GEODETIC_LATITUDE); + assertWktEquals("AXIS[“Spherical latitude (φ')”, north, ANGLEUNIT[“degree”, 0.017453292519943295]]", SPHERICAL_LATITUDE); assertWktEquals(Convention.WKT1, "AXIS[“x”, EAST]", X); assertWktEquals(Convention.WKT1, "AXIS[“y”, NORTH]", Y); @@ -116,7 +116,7 @@ public final strictfp class DefaultCoord @Test @DependsOnMethod("testWKT") public void testMeridianWKT() { - assertWktEquals("Axis[“South along 90°W (x)”, south, Meridian[-90.0, AngleUnit[“degree”, 0.017453292519943295]], LengthUnit[“metre”, 1]]", + assertWktEquals("AXIS[“South along 90°W (x)”, south, MERIDIAN[-90.0, ANGLEUNIT[“degree”, 0.017453292519943295]], LENGTHUNIT[“metre”, 1]]", new DefaultCoordinateSystemAxis(singletonMap(DefaultCoordinateSystemAxis.NAME_KEY, "South along 90°W"), "x", new DirectionAlongMeridian(AxisDirection.SOUTH, -90).getDirection(), SI.METRE)); } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -17,6 +17,7 @@ package org.apache.sis.referencing.cs; import org.opengis.referencing.cs.AxisDirection; +import org.apache.sis.io.wkt.Convention; import org.apache.sis.test.DependsOn; import org.apache.sis.test.TestCase; import org.junit.Test; @@ -106,7 +107,10 @@ public final strictfp class DirectionAlo */ @Test public void testWKT() { - assertWktEquals("Meridian[-90.0, AngleUnit[“degree”, 0.017453292519943295]]", - DirectionAlongMeridian.parse("South along 90°W")); + final DirectionAlongMeridian dm = DirectionAlongMeridian.parse("South along 90°W"); + assertWktEquals(Convention.WKT2, + "MERIDIAN[-90.0, ANGLEUNIT[“degree”, 0.017453292519943295]]", dm); + assertWktEquals(Convention.WKT2_SIMPLIFIED, + "Meridian[-90.0, Unit[“degree”, 0.017453292519943295]]", dm); } } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -166,7 +166,7 @@ public final strictfp class DefaultEllip @Test public void testToWKT() { final DefaultEllipsoid e = new DefaultEllipsoid(GeodeticDatumMock.WGS84.getEllipsoid()); - assertWktEquals("Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”, 1]]", e); + assertWktEquals("ELLIPSOID[“WGS84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”, 1]]", e); } /** Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -183,9 +183,14 @@ public final strictfp class DefaultGeode @Test public void testToWKT() { final DefaultGeodeticDatum datum = new DefaultGeodeticDatum(WGS84); - assertWktEquals( + assertWktEquals(Convention.WKT2, + "DATUM[“WGS84”,\n" + + " ELLIPSOID[“WGS84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”, 1]]]", + datum); + + assertWktEquals(Convention.WKT2_SIMPLIFIED, "GeodeticDatum[“WGS84”,\n" + - " Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”, 1]]]", + " Ellipsoid[“WGS84”, 6378137.0, 298.257223563]]", datum); } @@ -266,8 +271,14 @@ public final strictfp class DefaultGeode datum); assertWktEquals(Convention.WKT2, + "DATUM[“World Geodetic System 1984”,\n" + + " ELLIPSOID[“WGS 84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”, 1]],\n" + + " ID[“EPSG”, 6326, URI[“urn:ogc:def:datum:EPSG::6326”]]]", + datum); + + assertWktEquals(Convention.WKT2_SIMPLIFIED, "GeodeticDatum[“World Geodetic System 1984”,\n" + - " Ellipsoid[“WGS 84”, 6378137.0, 298.257223563, LengthUnit[“metre”, 1]],\n" + + " Ellipsoid[“WGS 84”, 6378137.0, 298.257223563],\n" + " Id[“EPSG”, 6326, URI[“urn:ogc:def:datum:EPSG::6326”]]]", datum); Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -61,7 +61,8 @@ public final strictfp class DefaultPrime public void testToWKT() { final DefaultPrimeMeridian pm = new DefaultPrimeMeridian(GREENWICH); assertIsGreenwich(pm); - assertWktEquals("PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]]", pm); + assertWktEquals(Convention.WKT2, "PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295]]", pm); + assertWktEquals(Convention.WKT2_SIMPLIFIED, "PrimeMeridian[“Greenwich”, 0.0]", pm); } /** @@ -94,8 +95,9 @@ public final strictfp class DefaultPrime * In WKT 1 format, if there is no contextual unit (which is the case of this test), * the formatter default to decimal degrees. In WKT 2 format it depends on the PM unit. */ - assertWktEquals(Convention.WKT1, "PRIMEM[“Test”, 10.5]", pm); // 10.3 DM == 10.5° - assertWktEquals(Convention.WKT2, "PrimeMeridian[“Test”, 10.5, AngleUnit[“degree”, 0.017453292519943295]]", pm); + assertWktEquals(Convention.WKT1, "PRIMEM[“Test”, 10.5]", pm); // 10.3 DM == 10.5° + assertWktEquals(Convention.WKT2, "PRIMEM[“Test”, 10.5, ANGLEUNIT[“degree”, 0.017453292519943295]]", pm); + assertWktEquals(Convention.WKT2_SIMPLIFIED, "PrimeMeridian[“Test”, 10.5]", pm); assertWktEquals(Convention.INTERNAL, "PrimeMeridian[“Test”, 10.3, Unit[“D.M”, 0.017453292519943295, Id[“EPSG”, 9111]]]", pm); } @@ -188,7 +190,9 @@ public final strictfp class DefaultPrime assertWktEquals(Convention.WKT1, "PRIMEM[“Paris”, 2.33722917, AUTHORITY[“EPSG”, “8903”]]", pm); assertWktEquals(Convention.WKT2, - "PrimeMeridian[“Paris”, 2.5969213, AngleUnit[“grade”, 0.015707963267948967], Id[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm); + "PRIMEM[“Paris”, 2.5969213, ANGLEUNIT[“grade”, 0.015707963267948967], ID[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm); + assertWktEquals(Convention.WKT2_SIMPLIFIED, + "PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 0.015707963267948967], Id[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm); assertWktEquals(Convention.INTERNAL, "PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 0.015707963267948967, Id[“EPSG”, 9105]], Id[“EPSG”, 8903],\n" + " Remark[“Equivalent to 2°20′14.025″.”]]", pm); Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -81,8 +81,9 @@ public final strictfp class DefaultTempo @Test public void testToWKT() { final DefaultTemporalDatum datum = create(); - assertWktEquals(Convention.WKT1, "TIMEDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z], AUTHORITY[“SIS”, “MJ”]]", datum); - assertWktEquals(Convention.WKT2, "TimeDatum[“Modified Julian”, TimeOrigin[1858-11-17T00:00:00.0Z], Id[“SIS”, “MJ”]]", datum); + assertWktEquals(Convention.WKT1, "TDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z], AUTHORITY[“SIS”, “MJ”]]", datum); + assertWktEquals(Convention.WKT2, "TDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z], ID[“SIS”, “MJ”]]", datum); + assertWktEquals(Convention.WKT2_SIMPLIFIED, "TimeDatum[“Modified Julian”, TimeOrigin[1858-11-17T00:00:00.0Z], Id[“SIS”, “MJ”]]", datum); } /** Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -89,11 +89,13 @@ public final strictfp class DefaultVerti DefaultVerticalDatum datum; datum = new DefaultVerticalDatum(singletonMap(DefaultVerticalDatum.NAME_KEY, "Geoidal"), VerticalDatumType.GEOIDAL); assertWktEquals(Convention.WKT1, "VERT_DATUM[“Geoidal”, 2005]", datum); - assertWktEquals(Convention.WKT2, "VerticalDatum[“Geoidal”]", datum); + assertWktEquals(Convention.WKT2, "VDATUM[“Geoidal”]", datum); + assertWktEquals(Convention.WKT2_SIMPLIFIED, "VerticalDatum[“Geoidal”]", datum); datum = new DefaultVerticalDatum(singletonMap(DefaultVerticalDatum.NAME_KEY, "Ellipsoidal"), VerticalDatumTypes.ELLIPSOIDAL); assertWktEquals(Convention.WKT1, "VERT_DATUM[“Ellipsoidal”, 2002]", datum); - assertWktEquals(Convention.WKT2, "VerticalDatum[“Ellipsoidal”]", datum); + assertWktEquals(Convention.WKT2, "VDATUM[“Ellipsoidal”]", datum); + assertWktEquals(Convention.WKT2_SIMPLIFIED, "VerticalDatum[“Ellipsoidal”]", datum); } /** Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -16,6 +16,7 @@ */ package org.apache.sis.referencing.operation; +import org.apache.sis.io.wkt.Convention; import org.apache.sis.test.TestCase; import org.junit.Test; @@ -37,6 +38,7 @@ public final strictfp class DefaultFormu @Test public void testWKT() { final DefaultFormula formula = new DefaultFormula("Mercator"); - assertWktEquals("Formula[“Mercator”]", formula); + assertWktEquals(Convention.WKT2_SIMPLIFIED, "Formula[“Mercator”]", formula); + assertWktEquals(Convention.WKT2, "FORMULA[“Mercator”]", formula); } } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -160,7 +160,7 @@ public final strictfp class DefaultOpera @DependsOnMethod("testConstruction") public void testWKT() { final OperationMethod method = create("Mercator (variant A)", "9804", "EPSG guidance note #7-2", 2); - assertWktEquals("Method[“Mercator (variant A)”, Id[“EPSG”, 9804, URI[“urn:ogc:def:method:EPSG::9804”]]]", method); + assertWktEquals("METHOD[“Mercator (variant A)”, ID[“EPSG”, 9804, URI[“urn:ogc:def:method:EPSG::9804”]]]", method); assertWktEquals(Convention.WKT1, "PROJECTION[“Mercator (variant A)”, AUTHORITY[“EPSG”, “9804”]]", method); } } Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -156,30 +156,30 @@ public final strictfp class DefaultTrans @DependsOnMethod("testConstruction") public void testWKT() { final DefaultTransformation op = createGeocentricTranslation(); - assertWktEquals( - "CoordinateOperation[“Tokyo to JGD2000 (GSI)”,\n" + - " SourceCRS[GeodeticCRS[“Tokyo 1918”,\n" + - " Datum[“Tokyo 1918”,\n" + - " Ellipsoid[“Bessel 1841”, 6377397.155, 299.1528128, LengthUnit[“metre”, 1]]],\n" + - " PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n" + + assertWktEquals(Convention.WKT2, + "COORDINATEOPERATION[“Tokyo to JGD2000 (GSI)”,\n" + + " SOURCECRS[GEODCRS[“Tokyo 1918”,\n" + + " DATUM[“Tokyo 1918”,\n" + + " ELLIPSOID[“Bessel 1841”, 6377397.155, 299.1528128, LENGTHUNIT[“metre”, 1]]],\n" + + " PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295]],\n" + " CS[Cartesian, 3],\n" + - " Axis[“(X)”, geocentricX, Order[1]],\n" + - " Axis[“(Y)”, geocentricY, Order[2]],\n" + - " Axis[“(Z)”, geocentricZ, Order[3]],\n" + - " LengthUnit[“metre”, 1]]],\n" + - " TargetCRS[GeodeticCRS[“JGD2000”,\n" + - " Datum[“Japanese Geodetic Datum 2000”,\n" + - " Ellipsoid[“GRS 1980”, 6378137.0, 298.257222101, LengthUnit[“metre”, 1]]],\n" + - " PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n" + + " AXIS[“(X)”, geocentricX, ORDER[1]],\n" + + " AXIS[“(Y)”, geocentricY, ORDER[2]],\n" + + " AXIS[“(Z)”, geocentricZ, ORDER[3]],\n" + + " LENGTHUNIT[“metre”, 1]]],\n" + + " TARGETCRS[GEODCRS[“JGD2000”,\n" + + " DATUM[“Japanese Geodetic Datum 2000”,\n" + + " ELLIPSOID[“GRS 1980”, 6378137.0, 298.257222101, LENGTHUNIT[“metre”, 1]]],\n" + + " PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295]],\n" + " CS[Cartesian, 3],\n" + - " Axis[“(X)”, geocentricX, Order[1]],\n" + - " Axis[“(Y)”, geocentricY, Order[2]],\n" + - " Axis[“(Z)”, geocentricZ, Order[3]],\n" + - " LengthUnit[“metre”, 1]]],\n" + - " Method[“Geocentric translations”, Id[“EPSG”, 1031]],\n" + - " Parameter[“X-axis translation”, -146.414, Id[“EPSG”, 8605]],\n" + - " Parameter[“Y-axis translation”, 507.337, Id[“EPSG”, 8606]],\n" + - " Parameter[“Z-axis translation”, 680.507, Id[“EPSG”, 8607]]]", op); + " AXIS[“(X)”, geocentricX, ORDER[1]],\n" + + " AXIS[“(Y)”, geocentricY, ORDER[2]],\n" + + " AXIS[“(Z)”, geocentricZ, ORDER[3]],\n" + + " LENGTHUNIT[“metre”, 1]]],\n" + + " METHOD[“Geocentric translations”, ID[“EPSG”, 1031]],\n" + + " PARAMETER[“X-axis translation”, -146.414, ID[“EPSG”, 8605]],\n" + + " PARAMETER[“Y-axis translation”, 507.337, ID[“EPSG”, 8606]],\n" + + " PARAMETER[“Z-axis translation”, 680.507, ID[“EPSG”, 8607]]]", op); assertWktEquals(Convention.WKT2_SIMPLIFIED, "CoordinateOperation[“Tokyo to JGD2000 (GSI)”,\n" + Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -72,9 +72,9 @@ public final strictfp class Equirectangu " PARAMETER[“semi_minor”, 6371007.0]]"); ReferencingAssert.assertWktEquals(Convention.WKT2, - "Param_MT[“Equidistant Cylindrical (Spherical)”,\n" + - " Parameter[“semi_major”, 6371007.0, LengthUnit[“metre”, 1]],\n" + - " Parameter[“semi_minor”, 6371007.0, LengthUnit[“metre”, 1]]]", transform); + "PARAM_MT[“Equidistant Cylindrical (Spherical)”,\n" + + " PARAMETER[“semi_major”, 6371007.0, LENGTHUNIT[“metre”, 1]],\n" + + " PARAMETER[“semi_minor”, 6371007.0, LENGTHUNIT[“metre”, 1]]]", transform); ReferencingAssert.assertWktEquals(Convention.WKT2_SIMPLIFIED, "Param_MT[“Equidistant Cylindrical (Spherical)”,\n" + Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -33,7 +33,7 @@ import org.junit.Test; import static java.lang.StrictMath.PI; import static java.lang.StrictMath.toRadians; -import static org.apache.sis.test.MetadataAssert.*; +import static org.opengis.test.Assert.*; /** @@ -84,20 +84,6 @@ public final strictfp class ContextualPa } /** - * Tests Well Known Text (WKT) formatting. - */ - @DependsOnMethod("testParameters") - public void testWKT() { - final ContextualParameters p = create(1, 1); - p.parameter("Mandatory 1").setValue(4); - p.parameter("Mandatory 2").setValue(5); - assertWktEquals( - "Param_MT[“Test group”,\n" + - " Parameter[“Mandatory 1”, 4],\n" + - " Parameter[“Mandatory 2”, 5]]", p); - } - - /** * Tests {@link ContextualParameters#completeTransform(MathTransformFactory, MathTransform)} * with identity normalization / denormalization transform. The complete transform should be * equals to the kernel (often the same instance, but not necessarily because of caching). Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java?rev=1701639&r1=1701638&r2=1701639&view=diff ============================================================================== --- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] (original) +++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java [UTF-8] Mon Sep 7 15:32:16 2015 @@ -329,6 +329,7 @@ public final class XML extends Static { * case the field may be reset to {@code null} if OSGi modules are loaded or unloaded, so static * class initialization would be a little bit too rigid.</div> */ + @SuppressWarnings("DoubleCheckedLocking") private static MarshallerPool getPool() throws JAXBException { MarshallerPool pool = POOL; if (pool == null) {
