sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1702010 - in /sis/branches/JDK8/core/sis-referencing/src: main/resources/META-INF/services/ test/java/org/apache/sis/io/wkt/ test/java/org/apache/sis/referencing/factory/
Date Wed, 09 Sep 2015 13:54:46 GMT
Author: desruisseaux
Date: Wed Sep  9 13:54:46 2015
New Revision: 1702010

URL: http://svn.apache.org/r1702010
Log:
Register TransverseMercator provider for use with java.util.ServiceLoader and enable ignored
tests.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod?rev=1702010&r1=1702009&r2=1702010&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod
[UTF-8] Wed Sep  9 13:54:46 2015
@@ -14,6 +14,8 @@ org.apache.sis.internal.referencing.prov
 org.apache.sis.internal.referencing.provider.LambertConformalWest
 org.apache.sis.internal.referencing.provider.LambertConformalBelgium
 org.apache.sis.internal.referencing.provider.LambertConformalMichigan
+org.apache.sis.internal.referencing.provider.TransverseMercator
+org.apache.sis.internal.referencing.provider.TransverseMercatorSouth
 org.apache.sis.internal.referencing.provider.PolarStereographicA
 org.apache.sis.internal.referencing.provider.PolarStereographicB
 org.apache.sis.internal.referencing.provider.PolarStereographicC

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java?rev=1702010&r1=1702009&r2=1702010&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
[UTF-8] Wed Sep  9 13:54:46 2015
@@ -274,14 +274,39 @@ public final strictfp class WKTParserTes
     }
 
     /**
-     * Ignored for now, because the Transverse Mercator projection method is not yet implemented.
+     * Completes the GeoAPI tests with a check of axis names.
+     * The WKT parsed by this test is (except for quote characters and the line feed in {@code
REMARK}):
+     *
+     * <blockquote><pre>PROJCRS[“NAD83 UTM 10”,
+     *  BASEGEODCRS[“NAD83(86)”,
+     *    DATUM[“North American Datum 1983”,
+     *      ELLIPSOID[“GRS 1980”,6378137,298.257222101]],
+     *    ANGLEUNIT[“degree”,0.0174532925199433]],
+     *    PRIMEM[“Greenwich”,0],
+     *  CONVERSION[“UTM zone 10N”,ID[“EPSG”,16010],
+     *    METHOD[“Transverse Mercator”],
+     *    PARAMETER[“Latitude of natural origin”,0.0],
+     *    PARAMETER[“Longitude of natural origin”,-123.0],
+     *    PARAMETER[“Scale factor”,0.9996],
+     *    PARAMETER[“False easting”,500000.0],
+     *    PARAMETER[“False northing”,0.0]],
+     *  CS[Cartesian,2],
+     *    AXIS[“(E)”,east,ORDER[1]],
+     *    AXIS[“(N)”,north,ORDER[2]],
+     *    LENGTHUNIT[“metre”,1.0],
+     *  REMARK[“In this example units are implied. This is allowed for backward compatibility.
+     *          It is recommended that units are explicitly given in the string,
+     *          as in the previous two examples.”]]</pre></blockquote>
      *
      * @throws FactoryException if an error occurred during the WKT parsing.
      */
     @Test
     @Override
-    @Ignore("Transverse Mercator projection method not yet implemented.")
     public void testProjectedWithImplicitParameterUnits() throws FactoryException {
+        super.testProjectedWithImplicitParameterUnits();
+        final CoordinateSystem cs = object.getCoordinateSystem();
+        assertEquals("name", AxisNames.EASTING,  cs.getAxis(0).getName().getCode());
+        assertEquals("name", AxisNames.NORTHING, cs.getAxis(1).getName().getCode());
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java?rev=1702010&r1=1702009&r2=1702010&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
[UTF-8] Wed Sep  9 13:54:46 2015
@@ -65,11 +65,6 @@ public final strictfp class GeodeticObje
     public void testProjected3D() throws FactoryException {
     }
 
-    @Override
-    @Ignore("This tests need the Transverse Mercator projection, which is not yet implemented
in SIS.")
-    public void testProjectedWithGeoidalHeight() throws FactoryException {
-    }
-
     /**
      * Test {@link GeodeticObjectFactory#createFromWKT(String)}. We test only a very small
WKT here because
      * it is not the purpose of this class to test the parser. The main purpose of this test
is to verify



Mime
View raw message