Except for a javadoc fix and the "extends Mercator"
fix in the Spherical inner class,
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 commit has been reverted, except for the removal of really unused imports which are kept removed.
The javadoc error are then identified and fixed by warnings produced by the IDE, and the "extends Mercator"
statement is fixed as a result of test failures if we do not fix it.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r9357:10796 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/TransverseMercator.java
Revision 9357 | Revision 10796 |
---|---|
* Geotools - OpenSource mapping toolkit
* (C) 2003, 2004 Geotools Project Managment Committee (PMC)
* (C) 2002, Centre for Computational Geography
* (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 - OpenSource mapping toolkit
* (C) 2003, 2004 Geotools Project Managment Committee (PMC)
* (C) 2002, Centre for Computational Geography
* (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.Collection; import java.awt.geom.Point2D; // OpenGIS dependencies 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.referencing.Identifier; import org.geotools.metadata.citation.Citation; import org.geotools.resources.cts.ResourceKeys; import org.geotools.resources.cts.Resources; /** * Transverse Mercator Projection (EPSG code 9807). This * is a cylindrical projection, in which the cylinder has been rotated 90°. * Instead of being tangent to the equator (or to an other standard latitude), * it is tangent to a central meridian. Deformation are more important as we * are going futher from the central meridian. The Transverse Mercator |
package org.geotools.referencing.operation.projection; // J2SE dependencies and extensions import java.awt.geom.Point2D; import java.util.Collection; import org.geotools.metadata.citation.Citation; import org.geotools.referencing.Identifier; 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; /** * Transverse Mercator Projection (EPSG code 9807). This * is a cylindrical projection, in which the cylinder has been rotated 90�. * Instead of being tangent to the equator (or to an other standard latitude), * it is tangent to a central meridian. Deformation are more important as we * are going futher from the central meridian. The Transverse Mercator |
* @see <A HREF="http://www.remotesensing.org/geotiff/proj_list/transverse_mercator.html">"Transverse_Mercator" 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/transverse_mercator.html">"Transverse_Mercator" on Remote Sensing</A>
*
* @version $Id$
* @author Andr� Gosselin
* @author Martin Desruisseaux
* @author Rueben Schulz
*/ |
public class TransverseMercator extends MapProjection {
/**
* A derived quantity of excentricity, computed
* by <code>e'² = (a²-b²)/b² = es/(1-es)</code>
* where <var>a</var> is the semi-major axis length
* and <var>b</bar> is the semi-minor axis length.
*/ |
public class TransverseMercator extends MapProjection {
/**
* A derived quantity of excentricity, computed
* by <code>e'� = (a�-b�)/b� = es/(1-es)</code>
* where <var>a</var> is the semi-major axis length
* and <var>b</bar> is the semi-minor axis length.
*/ |
* @param expected The expected parameter descriptors.
* @throws ParameterNotFoundException if a mandatory parameter is missing.
*/
public TransverseMercator(final ParameterValueGroup parameters, final Collection expected) {
//Fetch parameters
super(parameters, expected); |
* @param expected The expected parameter descriptors. * @throws ParameterNotFoundException if a mandatory parameter is missing. */ TransverseMercator(final ParameterValueGroup parameters, final Collection expected) throws ParameterNotFoundException { //Fetch parameters super(parameters, expected); |
* TransverseMercator projection. * * @version $Id$ * @author André Gosselin * @author Martin Desruisseaux * @author Rueben Schulz */ private static final class Spherical extends Mercator { /** * 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) |
* TransverseMercator projection. * * @version $Id$ * @author Andr� Gosselin * @author Martin Desruisseaux * @author Rueben Schulz */ private static final class Spherical extends TransverseMercator { /** * 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) |