sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1544860 - in /sis/branches/JDK7/core: sis-referencing/src/main/java/org/apache/sis/referencing/cs/ sis-referencing/src/main/java/org/apache/sis/referencing/datum/ sis-referencing/src/test/java/org/apache/sis/referencing/cs/ sis-referencing...
Date Sat, 23 Nov 2013 18:28:47 GMT
Author: desruisseaux
Date: Sat Nov 23 18:28:47 2013
New Revision: 1544860

URL: http://svn.apache.org/r1544860
Log:
Javadoc fixes and added tests.

Added:
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
  (with props)
Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -17,7 +17,6 @@
 package org.apache.sis.referencing.cs;
 
 import java.util.Arrays;
-import java.util.NoSuchElementException;
 import javax.measure.unit.Unit;
 import javax.measure.converter.UnitConverter;
 import javax.measure.converter.LinearConverter;

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultAffineCS.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -32,12 +32,16 @@ import org.apache.sis.util.ComparisonMod
 /**
  * A 2- or 3-dimensional coordinate system with straight axes that are not necessarily orthogonal.
  *
- * <table class="sis">
- * <tr><th>Used with CRS type(s)</th></tr>
- * <tr><td>
- *   {@linkplain org.geotoolkit.referencing.crs.DefaultEngineeringCRS Engineering},
- *   {@linkplain org.geotoolkit.referencing.crs.DefaultImageCRS       Image}
- * </td></tr></table>
+ * <table class="sis"><tr>
+ *   <th>Used with CRS types</th>
+ *   <th>Permitted axis names</th>
+ * </tr><tr>
+ *   <td>{@linkplain org.geotoolkit.referencing.crs.DefaultEngineeringCRS Engineering}</td>
+ *   <td>(unspecified)</td>
+ * </tr><tr>
+ *   <td>{@linkplain org.geotoolkit.referencing.crs.DefaultImageCRS Image}</td>
+ *   <td>(unspecified)</td>
+ * </tr></table>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.4 (derived from geotk-2.0)
@@ -63,6 +67,35 @@ public class DefaultAffineCS extends Abs
      * Constructs a two-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.
+     * The following table is a reminder of main (not all) properties:
+     *
+     * <table class="sis">
+     *   <tr>
+     *     <th>Property name</th>
+     *     <th>Value type</th>
+     *     <th>Returned by</th>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
+     *     <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
+     *     <td>{@link #getName()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}</td>
+     *     <td>{@link org.opengis.util.GenericName} or {@link CharSequence} (optionally
as array)</td>
+     *     <td>{@link #getAlias()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
+     *     <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
+     *     <td>{@link #getIdentifiers()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY}</td>
+     *     <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
+     *     <td>{@link #getRemarks()}</td>
+     *   </tr>
+     * </table>
      *
      * @param properties The properties to be given to the identified object.
      * @param axis0 The first axis.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -32,14 +32,22 @@ import org.apache.sis.util.Immutable;
  * the coordinate system contains a single straight coordinate axis. All axes shall have
the
  * same linear unit of measure.
  *
- * <table class="sis">
- * <tr><th>Used with CRS type(s)</th></tr>
- * <tr><td>
- *   {@linkplain org.geotoolkit.referencing.crs.DefaultGeocentricCRS  Geocentric},
- *   {@linkplain org.geotoolkit.referencing.crs.DefaultProjectedCRS   Projected},
- *   {@linkplain org.geotoolkit.referencing.crs.DefaultEngineeringCRS Engineering},
- *   {@linkplain org.geotoolkit.referencing.crs.DefaultImageCRS       Image}
- * </td></tr></table>
+ * <table class="sis"><tr>
+ *   <th>Used with CRS types</th>
+ *   <th>Permitted axis names</th>
+ * </tr><tr>
+ *   <td>{@linkplain org.geotoolkit.referencing.crs.DefaultGeocentricCRS Geocentric}</td>
+ *   <td>“Geocentric X”, “Geocentric Y”, “Geocentric Z”</td>
+ * </tr><tr>
+ *   <td>{@linkplain org.geotoolkit.referencing.crs.DefaultProjectedCRS Projected}</td>
+ *   <td>“Easting” or “Westing”, “Northing” or “Southing”</td>
+ * </tr><tr>
+ *   <td>{@linkplain org.geotoolkit.referencing.crs.DefaultEngineeringCRS Engineering}</td>
+ *   <td>(unspecified)</td>
+ * </tr><tr>
+ *   <td>{@linkplain org.geotoolkit.referencing.crs.DefaultImageCRS Image}</td>
+ *   <td>(unspecified)</td>
+ * </tr></table>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.4 (derived from geotk-2.0)
@@ -53,6 +61,7 @@ public class DefaultCartesianCS extends 
      */
     private static final long serialVersionUID = -6182037957705712945L;
 
+    @Deprecated
     public static final DefaultCartesianCS GEOCENTRIC = null; // TODO: Not supported yet.
 
     /**
@@ -74,6 +83,35 @@ public class DefaultCartesianCS extends 
      * Constructs a two-dimensional coordinate system from a set of properties.
      * The properties map is given unchanged to the
      * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.
+     * The following table is a reminder of main (not all) properties:
+     *
+     * <table class="sis">
+     *   <tr>
+     *     <th>Property name</th>
+     *     <th>Value type</th>
+     *     <th>Returned by</th>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
+     *     <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
+     *     <td>{@link #getName()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}</td>
+     *     <td>{@link org.opengis.util.GenericName} or {@link CharSequence} (optionally
as array)</td>
+     *     <td>{@link #getAlias()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
+     *     <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
+     *     <td>{@link #getIdentifiers()}</td>
+     *   </tr>
+     *   <tr>
+     *     <td>{@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY}</td>
+     *     <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
+     *     <td>{@link #getRemarks()}</td>
+     *   </tr>
+     * </table>
      *
      * @param properties The properties to be given to the identified object.
      * @param axis0 The first axis.

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -55,13 +55,10 @@ import java.util.Objects;
  * {@section Axis names}
  * In some case, the axis name is constrained by ISO 19111 depending on the
  * {@linkplain org.opengis.referencing.crs.CoordinateReferenceSystem coordinate reference
system} type.
- * These constraints are identified in the javadoc by "<cite>ISO 19111 name is...</cite>"
sentences.
- * This constraint works in two directions; for example the names "<cite>geodetic latitude</cite>"
and
+ * This constraint works in two directions. For example the names "<cite>geodetic latitude</cite>"
and
  * "<cite>geodetic longitude</cite>" shall be used to designate the coordinate
axis names associated
- * with a {@linkplain org.opengis.referencing.crs.GeographicCRS geographic coordinate reference
system}.
- * Conversely, these names shall not be used in any other context.
- * See the GeoAPI {@linkplain org.opengis.referencing.cs#AxisNames axis name constraints}
section
- * for more information.
+ * with a {@link org.opengis.referencing.crs.GeographicCRS}. Conversely, these names shall
not be used
+ * in any other context. See the GeoAPI {@link CoordinateSystemAxis} javadoc for more information.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.4 (derived from geotk-2.0)

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -86,12 +86,12 @@ public class DefaultEngineeringDatum ext
      *   </tr>
      *   <tr>
      *     <td>{@value org.opengis.referencing.datum.Datum#REALIZATION_EPOCH_KEY}</td>
-     *     <td>{@link Date}</td>
+     *     <td>{@link java.util.Date}</td>
      *     <td>{@link #getRealizationEpoch()}</td>
      *   </tr>
      *   <tr>
      *     <td>{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}</td>
-     *     <td>{@link Extent}</td>
+     *     <td>{@link org.opengis.metadata.extent.Extent}</td>
      *     <td>{@link #getDomainOfValidity()}</td>
      *   </tr>
      *   <tr>

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -96,12 +96,12 @@ public class DefaultImageDatum extends A
      *   </tr>
      *   <tr>
      *     <td>{@value org.opengis.referencing.datum.Datum#REALIZATION_EPOCH_KEY}</td>
-     *     <td>{@link Date}</td>
+     *     <td>{@link java.util.Date}</td>
      *     <td>{@link #getRealizationEpoch()}</td>
      *   </tr>
      *   <tr>
      *     <td>{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}</td>
-     *     <td>{@link Extent}</td>
+     *     <td>{@link org.opengis.metadata.extent.Extent}</td>
      *     <td>{@link #getDomainOfValidity()}</td>
      *   </tr>
      *   <tr>

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
(original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
Sat Nov 23 18:28:47 2013
@@ -124,7 +124,7 @@ public class DefaultTemporalDatum extend
      *   </tr>
      *   <tr>
      *     <td>{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}</td>
-     *     <td>{@link Extent}</td>
+     *     <td>{@link org.opengis.metadata.extent.Extent}</td>
      *     <td>{@link #getDomainOfValidity()}</td>
      *   </tr>
      *   <tr>

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -127,12 +127,12 @@ public class DefaultVerticalDatum extend
      *   </tr>
      *   <tr>
      *     <td>{@value org.opengis.referencing.datum.Datum#REALIZATION_EPOCH_KEY}</td>
-     *     <td>{@link Date}</td>
+     *     <td>{@link java.util.Date}</td>
      *     <td>{@link #getRealizationEpoch()}</td>
      *   </tr>
      *   <tr>
      *     <td>{@value org.opengis.referencing.datum.Datum#DOMAIN_OF_VALIDITY_KEY}</td>
-     *     <td>{@link Extent}</td>
+     *     <td>{@link org.opengis.metadata.extent.Extent}</td>
      *     <td>{@link #getDomainOfValidity()}</td>
      *   </tr>
      *   <tr>

Added: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java?rev=1544860&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
(added)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.cs;
+
+import org.opengis.referencing.cs.AxisDirection;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.cs.CoordinateSystems.*;
+
+
+/**
+ * Tests the {@link CoordinateSystems} class.
+ *
+ * @author  Martin Desruisseaux (IRD)
+ * @since   0.4 (derived from geotk-2.2)
+ * @version 0.4
+ * @module
+ */
+@DependsOn(DirectionAlongMeridianTest.class)
+public final strictfp class CoordinateSystemsTest extends TestCase {
+    /**
+     * Tolerance threshold for strict floating point comparisons.
+     */
+    static final double STRICT = 0;
+
+    /**
+     * Tests {@link CoordinateSystems#parseAxisDirection(String)}.
+     */
+    @Test
+    public void testParseAxisDirection() {
+        assertEquals("NORTH",            AxisDirection.NORTH,            parseAxisDirection("NORTH"));
+        assertEquals("north",            AxisDirection.NORTH,            parseAxisDirection("north"));
+        assertEquals("  north ",         AxisDirection.NORTH,            parseAxisDirection("
 north "));
+        assertEquals("east",             AxisDirection.EAST,             parseAxisDirection("east"));
+        assertEquals("NORTH_EAST",       AxisDirection.NORTH_EAST,       parseAxisDirection("NORTH_EAST"));
+        assertEquals("north-east",       AxisDirection.NORTH_EAST,       parseAxisDirection("north-east"));
+        assertEquals("north east",       AxisDirection.NORTH_EAST,       parseAxisDirection("north
east"));
+        assertEquals("south-south-east", AxisDirection.SOUTH_SOUTH_EAST, parseAxisDirection("south-south-east"));
+        assertEquals("South along 180°", parseAxisDirection("South along 180 deg").name());
+        assertEquals("South along 180°", parseAxisDirection("South along 180°").name());
+        assertEquals("South along 180°", parseAxisDirection(" SOUTH  along  180 ° ").name());
+        assertEquals("South along 90°E", parseAxisDirection("south along 90 deg east").name());
+        assertEquals("South along 90°E", parseAxisDirection("south along 90°e").name());
+        assertEquals("North along 45°E", parseAxisDirection("north along 45 deg e").name());
+        assertEquals("North along 45°W", parseAxisDirection("north along 45 deg west").name());
+    }
+
+    /**
+     * Tests {@link CoordinateSystems#angle(AxisDirection, AxisDirection)}.
+     */
+    @Test
+    @DependsOnMethod("testParseAxisDirection")
+    public void testAngle() {
+        assertEquals( +90, angle(AxisDirection.EAST,             AxisDirection.NORTH), STRICT);
+        assertEquals( -90, angle(AxisDirection.NORTH,            AxisDirection.EAST),  STRICT);
+        assertEquals( +90, angle(AxisDirection.WEST,             AxisDirection.SOUTH), STRICT);
+        assertEquals( -90, angle(AxisDirection.SOUTH,            AxisDirection.WEST),  STRICT);
+        assertEquals(-180, angle(AxisDirection.NORTH,            AxisDirection.SOUTH), STRICT);
+        assertEquals( 180, angle(AxisDirection.SOUTH,            AxisDirection.NORTH), STRICT);
+        assertEquals(  45, angle(AxisDirection.NORTH_EAST,       AxisDirection.NORTH), STRICT);
+        assertEquals(22.5, angle(AxisDirection.NORTH_NORTH_EAST, AxisDirection.NORTH), STRICT);
+        assertEquals(  90, angle(parseAxisDirection("North along 90°E"), parseAxisDirection("North
along 0°")),   STRICT);
+        assertEquals( 135, angle(parseAxisDirection("North along 90°E"), parseAxisDirection("North
along 45°W")), STRICT);
+        assertEquals(-135, angle(parseAxisDirection("North along 45°W"), parseAxisDirection("North
along 90°E")), STRICT);
+    }
+}

Propchange: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] Sat Nov 23 18:28:47 2013
@@ -57,6 +57,7 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.datum.DefaultVerticalDatumTest.class,
     org.apache.sis.referencing.datum.DefaultGeodeticDatumTest.class,
     org.apache.sis.referencing.cs.DirectionAlongMeridianTest.class,
+    org.apache.sis.referencing.cs.CoordinateSystemsTest.class,
     org.apache.sis.referencing.StandardDefinitionsTest.class,
     org.apache.sis.referencing.GeodeticObjectsTest.class,
 

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java?rev=1544860&r1=1544859&r2=1544860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8]
(original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Static.java [UTF-8]
Sat Nov 23 18:28:47 2013
@@ -63,9 +63,10 @@ package org.apache.sis.util;
  *     <td>Parse, format and transform {@link org.opengis.geometry.Envelope} objects.</td></tr>
  * <tr><td>{@link org.apache.sis.referencing.IdentifiedObjects}</td>
  *     <td>Handle names, identifiers or properties of
- *         {@link org.opengis.referencing.IdentifiedObject}s.</td></tr>
+ *         {@link org.opengis.referencing.IdentifiedObject} instances.</td></tr>
  * <tr><td>{@link org.apache.sis.referencing.cs.CoordinateSystems}</td>
- *     <td>Creates transforms between {@link org.opengis.referencing.cs.CoordinateSystem}s.</td></tr>
+ *     <td>Parses axis names and creates transforms between {@link org.opengis.referencing.cs.CoordinateSystem}
+ *         instances.</td></tr>
  *
  * <tr><th colspan="2" class="hsep">Input / Output (including CRS, XML, images)</th></tr>
  * <tr><td>{@link org.apache.sis.io.IO}</td>



Mime
View raw message