Author: desruisseaux
Date: Mon Mar 16 22:45:26 2015
New Revision: 1667150
URL: http://svn.apache.org/r1667150
Log:
Referencing: use the dedicated "createGroupForMapProjection" methods when
creating Mercator parameters.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedName.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedName.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedName.java?rev=1667150&r1=1667149&r2=1667150&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedName.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedName.java
[UTF-8] Mon Mar 16 22:45:26 2015
@@ -36,9 +36,9 @@ public final class DeprecatedName extend
private static final long serialVersionUID = 1792369861343798471L;
/**
- * Creates a new deprecated name with the same authority, code, version
and remarks than the identifier.
+ * Creates a new deprecated name with the same authority, code, version
and remarks than the given identifier.
*
- * @param identifier The identifier.
+ * @param identifier The identifier to deprecate.
*/
public DeprecatedName(final Identifier identifier) {
super(identifier);
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java?rev=1667150&r1=1667149&r2=1667150&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] Mon Mar 16 22:45:26 2015
@@ -144,7 +144,7 @@ public final class Mercator1SP extends M
.addName("Mercator (variant A)") // Starting from EPSG version
7.6
.addName("Mercator (Spherical)")
.addIdentifier( new DeprecatedCode((short) 9841, (short)
1026)) // The spherical (1SP) case
- .addName((GenericName) new DeprecatedName("Mercator (1SP)"))
// Prior to EPSG version 7.6.
+ .addName((GenericName) new DeprecatedName("Mercator (1SP)"))
// Prior to EPSG version 7.6
.addName((GenericName) new DeprecatedName("Mercator (1SP)
(Spherical)"))
.addName(Citations.OGC, "Mercator_1SP")
.addName(Citations.GEOTIFF, "CT_Mercator")
@@ -152,9 +152,8 @@ public final class Mercator1SP extends M
.addIdentifier(Citations.GEOTIFF, "7")
// .addIdentifier(Citations.MAP_INFO, "10")
// .addIdentifier(Citations.MAP_INFO, "26")
- .createGroup(SEMI_MAJOR, SEMI_MINOR,
- LATITUDE_OF_ORIGIN, CENTRAL_MERIDIAN, SCALE_FACTOR,
- FALSE_EASTING, FALSE_NORTHING);
+ .createGroupForMapProjection(LATITUDE_OF_ORIGIN, CENTRAL_MERIDIAN,
+ SCALE_FACTOR, FALSE_EASTING, FALSE_NORTHING);
}
/**
