Author: desruisseaux
Date: Tue Mar 17 19:29:48 2015
New Revision: 1667377
URL: http://svn.apache.org/r1667377
Log:
Referencing: add MapInfo identifiers to Mercator projection.
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
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=1667377&r1=1667376&r2=1667377&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] Tue Mar 17 19:29:48 2015
@@ -151,6 +151,15 @@ public final class Citations extends Sta
public static final IdentifierSpace<String> PROJ4 = new
Authority<>("Proj.4", "Proj4");
/**
+ * The MapInfo software. This software defines its own projection codes.
+ *
+ * @category Code space
+ *
+ * @since 0.6
+ */
+ public static final IdentifierSpace<Integer> MAP_INFO = new
Authority<>("MapInfo", "MapInfo");
+
+ /**
* <cite>International Standard Book Number</cite> (ISBN) defined by
ISO-2108.
* The ISO-19115 metadata standard defines a specific attribute for this
information,
* but the SIS library handles it like any other identifier.
@@ -176,7 +185,7 @@ public final class Citations extends Sta
* List of citations declared in this class.
*/
private static final Citation[] CITATIONS = {
- ISO, OGC, OGP, EPSG, SIS, ESRI, ORACLE, NETCDF, GEOTIFF, PROJ4, ISBN,
ISSN
+ ISO, OGC, OGP, EPSG, SIS, ESRI, ORACLE, NETCDF, GEOTIFF, PROJ4,
MAP_INFO, ISBN, ISSN
};
/**
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=1667377&r1=1667376&r2=1667377&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] Tue Mar 17 19:29:48 2015
@@ -136,19 +136,19 @@ public final class Mercator1SP extends M
.addName(Citations.PROJ4, "y_0"));
PARAMETERS = builder
- .addIdentifier("9804") // The ellipsoidal case
- .addIdentifier("1026") // The spherical case
- .addName("Mercator (variant A)") // Starting from EPSG version
7.6
- .addName("Mercator (Spherical)") // Starting from EPSG version
7.6
- .addDeprecatedIdentifier("9841", "1026")
// The spherical (1SP) case
- .addDeprecatedName("Mercator (1SP)", "Mercator
(variant A)") // Prior to EPSG version 7.6
- .addDeprecatedName("Mercator (1SP) (Spherical)", "Mercator
(Spherical)") // Prior to EPSG version 7.6
+ .addIdentifier( "9804")
// The ellipsoidal case
+ .addIdentifier( "1026")
// The spherical case
+ .addDeprecatedIdentifier( "9841", "1026")
// The spherical (1SP) case
+ .addName( "Mercator (variant A)")
// Starting from EPSG version 7.6
+ .addName( "Mercator (Spherical)")
// Starting from EPSG version 7.6
+ .addDeprecatedName( "Mercator (1SP)",
"Mercator (variant A)") // Prior to EPSG version 7.6
+ .addDeprecatedName( "Mercator (1SP) (Spherical)",
"Mercator (Spherical)") // Prior to EPSG version 7.6
.addName(Citations.OGC, "Mercator_1SP")
.addName(Citations.GEOTIFF, "CT_Mercator")
.addName(Citations.PROJ4, "merc")
- .addIdentifier(Citations.GEOTIFF, "7")
-// .addIdentifier(Citations.MAP_INFO, "10")
-// .addIdentifier(Citations.MAP_INFO, "26")
+ .addIdentifier(Citations.GEOTIFF, "7")
+ .addIdentifier(Citations.MAP_INFO, "10")
+ .addIdentifier(Citations.MAP_INFO, "26")
.createGroupForMapProjection(LATITUDE_OF_ORIGIN, CENTRAL_MERIDIAN,
SCALE_FACTOR, FALSE_EASTING, FALSE_NORTHING);
}
