sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1667147 - in /sis/branches/JDK8: core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/ core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ core/sis-referencing/src/main/java/org/apache/sis/internal/refer...
Date Mon, 16 Mar 2015 22:32:54 GMT
Author: desruisseaux
Date: Mon Mar 16 22:32:53 2015
New Revision: 1667147

URL: http://svn.apache.org/r1667147
Log:
Referencing: initial port of Mercator1SP projection parameters.
Not yet complete, since the projection code itself is not yet ported.

Added:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedCode.java
      - copied, changed from r1666937, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/IdentifierCode.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
  (with props)
Removed:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/IdentifierCode.java
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/DeprecatedName.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/LongitudeRotation.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UninitializedParameter.java
    sis/branches/JDK8/src/main/javadoc/stylesheet.css

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=1667147&r1=1667146&r2=1667147&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] Mon Mar 16 22:32:53 2015
@@ -75,6 +75,28 @@ public final class Citations extends Sta
     public static final Citation OGP = new SimpleCitation("OGP");
 
     /**
+     * The <a href="http://www.epsg.org">EPSG</a> dataset. This citation is used
as an authority for
+     * {@linkplain org.opengis.referencing.crs.CoordinateReferenceSystem coordinate reference
system}
+     * identifiers.
+     *
+     * <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).
+     * The legacy acronym now applies only to the database Coordinate Reference System definitions,
+     * known as <cite>EPSG dataset</cite>.</div>
+     *
+     * @see #OGP
+     * @see #AUTO
+     * @see #AUTO2
+     * @see #CRS
+     * @category Code space
+     *
+     * @since 0.4
+     */
+    public static final IdentifierSpace<Integer> EPSG = new Authority<>(Constants.EPSG,
Constants.EPSG);
+
+    /**
      * The <a href="http://sis.apache.org">Apache SIS</a> project.
      *
      * @since 0.4
@@ -111,43 +133,22 @@ public final class Citations extends Sta
 
     /**
      * The <a href="http://www.remotesensing.org/geotiff/geotiff.html">GeoTIFF</a>
specification.
-     *
-     * @category Specification
-     *
-     * @since 0.4
-     */
-    public static final Citation GEOTIFF = new SimpleCitation("GeoTIFF");
-
-    /**
-     * The <a href="http://trac.osgeo.org/proj/">Proj.4</a> project.
+     * This specification identifies some map projections by their own numerical codes.
      *
      * @category Code space
      *
      * @since 0.4
      */
-    public static final IdentifierSpace<String> PROJ4 = new Authority<>("Proj.4",
"PROJ4");
+    public static final IdentifierSpace<Integer> GEOTIFF = new Authority<>("GeoTIFF",
"GeoTIFF");
 
     /**
-     * The <a href="http://www.epsg.org">EPSG</a> dataset. This citation is used
as an authority for
-     * {@linkplain org.opengis.referencing.crs.CoordinateReferenceSystem coordinate reference
system}
-     * identifiers.
-     *
-     * <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).
-     * The legacy acronym now applies only to the database Coordinate Reference System definitions,
-     * known as <cite>EPSG dataset</cite>.</div>
+     * The <a href="http://trac.osgeo.org/proj/">Proj.4</a> project.
      *
-     * @see #OGP
-     * @see #AUTO
-     * @see #AUTO2
-     * @see #CRS
      * @category Code space
      *
      * @since 0.4
      */
-    public static final IdentifierSpace<Integer> EPSG = new Authority<>(Constants.EPSG,
Constants.EPSG);
+    public static final IdentifierSpace<String> PROJ4 = new Authority<>("Proj.4",
"Proj4");
 
     /**
      * <cite>International Standard Book Number</cite> (ISBN) defined by ISO-2108.
@@ -175,7 +176,7 @@ public final class Citations extends Sta
      * List of citations declared in this class.
      */
     private static final Citation[] CITATIONS = {
-        ISO, OGC, OGP, SIS, ESRI, ORACLE, NETCDF, GEOTIFF, PROJ4, EPSG, ISBN, ISSN
+        ISO, OGC, OGP, EPSG, SIS, ESRI, ORACLE, NETCDF, GEOTIFF, PROJ4, ISBN, ISSN
     };
 
     /**

Copied: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedCode.java
(from r1666937, sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/IdentifierCode.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedCode.java?p2=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedCode.java&p1=sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/IdentifierCode.java&r1=1666937&r2=1667147&rev=1667147&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/IdentifierCode.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/DeprecatedCode.java
[UTF-8] Mon Mar 16 22:32:53 2015
@@ -14,78 +14,53 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.referencing.provider;
+package org.apache.sis.internal.referencing;
 
 import org.opengis.util.InternationalString;
-import org.opengis.metadata.citation.Citation;
+import org.apache.sis.internal.util.Constants;
 import org.apache.sis.metadata.iso.ImmutableIdentifier;
+import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.util.resources.Vocabulary;
 
 
 /**
- * A reference identifier for EPSG or GeoTiff codes.
+ * A reference identifier for a deprecated EPSG codes.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
  * @version 0.6
  * @module
  */
-final class IdentifierCode extends ImmutableIdentifier {
+public final class DeprecatedCode extends ImmutableIdentifier {
     /**
      * For cross-version compatibility.
      */
     private static final long serialVersionUID = 357222258307746767L;
 
     /**
-     * If this identifier is deprecated, the identifier that supersede this one.
-     * Otherwise {@code 0}.
-     */
-    final int supersededBy;
-
-    /**
-     * Creates a new identifier for the given authority.
+     * Creates a deprecated identifier.
      *
-     * @param authority Organization for definition and maintenance of the code space or
code.
-     * @param code Identifier code from the authority.
-     */
-    IdentifierCode(final Citation authority, final int code) {
-        this(authority, code, 0);
-    }
-
-    /**
-     * Creates a deprecated identifier for the given authority.
-     *
-     * @param authority Organization for definition and maintenance of the code space or
code.
-     * @param code Identifier code from the authority.
+     * @param code Identifier code from the EPSG authority.
      * @param supersededBy The code that replace this one.
      */
-    IdentifierCode(final Citation authority, final int code, final int supersededBy) {
-        super(authority, codespace(authority), Integer.toString(code), null, remarks(supersededBy));
-        this.supersededBy = supersededBy;
-    }
-
-    /**
-     * Returns the code space for the given authority.
-     */
-    private static String codespace(final Citation authority) {
-        return authority.getIdentifiers().iterator().next().getCode();
+    public DeprecatedCode(final short code, final short supersededBy) {
+        super(Citations.OGP, Constants.EPSG, Short.toString(code).intern(), null, remarks(supersededBy));
     }
 
     /**
-     * formats a "Superseded by" international string.
+     * Formats a "Superseded by" international string.
      */
     private static InternationalString remarks(final int supersededBy) {
-        if (supersededBy == 0) {
-            return null;
-        }
         return Vocabulary.formatInternational(Vocabulary.Keys.SupersededBy_1, supersededBy);
     }
 
     /**
-     * Returns {@code true} if this code is deprecated.
+     * Returns {@code true} since this code is deprecated.
+     *
+     * @return {@code true}.
      */
     @Override
     public boolean isDeprecated() {
-        return supersededBy != 0;
+        return true;
     }
 }

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=1667147&r1=1667146&r2=1667147&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:32:53 2015
@@ -16,8 +16,8 @@
  */
 package org.apache.sis.internal.referencing;
 
-import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.Identifier;
+import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.NamedIdentifier;
 
 
@@ -45,13 +45,12 @@ public final class DeprecatedName extend
     }
 
     /**
-     * Creates a new deprecated name for the given code.
+     * Creates a new deprecated EPSG name.
      *
-     * @param authority The authority, or {@code null} if not available.
-     * @param code      The code.
+     * @param name The EPSG name.
      */
-    public DeprecatedName(final Citation authority, final String code) {
-        super(authority, code);
+    public DeprecatedName(final String name) {
+        super(Citations.EPSG, name);
     }
 
     /**

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=1667147&r1=1667146&r2=1667147&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] Mon Mar 16 22:32:53 2015
@@ -19,11 +19,18 @@ package org.apache.sis.internal.referenc
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Collection;
+import javax.measure.unit.Unit;
+import javax.measure.unit.SI;
+import javax.measure.unit.NonSI;
 import org.opengis.util.GenericName;
 import org.opengis.metadata.Identifier;
+import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.internal.util.Constants;
+import org.apache.sis.measure.Latitude;
+import org.apache.sis.measure.Longitude;
+import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
@@ -105,4 +112,38 @@ abstract class AbstractProvider extends
     static ParameterBuilder builder() {
         return new ParameterBuilder().setCodeSpace(Citations.OGP, Constants.EPSG).setRequired(true);
     }
+
+    /**
+     * Creates a descriptor for a latitude parameter in degrees.
+     */
+    static ParameterDescriptor<Double> createLatitude(final ParameterBuilder builder,
final boolean includePoles) {
+        return builder.createBounded(MeasurementRange.create(
+                Latitude.MIN_VALUE, includePoles,
+                Latitude.MAX_VALUE, includePoles,
+                NonSI.DEGREE_ANGLE), 0.0);
+    }
+
+    /**
+     * Creates a descriptor for a longitude parameter in degrees.
+     */
+    static ParameterDescriptor<Double> createLongitude(final ParameterBuilder builder)
{
+        return builder.createBounded(MeasurementRange.create(
+                Longitude.MIN_VALUE, true,
+                Longitude.MAX_VALUE, true,
+                NonSI.DEGREE_ANGLE), 0.0);
+    }
+
+    /**
+     * Creates a descriptor for a scale parameter with a default value of 1.
+     */
+    static ParameterDescriptor<Double> createScale(final ParameterBuilder builder)
{
+        return builder.createStrictlyPositive(1.0, Unit.ONE);
+    }
+
+    /**
+     * Creates a false easting or northing parameter in metre with a default value of 0.
+     */
+    static ParameterDescriptor<Double> createShift(final ParameterBuilder builder)
{
+        return builder.create(0.0, SI.METRE);
+    }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java?rev=1667147&r1=1667146&r2=1667147&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
[UTF-8] Mon Mar 16 22:32:53 2015
@@ -68,10 +68,10 @@ public final class LongitudeRotation ext
     /**
      * The group of all parameters expected by this coordinate operation.
      */
-    static final ParameterDescriptorGroup PARAMETERS;
+    private static final ParameterDescriptorGroup PARAMETERS;
     static {
         final ParameterBuilder builder = builder();
-        OFFSET     = builder.addIdentifier("8602").addName(NAME).createBounded(-180, +180,
Double.NaN, NonSI.DEGREE_ANGLE);
+        OFFSET = createLongitude(builder.addIdentifier("8602").addName(NAME));
         PARAMETERS = builder.addIdentifier("9601").addName("Longitude rotation").createGroup(OFFSET);
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java?rev=1667147&r1=1667146&r2=1667147&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
[UTF-8] Mon Mar 16 22:32:53 2015
@@ -118,7 +118,7 @@ public abstract class MapProjection exte
      * Creates a map projection from the specified group of parameter values.
      *
      * @param  values The group of parameter values.
-     * @return The created map projection.
+     * @return The map projection created from the given parameter values.
      * @throws ParameterNotFoundException if a required parameter was not found.
      */
     @Override

Added: 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=1667147&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] Mon Mar 16 22:32:53 2015
@@ -0,0 +1,186 @@
+/*
+ * 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.internal.referencing.provider;
+
+import org.opengis.util.GenericName;
+import org.opengis.parameter.ParameterValueGroup;
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.referencing.operation.MathTransform2D;
+import org.opengis.referencing.operation.CylindricalProjection;
+import org.apache.sis.parameter.ParameterBuilder;
+import org.apache.sis.metadata.iso.citation.Citations;
+import org.apache.sis.internal.referencing.DeprecatedCode;
+import org.apache.sis.internal.referencing.DeprecatedName;
+
+
+/**
+ * The provider for "<cite>Mercator (variant A)</cite>" projection
+ * (EPSG:9804, EPSG:1026, <span class="deprecated">EPSG:9841</span>).
+ * EPSG defines two codes for this projection, 1026 being the spherical case and 9804 the
ellipsoidal case.
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @author  Rueben Schulz (UBC)
+ * @since   0.6
+ * @version 0.6
+ * @module
+ *
+ * @see <a href="http://www.remotesensing.org/geotiff/proj_list/mercator_1sp.html">Mercator
1SP on RemoteSensing.org</a>
+ */
+public final class Mercator1SP extends MapProjection {
+    /**
+     * For cross-version compatibility.
+     */
+    private static final long serialVersionUID = -5886510621481710072L;
+
+    /**
+     * The operation parameter descriptor for the {@linkplain
+     * org.apache.sis.referencing.operation.projection.UnitaryProjection.Parameters#centralMeridian
+     * central meridian} parameter value.
+     *
+     * This parameter is mandatory.
+     * Valid values range is [-180 … 180]° and default value is 0°.
+     */
+    public static final ParameterDescriptor<Double> CENTRAL_MERIDIAN;
+
+    /**
+     * The operation parameter descriptor for the {@linkplain
+     * org.apache.sis.referencing.operation.projection.UnitaryProjection.Parameters#latitudeOfOrigin
+     * latitude of origin} parameter value.
+     *
+     * This parameter is mandatory.
+     * Valid values range is [-90 … 90]° and default value is 0°.
+     */
+    public static final ParameterDescriptor<Double> LATITUDE_OF_ORIGIN;
+
+    /**
+     * The operation parameter descriptor for the {@linkplain
+     * org.apache.sis.referencing.operation.projection.UnitaryProjection.Parameters#scaleFactor
+     * scale factor} parameter value.
+     *
+     * This parameter is mandatory.
+     * Valid values range is (0 … ∞) and default value is 1.
+     */
+    public static final ParameterDescriptor<Double> SCALE_FACTOR;
+
+    /**
+     * The operation parameter descriptor for the {@linkplain
+     * org.apache.sis.referencing.operation.projection.UnitaryProjection.Parameters#falseEasting
+     * false easting} parameter value.
+     *
+     * This parameter is mandatory.
+     * Valid values range is unrestricted and default value is 0 metre.
+     */
+    public static final ParameterDescriptor<Double> FALSE_EASTING;
+
+    /**
+     * The operation parameter descriptor for the {@linkplain
+     * org.apache.sis.referencing.operation.projection.UnitaryProjection.Parameters#falseNorthing
+     * false northing} parameter value.
+     *
+     * This parameter is mandatory.
+     * Valid values range is unrestricted and default value is 0 metre.
+     */
+    public static final ParameterDescriptor<Double> FALSE_NORTHING;
+
+    /**
+     * The group of all parameters expected by this coordinate operation.
+     */
+    private static final ParameterDescriptorGroup PARAMETERS;
+    static {
+        final ParameterBuilder builder = builder();
+        LATITUDE_OF_ORIGIN = createLatitude(builder
+                .addIdentifier("8801")
+                .addName("Latitude of natural origin")
+                .addName(Citations.OGC,     "latitude_of_origin")
+                .addName(Citations.GEOTIFF, "NatOriginLat")
+                .addName(Citations.PROJ4,   "lat_0"), false);
+
+        CENTRAL_MERIDIAN = createLongitude(builder
+                .addIdentifier("8802")
+                .addName("Longitude of natural origin")
+                .addName(Citations.OGC,     "central_meridian")
+                .addName(Citations.GEOTIFF, "NatOriginLong")
+                .addName(Citations.PROJ4,   "lon_0"));
+
+        SCALE_FACTOR = createScale(builder
+                .addIdentifier("8805")
+                .addName("Scale factor at natural origin")
+                .addName(Citations.OGC,     "scale_factor")
+                .addName(Citations.GEOTIFF, "ScaleAtNatOrigin")
+                .addName(Citations.PROJ4,   "k"));
+
+        FALSE_EASTING = createShift(builder
+                .addIdentifier("8806")
+                .addName("False easting")
+                .addName(Citations.OGC,     "false_easting")
+                .addName(Citations.GEOTIFF, "FalseEasting")
+                .addName(Citations.PROJ4,   "x_0"));
+
+        FALSE_NORTHING = createShift(builder
+                .addIdentifier("8807")
+                .addName("False northing")
+                .addName(Citations.OGC,     "false_northing")
+                .addName(Citations.GEOTIFF, "FalseNorthing")
+                .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)")
+            .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) (Spherical)"))
+            .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")
+            .createGroup(SEMI_MAJOR, SEMI_MINOR,
+                         LATITUDE_OF_ORIGIN, CENTRAL_MERIDIAN, SCALE_FACTOR,
+                         FALSE_EASTING, FALSE_NORTHING);
+    }
+
+    /**
+     * Constructs a new provider.
+     */
+    public Mercator1SP() {
+        super(PARAMETERS);
+    }
+
+    /**
+     * Returns the operation type for this map projection.
+     *
+     * @return {@code CylindricalProjection.class}
+     */
+    @Override
+    public Class<CylindricalProjection> getOperationType() {
+        return CylindricalProjection.class;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return The map projection created from the given parameter values.
+     */
+    @Override
+    public MathTransform2D createMathTransform(ParameterValueGroup values) {
+        return null; // TODO Mercator.create(getParameters(), values);
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UninitializedParameter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UninitializedParameter.java?rev=1667147&r1=1667146&r2=1667147&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UninitializedParameter.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UninitializedParameter.java
[UTF-8] Mon Mar 16 22:32:53 2015
@@ -25,7 +25,7 @@ import org.apache.sis.referencing.Identi
 /**
  * Placeholder for a mandatory parameter value which has not yet been initialized.
  * {@code UninitializedParameter} are immutable and contains only the descriptor of
- * the parameter to initialize. {@code UninitializedParameter} are replaced by the
+ * the parameter to initialize. {@code UninitializedParameter}s are replaced by the
  * actual parameter when first needed.
  *
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/branches/JDK8/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/src/main/javadoc/stylesheet.css?rev=1667147&r1=1667146&r2=1667147&view=diff
==============================================================================
--- sis/branches/JDK8/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/JDK8/src/main/javadoc/stylesheet.css Mon Mar 16 22:32:53 2015
@@ -187,6 +187,9 @@ ul.verbose li {
   margin-bottom: 6px;
 }
 
+span.deprecated {
+  text-decoration: line-through;
+}
 
 
 



Mime
View raw message