Mercator changes for revisions 9354:10796

Some changes in this commit seem to be the result of some "auto reformat" tool execution. The Java - GeoAPI - GeoTools import ordering is altered, imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken. This change has been reverted, except for the removal of really unused imports which are kept removed.

Other changes are the removal of ESRI parameter names. This commit removes the parameter in every Mercator files, while Apache SIS has selected where the parameter is appropriate (in Mercator2SP). Note also that those information duplicate the ones provided in Mercator1SP and Mercator2SP classes. Apache SIS consolidates those definitions.

Other changes are correction of a javadoc warning. Reverting this change cause a warning to appear in the IDE, which is fixed by redoing the same change.

Command line:

svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r9354:10796 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/Mercator.java
Revision 9354Revision 10796
/*
 * Geotools 2 - OpenSource mapping toolkit
 * (C) 2003, Geotools Project Managment Committee (PMC)
 * (C) 2001, Institut de Recherche pour le Développement
 * (C) 1999, Fisheries and Oceans Canada
 *
 *    This library is free software; you can redistribute it and/or
 
/*
 * Geotools 2 - OpenSource mapping toolkit
 * (C) 2003, Geotools Project Managment Committee (PMC)
 * (C) 2001, Institut de Recherche pour le D�veloppement
 * (C) 1999, Fisheries and Oceans Canada
 *
 *    This library is free software; you can redistribute it and/or
package org.geotools.referencing.operation.projection;

// J2SE dependencies and extensions
import java.util.Map;
import java.util.Locale;
import java.util.HashMap;
import java.util.Collection;
import java.awt.geom.Point2D;
import javax.units.NonSI;

// OpenGIS dependencies
import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.referencing.operation.MathTransform;

// Geotools dependencies
import org.geotools.measure.Latitude;
import org.geotools.referencing.Identifier;
import org.geotools.referencing.operation.MathTransformFactory;  // For Javadoc
import org.geotools.referencing.operation.MathTransformProvider; // For Javadoc
import org.geotools.metadata.citation.Citation;
import org.geotools.resources.cts.ResourceKeys;
import org.geotools.resources.cts.Resources;


/**
 * Mercator Cylindrical Projection. The parallels and the meridians are straight lines and
 * cross at right angles; this projection thus produces rectangular charts. The scale is true
 
package org.geotools.referencing.operation.projection;

// J2SE dependencies and extensions
import java.awt.geom.Point2D;
import java.util.Collection;

import javax.units.NonSI;

import org.geotools.measure.Latitude;
import org.geotools.metadata.citation.Citation;
import org.geotools.referencing.Identifier;
import org.geotools.referencing.operation.MathTransformFactory;
import org.geotools.referencing.operation.MathTransformProvider;
import org.geotools.resources.cts.ResourceKeys;
import org.geotools.resources.cts.Resources;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.operation.MathTransform;


/**
 * Mercator Cylindrical Projection. The parallels and the meridians are straight lines and
 * cross at right angles; this projection thus produces rectangular charts. The scale is true
* @see <A HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html">"mercator_2sp" on Remote Sensing</A>
*
* @version $Id$
* @author André Gosselin
* @author Martin Desruisseaux
* @author Rueben Schulz
*/
 
* @see <A HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html">"mercator_2sp" on Remote Sensing</A>
*
* @version $Id$
* @author Andr� Gosselin
* @author Martin Desruisseaux
* @author Rueben Schulz
*/
    new Identifier(Citation.EPSG,     "Mercator (1SP)"),
    new Identifier(Citation.EPSG,     "9804"),
    new Identifier(Citation.GEOTIFF,  "CT_Mercator"),
    new Identifier(Citation.ESRI,     "Mercator"),
    new Identifier(Citation.GEOTOOLS, Resources.formatInternational(
                                      ResourceKeys.CYLINDRICAL_MERCATOR_PROJECTION))
}, new ParameterDescriptor[] {
 
    new Identifier(Citation.EPSG,     "Mercator (1SP)"),
    new Identifier(Citation.EPSG,     "9804"),
    new Identifier(Citation.GEOTIFF,  "CT_Mercator"),
    new Identifier(Citation.GEOTOOLS, Resources.formatInternational(
                                      ResourceKeys.CYLINDRICAL_MERCATOR_PROJECTION))
}, new ParameterDescriptor[] {
public static final class Provider2SP extends Provider {
    /**
     * The operation parameter descriptor for the {@link #standardParallel standard parallel}
     * parameter value. Valid values range is from -90 to 90°. Default value is 0.
     */
    public static final ParameterDescriptor STANDARD_PARALLEL = createDescriptor(
            new Identifier[] {
 
public static final class Provider2SP extends Provider {
    /**
     * The operation parameter descriptor for the {@link #standardParallel standard parallel}
     * parameter value. Valid values range is from -90 to 90�. Default value is 0.
     */
    public static final ParameterDescriptor STANDARD_PARALLEL = createDescriptor(
            new Identifier[] {
 * Construct a new map projection from the supplied parameters.
 *
 * @param  parameters The parameter values in standard units.
 * @param  The expected parameter descriptors.
 * @throws ParameterNotFoundException if a mandatory parameter is missing.
 */
Mercator(final ParameterValueGroup parameters, final Collection expected)
 
 * Construct a new map projection from the supplied parameters.
 *
 * @param  parameters The parameter values in standard units.
 * @param  expected The expected parameter descriptors.
 * @throws ParameterNotFoundException if a mandatory parameter is missing.
 */
Mercator(final ParameterValueGroup parameters, final Collection expected)
 * Construct a new map projection from the suplied parameters.
 *
 * @param  parameters The parameter values in standard units.
 * @param  The expected parameter descriptors.
 * @throws ParameterNotFoundException if a mandatory parameter is missing.
 */
protected Spherical(final ParameterValueGroup parameters, final Collection expected)
 
 * Construct a new map projection from the suplied parameters.
 *
 * @param  parameters The parameter values in standard units.
 * @param  expected The expected parameter descriptors.
 * @throws ParameterNotFoundException if a mandatory parameter is missing.
 */
protected Spherical(final ParameterValueGroup parameters, final Collection expected)