sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1672117 - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/internal/metadata/ sis-metadata/src/main/java/org/apache/sis/io/wkt/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apa...
Date Wed, 08 Apr 2015 16:12:53 GMT
Author: desruisseaux
Date: Wed Apr  8 16:12:52 2015
New Revision: 1672117

URL: http://svn.apache.org/r1672117
Log:
Renamed "OGP" as "IOGP" since the organisation name is now "International Association of Oil & Gas Producers".
This replacement is not yet done in XML files. Added tests.

Added:
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java   (with props)
Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParameters.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParametersAlphaNum.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -137,11 +137,12 @@ public abstract class ReferencingService
      * returns {@code null} if it can not convert the object.
      *
      * @param  object The object to wrap.
+     * @param  internal {@code true} if the formatting convention is {@code Convention.INTERNAL}.
      * @return The given object converted to a {@code FormattableObject} instance, or {@code null}.
      *
      * @since 0.6
      */
-    public abstract FormattableObject toFormattableObject(MathTransform object);
+    public abstract FormattableObject toFormattableObject(MathTransform object, boolean internal);
 
     /**
      * Sets a geographic bounding box from the specified envelope.

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -865,7 +865,8 @@ public class Formatter implements Locali
             if (transform instanceof FormattableObject) {
                 append((FormattableObject) transform);
             } else {
-                final FormattableObject object = ReferencingServices.getInstance().toFormattableObject(transform);
+                final FormattableObject object = ReferencingServices.getInstance()
+                        .toFormattableObject(transform, convention == Convention.INTERNAL);
                 if (object != null) {
                     append(object);
                 } else {

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -91,7 +91,7 @@ import java.util.Objects;
  * found in Geographic Markup Language (GML) documents. Example:
  *
  * {@preformat xml
- *   <gml:identifier codeSpace="OGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
+ *   <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
  * }
  *
  * In Apache SIS, the GML {@code codeSpace} attribute - despite its name - is mapped to the identifier
@@ -446,7 +446,8 @@ public class ImmutableIdentifier extends
      * code space}, but not necessarily.
      *
      * <div class="note"><b>Example:</b> Coordinate Reference System (CRS) identified by an EPSG code will return
-     * {@link Citations#OGP}, since OGP is the organization maintaining the EPSG geodetic database.</div>
+     * contact information for the <cite>International Association of Oil &amp; Gas producers</cite> (IOGP), since
+     * IOGP is the organization maintaining the EPSG geodetic database.</div>
      *
      * @return The authority, or {@code null} if not available.
      */

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -71,7 +71,11 @@ public final class Citations extends Sta
      * @category Organization
      *
      * @since 0.4
+     *
+     * @deprecated The OGP organization is now known as IOGP. This citation will be removed in SIS 0.6
+     *             because of this name change and for avoiding confusion with {@link #EPSG} citation.
      */
+    @Deprecated
     public static final Citation OGP = new SimpleCitation("OGP");
 
     /**
@@ -81,12 +85,14 @@ public final class Citations extends Sta
      *
      * <div class="note"><b>Historical note:</b>
      * The EPSG acronym meaning was <cite>European Petroleum Survey Group</cite>.
-     * But this meaning does not apply anymore since the European and American associations merged
-     * into the <cite>International Association of Oil &amp; Gas producers</cite> (IOGP).
+     * But this meaning does not apply anymore since the European and American associations merged into
+     * the <a href="http://www.iogp.org">International Association of Oil &amp; Gas producers</a> (IOGP).
      * The legacy acronym now applies only to the database Coordinate Reference System definitions,
      * known as <cite>EPSG dataset</cite>.</div>
      *
-     * @see #OGP
+     * The citation {@linkplain DefaultCitation#getTitle() title} and contact information reference
+     * the IOGP organization, but the {@link IdentifierSpace#getName() namespace} is {@code "EPSG"}.
+     *
      * @see #AUTO
      * @see #AUTO2
      * @see #CRS
@@ -94,7 +100,7 @@ public final class Citations extends Sta
      *
      * @since 0.4
      */
-    public static final IdentifierSpace<Integer> EPSG = new Authority<>(Constants.EPSG, Constants.EPSG);
+    public static final IdentifierSpace<Integer> EPSG = new Authority<>("IOGP", Constants.EPSG);
 
     /**
      * The <a href="http://sis.apache.org">Apache SIS</a> project.
@@ -222,6 +228,14 @@ public final class Citations extends Sta
         if (title == null || ((title = CharSequences.trimWhitespaces(title)).isEmpty())) {
             return null;
         }
+        /*
+         * We perform a special check because it is our only IdentifierSpace having an namespace ("EPSG")
+         * that can not be inferred from the authority abbreviation ("IOGP"). We test this special case
+         * first because it is usually to be the most frequently used citation.
+         */
+        if (title.equalsIgnoreCase(Constants.EPSG)) {
+            return EPSG;
+        }
         for (final Citation citation : CITATIONS) {
             if (titleMatches(citation, title)) {
                 return citation;

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -43,7 +43,10 @@ import static org.opengis.metadata.Ident
  * @version 0.4
  * @module
  */
-@DependsOn(DefaultIdentifierTest.class)
+@DependsOn({
+    DefaultIdentifierTest.class,
+    org.apache.sis.metadata.iso.citation.CitationsTest.class
+})
 public final strictfp class ImmutableIdentifierTest extends TestCase {
     /**
      * Returns the properties map to be used in argument to test methods.
@@ -175,8 +178,8 @@ public final strictfp class ImmutableIde
      */
     @Test
     public void testWKT() {
-        final ImmutableIdentifier id = new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326", "8.2", null);
-        assertWktEquals(Convention.WKT2, "Id[“EPSG”, 4326, “8.2”, Citation[“OGP”]]", id);
+        final ImmutableIdentifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null);
+        assertWktEquals(Convention.WKT2, "Id[“EPSG”, 4326, “8.2”, Citation[“IOGP”]]", id);
         assertWktEquals(Convention.WKT1, "AUTHORITY[“EPSG”, “4326”]", id);
     }
 }

Added: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java?rev=1672117&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java (added)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -0,0 +1,58 @@
+/*
+ * 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.metadata.iso.citation;
+
+import org.apache.sis.internal.util.Constants;
+import org.apache.sis.test.TestCase;
+import org.junit.Test;
+
+import static org.apache.sis.metadata.iso.citation.Citations.*;
+import static org.junit.Assert.assertSame;
+
+
+/**
+ * Tests {@link Citations}.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.6
+ * @version 0.6
+ * @module
+ */
+public final strictfp class CitationsTest extends TestCase {
+    /**
+     * Tests {@link Citations#fromName(String)}.
+     */
+    @Test
+    public void testFromName() {
+        assertSame(ISO,      fromName("ISO"));
+        assertSame(OGC,      fromName(Constants.OGC));
+        assertSame(EPSG,     fromName(Constants.EPSG));  // This one is important.
+        assertSame(EPSG,     fromName("IOGP"));          // This one is not really needed (and maybe not strictly correct).
+        assertSame(SIS,      fromName("SIS"));
+        assertSame(ESRI,     fromName("ESRI"));
+        assertSame(ORACLE,   fromName("Oracle"));
+        assertSame(NETCDF,   fromName("NetCDF"));
+        assertSame(GEOTIFF,  fromName("GeoTIFF"));
+        assertSame(PROJ4,    fromName("Proj.4"));
+        assertSame(PROJ4,    fromName("Proj4"));
+        assertSame(MAP_INFO, fromName("MapInfo"));
+        assertSame(S57,      fromName("S-57"));
+        assertSame(S57,      fromName("S57"));
+        assertSame(ISBN,     fromName("ISBN"));
+        assertSame(ISSN,     fromName("ISSN"));
+    }
+}

Propchange: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -85,18 +85,18 @@ public final strictfp class HardCodedCit
     }
 
     /**
-     * The <a href="http://www.ogp.org.uk">International Association of Oil &amp; Gas Producers</a> organization.
+     * The <a href="http://www.iogp.org">International Association of Oil &amp; Gas Producers</a> organization.
      * This organization is responsible for maintainance of {@link #EPSG} database.
-     * An {@linkplain Citation#getAlternateTitles() alternate title} for this citation is "OGP"
+     * An {@linkplain Citation#getAlternateTitles() alternate title} for this citation is "IOGP"
      * (according ISO 19115, alternate titles often contain abbreviations).
      */
-    public static final DefaultCitation OGP;
+    public static final DefaultCitation IOGP;
     static {
         final DefaultCitation c = new DefaultCitation("International Association of Oil & Gas Producers");
-        c.setAlternateTitles(singleton(new SimpleInternationalString("OGP")));
-        c.setIdentifiers(singleton(new DefaultIdentifier("OGP")));
+        c.setAlternateTitles(singleton(new SimpleInternationalString("IOGP")));
+        c.setIdentifiers(singleton(new DefaultIdentifier("IOGP")));
         c.freeze();
-        OGP = c;
+        IOGP = c;
     }
 
     /**
@@ -130,7 +130,7 @@ public final strictfp class HardCodedCit
         r.setFunction(OnLineFunction.INFORMATION);
 
         final DefaultResponsibility p = new DefaultResponsibility(Role.PRINCIPAL_INVESTIGATOR, null,
-                new DefaultOrganisation(OGP.getTitle(), null, null, new DefaultContact(r)));
+                new DefaultOrganisation(IOGP.getTitle(), null, null, new DefaultContact(r)));
 
         final DefaultCitation c = new DefaultCitation("European Petroleum Survey Group");
         c.setAlternateTitles(singleton(new SimpleInternationalString("EPSG")));

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -65,6 +65,7 @@ import org.junit.BeforeClass;
     org.apache.sis.metadata.iso.citation.DefaultResponsibilityTest.class,
     org.apache.sis.metadata.iso.citation.DefaultCitationDateTest.class,
     org.apache.sis.metadata.iso.citation.DefaultCitationTest.class,
+    org.apache.sis.metadata.iso.citation.CitationsTest.class,
     org.apache.sis.metadata.iso.maintenance.DefaultScopeDescriptionTest.class,
     org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBoxTest.class,
     org.apache.sis.metadata.iso.extent.DefaultExtentTest.class,

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -47,11 +47,11 @@ import org.opengis.metadata.Identifier;
  * Some data producers put a URN instead than a simple code value, as in the example below:
  *
  * {@preformat xml
- *   <gml:identifier codeSpace="OGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
+ *   <gml:identifier codeSpace="IOGP">urn:ogc:def:crs:EPSG::4326</gml:identifier>
  * }
  *
  * In such case this class takes the codespace as the {@linkplain Identifier#getAuthority() authority}
- * ("OGP" in above example), and the 3 last URI elements are parsed as the codespace, version (optional)
+ * ("IOGP" in above example), and the 3 last URI elements are parsed as the codespace, version (optional)
  * and code values respectively.
  *
  * @author  Guilhem Legal (Geomatys)

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -29,6 +29,7 @@ import org.opengis.referencing.crs.Verti
 import org.opengis.referencing.crs.GeographicCRS;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.TransformException;
 import org.opengis.referencing.operation.CoordinateOperation;
@@ -43,6 +44,7 @@ import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.AbstractIdentifiedObject;
 import org.apache.sis.referencing.crs.DefaultTemporalCRS;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.parameter.DefaultParameterDescriptor;
 import org.apache.sis.parameter.Parameterized;
 import org.apache.sis.io.wkt.Formatter;
@@ -53,6 +55,7 @@ import org.apache.sis.metadata.iso.exten
 import org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent;
 import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.internal.metadata.ReferencingServices;
+import org.apache.sis.internal.referencing.provider.Affine;
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Utilities;
@@ -101,25 +104,33 @@ public final class ServicesForMetadata e
      * returns {@code null} if it can not convert the object.
      *
      * @param  object The object to wrap.
+     * @param  internal {@code true} if the formatting convention is {@code Convention.INTERNAL}.
      * @return The given object converted to a {@code FormattableObject} instance, or {@code null}.
      *
      * @since 0.6
      */
     @Override
-    public FormattableObject toFormattableObject(final MathTransform object) {
-        if (object instanceof Parameterized) {
-            final ParameterValueGroup parameters = ((Parameterized) object).getParameterValues();
-            if (parameters != null) {
-                return new FormattableObject() {
-                    @Override
-                    protected String formatTo(final Formatter formatter) {
-                        WKTUtilities.appendParamMT(parameters, formatter);
-                        return "Param_MT";
-                    }
-                };
+    public FormattableObject toFormattableObject(final MathTransform object, boolean internal) {
+        Matrix matrix;
+        final ParameterValueGroup parameters;
+        if (internal && (matrix = MathTransforms.getMatrix(object)) != null) {
+            parameters = Affine.parameters(matrix);
+        } else if (object instanceof Parameterized) {
+            parameters = ((Parameterized) object).getParameterValues();
+        } else {
+            matrix = MathTransforms.getMatrix(object);
+            if (matrix == null) {
+                return null;
             }
+            parameters = Affine.parameters(matrix);
         }
-        return null;
+        return new FormattableObject() {
+            @Override
+            protected String formatTo(final Formatter formatter) {
+                WKTUtilities.appendParamMT(parameters, formatter);
+                return "Param_MT";
+            }
+        };
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -110,7 +110,7 @@ abstract class AbstractProvider extends
      * Creates the parameter builder with the default namespace set to EPSG.
      */
     static ParameterBuilder builder() {
-        return new ParameterBuilder().setCodeSpace(Citations.OGP, Constants.EPSG).setRequired(true);
+        return new ParameterBuilder().setCodeSpace(Citations.EPSG, Constants.EPSG).setRequired(true);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -76,7 +76,7 @@ public final class EPSGName {  // TODO:
      * @return An EPSG name or alias for the given string.
      */
     public static NamedIdentifier create(final String code) {
-        return new NamedIdentifier(Citations.OGP, Constants.EPSG, code, VERSION, REMARKS);
+        return new NamedIdentifier(Citations.EPSG, Constants.EPSG, code, VERSION, REMARKS);
     }
 
     /**
@@ -86,7 +86,7 @@ public final class EPSGName {  // TODO:
      * @return The EPSG identifier for the given numerical value.
      */
     public static Identifier identifier(final int code) {
-        return new ImmutableIdentifier(Citations.OGP, Constants.EPSG, String.valueOf(code).intern(), VERSION, REMARKS);
+        return new ImmutableIdentifier(Citations.EPSG, Constants.EPSG, String.valueOf(code).intern(), VERSION, REMARKS);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -55,7 +55,7 @@ import static org.apache.sis.util.Utilit
  *         public static final ParameterDescriptorGroup PARAMETERS;
  *         static {
  *             ParameterBuilder builder = new ParameterBuilder();
- *             builder.setCodeSpace(Citations.OGP, "EPSG").setRequired(true);
+ *             builder.setCodeSpace(Citations.EPSG, "EPSG").setRequired(true);
  *             ParameterDescriptor<?>[] parameters = {
  *                 builder.addName("Latitude of natural origin")    .createBounded( -80,  +84, 0, NonSI.DEGREE_ANGLE),
  *                 builder.addName("Longitude of natural origin")   .createBounded(-180, +180, 0, NonSI.DEGREE_ANGLE),

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParameters.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParameters.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -19,12 +19,10 @@ package org.apache.sis.parameter;
 import java.util.Map;
 import java.util.HashMap;
 import java.io.ObjectStreamException;
-import org.opengis.util.GenericName;
 import org.opengis.parameter.ParameterDescriptor;
 import org.apache.sis.referencing.NamedIdentifier;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.internal.referencing.provider.Affine;
-import org.apache.sis.internal.referencing.provider.EPSGName;
 import org.apache.sis.metadata.iso.citation.Citations;
 
 
@@ -146,13 +144,13 @@ class MatrixParameters extends TensorPar
      * This method creates:
      *
      * <ul>
-     *   <li>The OGC name (e.g. {@code "elt_1_2"}) as primary name</li>
-     *   <li>The EPSG name (e.g. {@code "B2"}) as an alias</li>
+     *   <li>The OGC name (e.g. {@code "elt_1_2"}) as primary name.</li>
+     *   <li>The alpha-numeric name (e.g. {@code "B2"}) as an alias.</li>
      * </ul>
      *
-     * This method does <strong>not</strong> create the EPSG identifiers (e.g. EPSG:8641) because the primary name
-     * created by this method is not the EPSG name. However the {@link MatrixParametersAlphaNum} subclass uses the
-     * EPSG name as the primary name. Consequently that subclass will create the EPSG identifier.
+     * This method does <strong>not</strong> assign the alpha-numeric names to the EPSG authority in order to avoid
+     * confusion when formatting the parameters as Well Known Text (WKT). However {@link MatrixParametersAlphaNum}
+     * subclass will assign some names to the EPSG authority, as well as their identifier (e.g. EPSG:8641).
      */
     @Override
     protected ParameterDescriptor<Double> createElementDescriptor(final int[] indices) throws IllegalArgumentException {
@@ -161,13 +159,8 @@ class MatrixParameters extends TensorPar
                 new NamedIdentifier(Citations.OGC, Constants.OGC, indicesToName(indices), null, null));
         final String c = indicesToAlias(indices);
         if (c != null) {
-            final GenericName alias;
-            if (isEPSG(indices)) {
-                alias = EPSGName.create(c);
-            } else {
-                alias = new NamedIdentifier(Citations.SIS, Constants.SIS, c, null, null);
-            }
-            properties.put(ParameterDescriptor.ALIAS_KEY, alias);
+            properties.put(ParameterDescriptor.ALIAS_KEY,
+                    new NamedIdentifier(Citations.SIS, Constants.SIS, c, null, null));
         }
         return new DefaultParameterDescriptor<>(properties, 0, 1, Double.class, null, null, getDefaultValue(indices));
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParametersAlphaNum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParametersAlphaNum.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParametersAlphaNum.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/MatrixParametersAlphaNum.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -95,7 +95,7 @@ final class MatrixParametersAlphaNum ext
             throw new AssertionError();
         }
         final ParameterDescriptor<Double> wkt = WKT1.getElementDescriptor(indices);   // Really 'WKT1', not 'super'.
-        final GenericName name = first(wkt.getAlias());
+        GenericName name = first(wkt.getAlias());
         if (name == null) {
             /*
              * Outside the range of names (e.g. more than 26 rows or more than 10 columns).
@@ -104,15 +104,16 @@ final class MatrixParametersAlphaNum ext
             return wkt;
         }
         final Map<String,Object> properties = new HashMap<>(6);
-        properties.put(ParameterDescriptor.NAME_KEY, first(wkt.getAlias()));
-        properties.put(ParameterDescriptor.ALIAS_KEY, wkt.getName());
         /*
          * Declare the EPSG identifier only for A0, A1, A2, B0, B1 and B2.
          */
         if (isEPSG(indices)) {
+            name = EPSGName.create(name.tip().toString()); // Put the name in EPSG namespace.
             final int code = (indices[0] == 0 ? Constants.A0 : Constants.B0) + indices[1];
             properties.put(ParameterDescriptor.IDENTIFIERS_KEY, EPSGName.identifier(code));
         }
+        properties.put(ParameterDescriptor.NAME_KEY, name);
+        properties.put(ParameterDescriptor.ALIAS_KEY, wkt.getName());
         return new DefaultParameterDescriptor<>(properties, 0, 1, Double.class, null, null, wkt.getDefaultValue());
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -70,7 +70,7 @@ import static org.apache.sis.util.Argume
  *
  * {@preformat java
  *   ParameterBuilder builder = new ParameterBuilder();
- *   builder.setCodeSpace(Citations.OGP, "EPSG")                    // The default namespace to be used below.
+ *   builder.setCodeSpace(Citations.EPSG, "EPSG")                   // The default namespace to be used below.
  *          .setRequired(true);                                     // All parameters will be considered mandatory.
  *
  *   // Constructs the list of parameters.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -109,7 +109,7 @@ import static org.apache.sis.util.Argume
  * If we choose EPSG as our primary naming authority, then those three names can be declared as below:
  *
  * {@preformat java
- *   builder.setCodespace (Citations.OGP, "EPSG")
+ *   builder.setCodespace (Citations.EPSG, "EPSG")
  *          .addName("Mercator (variant A)")
  *          .addName("Mercator (1SP)")
  *          .addName(Citations.OGC, "Mercator_1SP")
@@ -372,7 +372,7 @@ public abstract class Builder<B extends
      * The code space is often the authority's abbreviation, but not necessarily.
      *
      * <div class="note"><b>Example:</b> Coordinate Reference System (CRS) objects identified by codes from the
-     * EPSG database are maintained by the {@linkplain org.apache.sis.metadata.iso.citation.Citations#OGP OGP}
+     * EPSG database are maintained by the <cite>International Association of Oil &amp; Gas producers</cite> (IOGP)
      * authority, but the code space is {@code "EPSG"} for historical reasons.</div>
      *
      * This method is typically invoked only once, since a compound object often uses the same code space
@@ -472,7 +472,7 @@ public abstract class Builder<B extends
      * by OGC and GeoTIFF. Those alternative names can be defined as below:
      *
      * {@preformat java
-     *   builder.setCodespace(Citations.OGP, "EPSG")           // Sets the default namespace to "EPSG".
+     *   builder.setCodespace(Citations.EPSG, "EPSG")          // Sets the default namespace to "EPSG".
      *          .addName("Longitude of natural origin")        // Primary name in builder default namespace.
      *          .addName(Citations.OGC, "central_meridian")    // First alias in "OGC" namespace.
      *          .addName(Citations.GEOTIFF, "NatOriginLong");  // Second alias in "GeoTIFF" namespace.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -74,9 +74,10 @@ import java.util.Objects;
  * </ul>
  *
  * <div class="note"><b>Example:</b>
- * If the identifier attributes are {@code authority} = {@link Citations#OGP}, {@code codeSpace} = {@code "EPSG"}
- * and {@code code} = {@code "4326"}, then the name attributes will be {@code scope} = {@code "OGP"},
- * {@code head} = {@code "EPSG"}, {@code tip} = {@code "4326"} and {@link #toString()} = {@code "EPSG:4326"}.
+ * If the identifier attributes are {@code authority} = {@code new DefaultCitation("IOGP")},
+ * {@code codeSpace} = {@code "EPSG"} and {@code code} = {@code "4326"}, then the name attributes will be
+ * {@code scope} = {@code "IOGP"}, {@code head} = {@code "EPSG"}, {@code tip} = {@code "4326"} and
+ * {@link #toString()} = {@code "EPSG:4326"}.
  * Note that the scope does not appear in the string representation of names.</div>
  *
  *

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -266,7 +266,7 @@ public class DefaultGeographicCRS extend
      *      Area["World"],
      *      BBox[-90.00, -180.00, 90.00, 180.00],
      *      Scope["Used by GPS satellite navigation system."]
-     *      Id["EPSG", 4326, Citation["OGP"], URI["urn:ogc:def:crs:EPSG::4326"]]]
+     *      Id["EPSG", 4326, Citation["IOGP"], URI["urn:ogc:def:crs:EPSG::4326"]]]
      * }
      *
      * <p>Same coordinate reference system using WKT 1.</p>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -518,7 +518,7 @@ public class DefaultGeodeticDatum extend
      * {@preformat wkt
      *      Datum["World Geodetic System 1984",
      *        Ellipsoid["WGS84", 6378137.0, 298.257223563, LengthUnit["metre", 1]],
-     *      Id["EPSG", 6326, Citation["OGP"], URI["urn:ogc:def:datum:EPSG::6326"]]]
+     *      Id["EPSG", 6326, Citation["IOGP"], URI["urn:ogc:def:datum:EPSG::6326"]]]
      * }
      *
      * <p>Same datum using WKT 1.</p>

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -213,11 +213,11 @@ public abstract class NormalizedProjecti
      * The parameters of the given {@code method} argument shall contains descriptor for the given parameters
      * (using OGC names):
      * <ul>
-     *   <li>{@code "semi_major"}</li>
-     *   <li>{@code "semi_minor"}</li>
-     *   <li>{@code "central_meridian"}</li>
-     *   <li>{@code "false_easting"}</li>
-     *   <li>{@code "false_northing"}</li>
+     *   <li>{@code "semi_major"}       (mandatory)</li>
+     *   <li>{@code "semi_minor"}       (mandatory)</li>
+     *   <li>{@code "central_meridian"} (optional, default to 0°)</li>
+     *   <li>{@code "false_easting"}    (optional, default to 0 metre)</li>
+     *   <li>{@code "false_northing"}   (optional, default to 0 metre)</li>
      * </ul>
      *
      * <div class="note"><b>Note:</b>

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -43,7 +43,7 @@ public final strictfp class CodeTest ext
      */
     @Test
     public void testSimple() {
-        final Identifier id = new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326");
+        final Identifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326");
         final Code value = new Code(id);
         assertEquals("codeSpace", "EPSG", value.codeSpace);
         assertEquals("code",      "4326", value.code);
@@ -64,7 +64,7 @@ public final strictfp class CodeTest ext
     @Test
     @DependsOnMethod("testSimple")
     public void testWithVersion() {
-        final Identifier id = new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326", "8.2", null);
+        final Identifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null);
         final Code value = new Code(id);
         assertEquals("codeSpace", "EPSG:8.2", value.codeSpace);
         assertEquals("code",      "4326",     value.code);
@@ -85,10 +85,10 @@ public final strictfp class CodeTest ext
     @Test
     @DependsOnMethod("testWithVersion")
     public void testForIdentifiedObject() {
-        final Identifier id = new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326", "8.2", null);
+        final Identifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null);
         final Code value = Code.forIdentifiedObject(GeographicCRS.class, Collections.singleton(id));
         assertNotNull(value);
-        assertEquals("codeSpace", "OGP", value.codeSpace);
+        assertEquals("codeSpace", "IOGP", value.codeSpace);
         assertEquals("code", "urn:ogc:def:crs:EPSG:8.2:4326", value.code);
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -83,7 +83,7 @@ public final strictfp class AffineTest e
         final Matrix matrix = Matrices.createDiagonal(3, 3);
         assertWktEquals(
                 "ParameterGroup[“Affine parametric transformation”," +
-                " Id[“EPSG”, 9624, Citation[“OGP”]]]", Affine.parameters(matrix));
+                " Id[“EPSG”, 9624, Citation[“IOGP”]]]", Affine.parameters(matrix));
         /*
          * Try arbitrary values.
          */
@@ -95,7 +95,7 @@ public final strictfp class AffineTest e
                 "  Parameter[“A1”, 2.0, Id[“EPSG”, 8624]],\n"  +
                 "  Parameter[“B1”, 0.0, Id[“EPSG”, 8640]],\n" +
                 "  Parameter[“B2”, -1.0, Id[“EPSG”, 8641]],\n" +
-                "  Id[“EPSG”, 9624, Citation[“OGP”]]]", Affine.parameters(matrix));
+                "  Id[“EPSG”, 9624, Citation[“IOGP”]]]", Affine.parameters(matrix));
         /*
          * Setting a value on the last row make the matrix non-affine.
          * So it should not be anymore EPSG:9624.

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -128,7 +128,7 @@ public final strictfp class MapProjectio
         assertEquals("minimumOccurs", isMandatory ? 1 : 0, actual.getMinimumOccurs());
         if (epsgName != null) {
             for (final GenericName alias : actual.getAlias()) {
-                if (alias instanceof Identifier && ((Identifier) alias).getAuthority() != Citations.OGP) {
+                if (alias instanceof Identifier && ((Identifier) alias).getAuthority() != Citations.EPSG) {
                     ReferencingAssert.assertOgcIdentifierEquals(ogcName, (Identifier) alias);
                     return;
                 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -203,7 +203,7 @@ public final strictfp class DefaultParam
          * but is reproduced here for easier comparison with the test following it.
          */
         final DefaultParameterDescriptor<Double> descriptor = DefaultParameterDescriptorTest.createEPSG("A0", Constants.A0);
-        assertWktEquals("Parameter[“A0”, Id[“EPSG”, 8623, Citation[“OGP”], URI[“urn:ogc:def:parameter:EPSG::8623”]]]", descriptor);
+        assertWktEquals("Parameter[“A0”, Id[“EPSG”, 8623, Citation[“IOGP”], URI[“urn:ogc:def:parameter:EPSG::8623”]]]", descriptor);
         /*
          * When the parameter is part of a larger element, we expect a simplification.
          * Here, the URI should be omitted because it is a long value which does not
@@ -212,7 +212,7 @@ public final strictfp class DefaultParam
         final DefaultParameterDescriptorGroup group = new DefaultParameterDescriptorGroup(
                 Collections.singletonMap(NAME_KEY, "Affine"), 1, 1, descriptor);
         assertWktEquals("ParameterGroup[“Affine”,\n" +
-                        "  Parameter[“A0”, Id[“EPSG”, 8623, Citation[“OGP”]]]]", group);
+                        "  Parameter[“A0”, Id[“EPSG”, 8623, Citation[“IOGP”]]]]", group);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -147,7 +147,7 @@ public final strictfp class DefaultParam
     static DefaultParameterDescriptor<Double> createEPSG(final String name, final short code) {
         final Map<String, Object> properties = properties(name);
         assertNull(properties.put(DefaultParameterDescriptor.IDENTIFIERS_KEY,
-                new ImmutableIdentifier(HardCodedCitations.OGP, Constants.EPSG, Short.toString(code))));
+                new ImmutableIdentifier(HardCodedCitations.IOGP, Constants.EPSG, Short.toString(code))));
         return new DefaultParameterDescriptor<>(properties, 0, 1, Double.class, null, null, null);
     }
 
@@ -323,6 +323,6 @@ public final strictfp class DefaultParam
     @DependsOnMethod("testWKT")
     public void testIdentifiedParameterWKT() {
         final DefaultParameterDescriptor<Double> descriptor = createEPSG("A0", Constants.A0);
-        assertWktEquals("Parameter[“A0”, Id[“EPSG”, 8623, Citation[“OGP”], URI[“urn:ogc:def:parameter:EPSG::8623”]]]", descriptor);
+        assertWktEquals("Parameter[“A0”, Id[“EPSG”, 8623, Citation[“IOGP”], URI[“urn:ogc:def:parameter:EPSG::8623”]]]", descriptor);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -611,6 +611,6 @@ public final strictfp class DefaultParam
     @DependsOnMethod("testWKT")
     public void testIdentifiedParameterWKT() {
         final Watcher<Double> parameter = new Watcher<>(DefaultParameterDescriptorTest.createEPSG("A0", Constants.A0));
-        assertWktEquals("Parameter[“A0”, null, Id[“EPSG”, 8623, Citation[“OGP”]]]", parameter);
+        assertWktEquals("Parameter[“A0”, null, Id[“EPSG”, 8623, Citation[“IOGP”]]]", parameter);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterBuilderTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -79,7 +79,7 @@ public final strictfp class ParameterBui
     @DependsOnMethod("testCreate")
     public void testMercatorProjection() {
         final ParameterBuilder builder = new ParameterBuilder();
-        builder.setCodeSpace(HardCodedCitations.OGP, "EPSG").setRequired(true);
+        builder.setCodeSpace(HardCodedCitations.IOGP, "EPSG").setRequired(true);
         final ParameterDescriptor<?>[] parameters = {
             builder.addName("Longitude of natural origin")
                    .addName(HardCodedCitations.OGC, "central_meridian")

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 import static org.apache.sis.test.Assert.*;
 import static org.apache.sis.metadata.iso.citation.HardCodedCitations.OGC;
-import static org.apache.sis.metadata.iso.citation.HardCodedCitations.OGP;
+import static org.apache.sis.metadata.iso.citation.HardCodedCitations.IOGP;
 
 
 /**
@@ -62,7 +62,7 @@ public final strictfp class ParameterFor
     @BeforeClass
     public static void createParameterDescriptor() {
         ParameterBuilder builder = new ParameterBuilder();
-        builder.setCodeSpace(OGP, "EPSG").setRequired(true);
+        builder.setCodeSpace(IOGP, "EPSG").setRequired(true);
         ParameterDescriptor<?>[] parameters = {
             builder.addName("Latitude of natural origin")      .addName(OGC, "latitude_of_origin").createBounded( -80,  +84,  40, NonSI.DEGREE_ANGLE),
             builder.addName("Longitude of natural origin")     .addName(OGC, "central_meridian")  .createBounded(-180, +180, -60, NonSI.DEGREE_ANGLE),

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -322,7 +322,7 @@ public final strictfp class TensorValues
         validate(group);
         assertWktEquals(
                 "ParameterGroup[“Affine”,\n"      +
-                "  Parameter[“num_row”, 3],\n"    +   // Shall be shown even if equals to the defautl value.
+                "  Parameter[“num_row”, 3],\n"    +   // Shall be shown even if equals to the default value.
                 "  Parameter[“num_col”, 3],\n"    +
                 "  Parameter[“elt_0_2”, 4.0],\n"  +
                 "  Parameter[“elt_1_0”, -2.0],\n" +

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -102,7 +102,7 @@ public final strictfp class AbstractRefe
         assertNull(properties.put(SCOPE_KEY, "Large scale topographic mapping and cadastre."));
         assertNull(properties.put(REMARKS_KEY, "注です。"));
         assertNull(properties.put(IDENTIFIERS_KEY, new ImmutableIdentifier(
-                HardCodedCitations.OGP, "EPSG", "4326", "8.2", null)));
+                HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null)));
         assertNull(properties.put(DOMAIN_OF_VALIDITY_KEY, new DefaultExtent("Netherlands offshore.",
                 new DefaultGeographicBoundingBox(2.54, 6.40, 51.43, 55.77),
                 new DefaultVerticalExtent(10, 1000, VerticalCRSMock.DEPTH),
@@ -120,7 +120,7 @@ public final strictfp class AbstractRefe
                 "  Area[“Netherlands offshore.”],\n" +
                 "  BBox[51.43, 2.54, 55.77, 6.40],\n" +
                 "  VerticalExtent[-1000, -10, LengthUnit[“metre”, 1]],\n" +
-                "  Id[“EPSG”, 4326, “8.2”, Citation[“OGP”], URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
+                "  Id[“EPSG”, 4326, “8.2”, Citation[“IOGP”], URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
                 "  Remarks[“注です。”]]",
                 object);
 
@@ -130,7 +130,7 @@ public final strictfp class AbstractRefe
                 "  Area[“Netherlands offshore.”],\n" +
                 "  BBox[51.43, 2.54, 55.77, 6.40],\n" +
                 "  VerticalExtent[-1000, -10],\n" +
-                "  Id[“EPSG”, 4326, “8.2”, Citation[“OGP”], URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
+                "  Id[“EPSG”, 4326, “8.2”, Citation[“IOGP”], URI[“urn:ogc:def:referenceSystem:EPSG:8.2:4326”]],\n" +
                 "  Remarks[“注です。”]]",
                 object);
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -66,13 +66,13 @@ public final strictfp class BuilderTest
     @Test
     public void testSetCodeSpace() {
         final BuilderMock builder = new BuilderMock();
-        builder.setCodeSpace(OGP, "EPSG");
+        builder.setCodeSpace(IOGP, "EPSG");
         builder.addName("Mercator (variant A)");
         /*
          * Setting the same codespace should have no effect, while attempt to
          * set a new codespace after we added a name shall not be allowed.
          */
-        builder.setCodeSpace(OGP, "EPSG");
+        builder.setCodeSpace(IOGP, "EPSG");
         try {
             builder.setCodeSpace(EPSG, "EPSG");
             fail("Setting a different codespace shall not be allowed.");
@@ -84,14 +84,14 @@ public final strictfp class BuilderTest
          * The failed attempt to set a new codespace shall not have modified builder state.
          */
         assertEquals("EPSG", builder.properties.get(Identifier.CODESPACE_KEY));
-        assertSame  ( OGP,   builder.properties.get(Identifier.AUTHORITY_KEY));
+        assertSame  (IOGP,   builder.properties.get(Identifier.AUTHORITY_KEY));
         /*
          * After a cleanup (normally after a createXXX(…) method call), user shall be allowed to
          * set a new codespace again. Note that the cleanup operation shall not clear the codespace.
          */
         builder.onCreate(true);
         assertEquals("EPSG", builder.properties.get(Identifier.CODESPACE_KEY));
-        assertSame  ( OGP,   builder.properties.get(Identifier.AUTHORITY_KEY));
+        assertSame  (IOGP,   builder.properties.get(Identifier.AUTHORITY_KEY));
         builder.setCodeSpace(EPSG, "EPSG");
         assertEquals("EPSG", builder.properties.get(Identifier.CODESPACE_KEY));
         assertSame  ( EPSG,  builder.properties.get(Identifier.AUTHORITY_KEY));
@@ -134,7 +134,7 @@ public final strictfp class BuilderTest
      */
     private static BuilderMock createMercator(final boolean withNames, final boolean withIdentifiers) {
         final BuilderMock builder = new BuilderMock();
-        assertSame(builder, builder.setCodeSpace(OGP, "EPSG"));
+        assertSame(builder, builder.setCodeSpace(IOGP, "EPSG"));
         if (withNames) {
             assertSame(builder, builder.addName(         "Mercator (variant A)")); // EPSG version 7.6 and later.
             assertSame(builder, builder.addName(         "Mercator (1SP)"));       // EPSG before version 7.6.
@@ -187,7 +187,7 @@ public final strictfp class BuilderTest
     @Test
     public void testAddIdentifiers() {
         // Expected values to be used later in the test.
-        final Identifier id1 = new ImmutableIdentifier(OGP,     "EPSG",    "9804");
+        final Identifier id1 = new ImmutableIdentifier(IOGP,     "EPSG",    "9804");
         final Identifier id2 = new ImmutableIdentifier(GEOTIFF, "GeoTIFF", "7");
         assertEquals("EPSG:9804", IdentifiedObjects.toString(id1));
         assertEquals("GeoTIFF:7", IdentifiedObjects.toString(id2));
@@ -212,7 +212,7 @@ public final strictfp class BuilderTest
             final Object value = entry.getValue();
             switch (entry.getKey()) {
                 case Identifier.AUTHORITY_KEY: {
-                    assertSame("Authority and codespace shall be unchanged.", OGP, value);
+                    assertSame("Authority and codespace shall be unchanged.", IOGP, value);
                     break;
                 }
                 case Identifier.CODESPACE_KEY: {
@@ -254,7 +254,7 @@ public final strictfp class BuilderTest
         }, builder.getAsStrings(1));
 
         // Replace "EPSG:Mercator (variant A)" and "(1SP)", and insert a new EPSG code as an alias.
-        assertSame(builder, builder.rename(OGP, "Replacement 3", "Replacement 4", "Replacement 5"));
+        assertSame(builder, builder.rename(IOGP, "Replacement 3", "Replacement 4", "Replacement 5"));
         builder.onCreate(false);
         assertArrayEquals(new String[] {
             "Replacement 3",
@@ -266,7 +266,7 @@ public final strictfp class BuilderTest
         }, builder.getAsStrings(1));
 
         // Remove all EPSG codes.
-        assertSame(builder, builder.rename(OGP, (String[]) null));
+        assertSame(builder, builder.rename(IOGP, (String[]) null));
         builder.onCreate(false);
         assertArrayEquals(new String[] {
             "OGC:Replacement 1",

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -39,7 +39,7 @@ import static org.apache.sis.test.Assert
 
 /**
  * Verifies the values of some geodetic objects. Methods in this class ignore most textual properties like remarks,
- * because OGP allows implementations to modify non-essential properties.
+ * because IOGP allows implementations to modify non-essential properties.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -30,7 +30,7 @@ import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.apache.sis.test.Assert.*;
-import static org.apache.sis.metadata.iso.citation.HardCodedCitations.OGP;
+import static org.apache.sis.metadata.iso.citation.HardCodedCitations.IOGP;
 import static org.apache.sis.metadata.iso.citation.HardCodedCitations.EPSG;
 
 
@@ -49,14 +49,14 @@ public final strictfp class NamedIdentif
      */
     @Test
     public void testCreateFromCode() {
-        final NamedIdentifier identifier = new NamedIdentifier(OGP, "EPSG", "4326", "8.3", null);
+        final NamedIdentifier identifier = new NamedIdentifier(IOGP, "EPSG", "4326", "8.3", null);
         Validators.validate((Identifier)  identifier);
         Validators.validate((GenericName) identifier);
 
         // ImmutableIdentifier properties
         assertEquals("code",      "4326", identifier.getCode());
         assertEquals("codeSpace", "EPSG", identifier.getCodeSpace());
-        assertSame  ("authority",  OGP,   identifier.getAuthority());
+        assertSame  ("authority",  IOGP,   identifier.getAuthority());
         assertEquals("version",   "8.3",  identifier.getVersion());
         assertNull  ("remarks",           identifier.getRemarks());
         assertFalse ("isDeprecated",      identifier.isDeprecated());
@@ -69,8 +69,8 @@ public final strictfp class NamedIdentif
 
         // Scope (derived from the autority)
         final NameSpace scope = identifier.scope();
-        assertFalse ("scope",        scope.isGlobal());
-        assertEquals("scope", "OGP", scope.name().toString());
+        assertFalse ("scope",         scope.isGlobal());
+        assertEquals("scope", "IOGP", scope.name().toString());
     }
 
     /**
@@ -79,7 +79,7 @@ public final strictfp class NamedIdentif
     @Test
     public void testCreateFromName() {
         final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
-        final NameSpace scope = factory.createNameSpace(factory.createLocalName(null, "OGP"), null);
+        final NameSpace scope = factory.createNameSpace(factory.createLocalName(null, "IOGP"), null);
         final NamedIdentifier identifier = new NamedIdentifier(factory.createGenericName(scope, "EPSG", "4326"));
         Validators.validate((Identifier)  identifier);
         Validators.validate((GenericName) identifier);
@@ -87,7 +87,7 @@ public final strictfp class NamedIdentif
         // ImmutableIdentifier properties
         assertEquals("code",      "4326", identifier.getCode());
         assertEquals("codeSpace", "EPSG", identifier.getCodeSpace());
-        assertEquals("authority", "OGP",  identifier.getAuthority().getTitle().toString());
+        assertEquals("authority", "IOGP", identifier.getAuthority().getTitle().toString());
         assertNull  ("version",           identifier.getVersion());
         assertNull  ("remarks",           identifier.getRemarks());
         assertFalse ("isDeprecated",      identifier.isDeprecated());

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -63,7 +63,7 @@ public final strictfp class DefaultOpera
         final Map<String,Object> properties = new HashMap<>(8);
         assertNull(properties.put(OperationMethod.NAME_KEY, method));
         assertNull(properties.put(Identifier.CODESPACE_KEY, "EPSG"));
-        assertNull(properties.put(Identifier.AUTHORITY_KEY, HardCodedCitations.OGP));
+        assertNull(properties.put(Identifier.AUTHORITY_KEY, HardCodedCitations.IOGP));
         /*
          * The parameter group for a Mercator projection is actually not empty, but it is not the purpose of
          * this class to test DefaultParameterDescriptorGroup. So we use an empty group of parameters here.
@@ -74,7 +74,7 @@ public final strictfp class DefaultOpera
          * Then define the other properties to be given to OperationMethod.
          */
         assertNotNull(properties.put(OperationMethod.NAME_KEY, parameters.getName()));
-        assertNull(properties.put(OperationMethod.IDENTIFIERS_KEY, new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", identifier)));
+        assertNull(properties.put(OperationMethod.IDENTIFIERS_KEY, new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", identifier)));
         assertNull(properties.put(OperationMethod.FORMULA_KEY, new DefaultCitation(formula)));
         return new DefaultOperationMethod(properties, dimension, dimension, parameters);
     }
@@ -156,7 +156,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, Citation[“OGP”], URI[“urn:ogc:def:method:EPSG::9804”]]]", method);
+        assertWktEquals("Method[“Mercator (variant A)”, Id[“EPSG”, 9804, Citation[“IOGP”], URI[“urn:ogc:def:method:EPSG::9804”]]]", method);
         assertWktEquals(Convention.WKT1, "PROJECTION[“Mercator (variant A)”, AUTHORITY[“EPSG”, “9804”]]", method);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -17,12 +17,19 @@
 package org.apache.sis.referencing.operation.projection;
 
 import org.opengis.util.FactoryException;
+import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.referencing.provider.Equirectangular;
+import org.apache.sis.io.wkt.Convention;
+import org.apache.sis.referencing.operation.transform.CoordinateDomain;
 import org.apache.sis.test.mock.MathTransformFactoryMock;
+import org.apache.sis.test.ReferencingAssert;
 import org.junit.Test;
 
+import static java.lang.StrictMath.toRadians;
+import static org.apache.sis.internal.metadata.ReferencingServices.AUTHALIC_RADIUS;
+
 
 /**
  * Tests the affine transform created by the {@link Equirectangular} class. This map projection is a
@@ -36,7 +43,10 @@ import org.junit.Test;
  */
 public final strictfp class EquirectangularTest extends MapProjectionTestCase {
     /**
-     * Initializes a simple Equirectangular projection on sphere.
+     * Initializes a simple Equirectangular projection on sphere. This method is different than the
+     * {@code initialize(boolean)} method in all other test classes,  because it does not create an
+     * instance of {@link NormalizedProjection}. Instead, it creates an affine transform for the
+     * whole projection (not only the normalized part).
      */
     private void initialize() throws FactoryException {
         final Equirectangular provider = new Equirectangular();
@@ -47,8 +57,9 @@ public final strictfp class Equirectangu
     }
 
     /**
-     * Tests the WKT formatting of an Equirectangular projection. While the projection is implemented by an
-     * affine transform, the WKT formatter should handle this projection in a special way and show the parameters.
+     * Tests the WKT formatting of an Equirectangular projection. While the projection is implemented by
+     * an affine transform, the WKT formatter should handle this projection in a special way and shows the
+     * projection parameters instead than the affine transform parameters (except in "show internal" mode).
      *
      * @throws FactoryException should never happen.
      */
@@ -59,5 +70,57 @@ public final strictfp class Equirectangu
                 "PARAM_MT[“Equirectangular”,\n" +
                 "  PARAMETER[“semi_major”, 6371007.0],\n" +
                 "  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);
+
+        ReferencingAssert.assertWktEquals(Convention.WKT2_SIMPLIFIED,
+                "Param_MT[“Equidistant Cylindrical (Spherical)”,\n" +
+                "  Parameter[“semi_major”, 6371007.0, Unit[“metre”, 1]],\n" +
+                "  Parameter[“semi_minor”, 6371007.0, Unit[“metre”, 1]]]", transform);
+
+        ReferencingAssert.assertWktEquals(Convention.INTERNAL,
+                "Param_MT[“Affine parametric transformation”,\n" +
+                "  Parameter[“A0”, 111195.04881760638, Id[“EPSG”, 8623]],\n" +
+                "  Parameter[“B1”, 111195.04881760638, Id[“EPSG”, 8640]]]", transform);
+    }
+
+    /**
+     * Tests a simple transform on a sphere.
+     *
+     * @throws FactoryException should never happen.
+     * @throws TransformException should never happen.
+     */
+    @Test
+    public void testSimpleTransform() throws FactoryException, TransformException {
+        initialize();
+        verifyTransform(
+                new double[] {  // (λ,φ) coordinates in degrees to project.
+                    0, 0,
+                    2, 0,
+                    0, 3
+                },
+                new double[] {  // Expected (x,y) results in metres.
+                    0,                            0,
+                    AUTHALIC_RADIUS*toRadians(2), 0,
+                    0, AUTHALIC_RADIUS*toRadians(3)
+                });
+    }
+
+    /**
+     * Tests conversion of random points. This test is actually of limited interest since the Equirectangular
+     * projection is implemented by an affine transform, which has been tested elsewhere.
+     *
+     * @throws FactoryException should never happen.
+     * @throws TransformException should never happen.
+     */
+    @Test
+    public void testRandomPoints() throws FactoryException, TransformException {
+        initialize(new Equirectangular(), true, true, false);
+        tolerance = Formulas.LINEAR_TOLERANCE;  // Not NORMALIZED_TOLERANCE since this is not a NormalizedProjection.
+        derivativeDeltas = new double[] {100, 100};
+        verifyInDomain(CoordinateDomain.GEOGRAPHIC, 0);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -94,5 +94,6 @@ strictfp class MapProjectionTestCase ext
             parameters.parameter(Constants.SCALE_FACTOR).setValue(0.997);
         }
         transform = new MathTransformFactoryMock(provider).createParameterizedTransform(parameters);
+        validate();
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java?rev=1672117&r1=1672116&r2=1672117&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java [UTF-8] Wed Apr  8 16:12:52 2015
@@ -84,7 +84,7 @@ public strictfp class ReferencingAssert
 
     /**
      * Asserts that the given identifier has the expected code and the {@code "EPSG"} code space.
-     * The authority is expected to have the {@code "OGP"} title or alternate title.
+     * The authority is expected to have the {@code "IOGP"} title or alternate title.
      *
      * @param expected The expected identifier code.
      * @param actual   The identifier to verify.
@@ -95,7 +95,7 @@ public strictfp class ReferencingAssert
         assertNotNull(actual);
         assertEquals("code",       expected, actual.getCode());
         assertEquals("codeSpace",  EPSG,  actual.getCodeSpace());
-        assertEquals("authority",  "OGP", Citations.getIdentifier(actual.getAuthority()));
+        assertEquals("authority", "IOGP", Citations.getIdentifier(actual.getAuthority()));
         assertEquals("identifier", EPSG + DefaultNameSpace.DEFAULT_SEPARATOR + expected,
                 IdentifiedObjects.toString(actual));
     }



Mime
View raw message