svn commit: r1667056 [2/3] - in /sis/ip-review: ./ rev/07845/ rev/09131/ rev/09505/ rev/10796/ rev/11695/ rev/12238/ rev/20874/ rev/23993/ rev/25606/ rev/29681/

desruisseaux Mon, 16 Mar 2015 09:19:22 -0700

Added: sis/ip-review/rev/09505/MapProjection.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/09505/MapProjection.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/09505/MapProjection.xhtml (added)
+++ sis/ip-review/rev/09505/MapProjection.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MapProjection changes for revisions 9504:9505</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MapProjection changes for revisions 9504:9505</h1>
+
+<p>The commit contains information which can be removed, then re-added from 
the following sources:</p>
+<ul>
+  <li><a 
href="http://help.arcgis.com/en/arcgisserver/10.0/apis/rest/pcs.html";>http://help.arcgis.com/en/arcgisserver/10.0/apis/rest/pcs.html</a>
 (search "Orthographic")</li>
+</ul>
+
+<p>The "Longitude_Of_Origin" parameter is used in "New_Zealand_Map_Grid", 
which will not be ported to Apache SIS for licensing reasons.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r9504:9505 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/MapProjection.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 9504</th><th>Revision 9505</th></tr>
+<tr><td><pre>    new Identifier(Citation.OPEN_GIS, "central_meridian"),
+    new Identifier(Citation.EPSG,     "Longitude of natural origin"),
+    new Identifier(Citation.EPSG,     "Longitude of false origin"),
+    new Identifier(Citation.GEOTIFF,  "NatOriginLong")
+},
+0, -180, 180, NonSI.DEGREE_ANGLE);</pre></td>
+<td><pre>    new Identifier(Citation.OPEN_GIS, "central_meridian"),
+    new Identifier(Citation.EPSG,     "Longitude of natural origin"),
+    new Identifier(Citation.EPSG,     "Longitude of false origin"),
+<span class="add">    new Identifier(Citation.ESRI,     
"Longitude_Of_Center"),</span>
+<span class="add">    new Identifier(Citation.ESRI,     
"Longitude_Of_Origin"),</span>
+    new Identifier(Citation.GEOTIFF,  "NatOriginLong")
+},
+0, -180, 180, NonSI.DEGREE_ANGLE);</pre></td></tr>
+<tr><td><pre>    new Identifier(Citation.OPEN_GIS, "latitude_of_origin"),
+    new Identifier(Citation.EPSG,     "Latitude of false origin"),
+    new Identifier(Citation.EPSG,     "Latitude of natural origin"),
+    new Identifier(Citation.GEOTIFF,  "NatOriginLat")
+},
+0, -90, 90, NonSI.DEGREE_ANGLE);</pre></td>
+<td><pre>    new Identifier(Citation.OPEN_GIS, "latitude_of_origin"),
+    new Identifier(Citation.EPSG,     "Latitude of false origin"),
+    new Identifier(Citation.EPSG,     "Latitude of natural origin"),
+<span class="add">    new Identifier(Citation.ESRI,     
"Latitude_Of_Center"),</span>
+    new Identifier(Citation.GEOTIFF,  "NatOriginLat")
+},
+0, -90, 90, NonSI.DEGREE_ANGLE);</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>


Propchange: sis/ip-review/rev/09505/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/09505/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/MapProjection.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/10796/MapProjection.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/10796/MapProjection.xhtml (added)
+++ sis/ip-review/rev/10796/MapProjection.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,346 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MapProjection changes for revisions 10259:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MapProjection changes for revisions 10259:10796</h1>
+
+<p>Some changes in this commit seem to be the result of some "<cite>auto 
reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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 keep removed.</p>
+
+<p>The commit contains also information which can be removed, then re-added 
from the following sources:</p>
+<ul>
+  <li><a 
href="http://www.remotesensing.org/geotiff/proj_list/transverse_mercator.html";>http://www.remotesensing.org/geotiff/proj_list/transverse_mercator.html</a></li>
+  <li><a 
href="http://help.arcgis.com/en/arcgisserver/10.0/apis/rest/pcs.html";>http://help.arcgis.com/en/arcgisserver/10.0/apis/rest/pcs.html</a>
 (search "Orthographic")</li>
+</ul>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r10259:10796 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/MapProjection.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10259</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le 
DÃ©veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it and/or</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le 
DÃ¯Â¿Â½veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it 
and/or</pre></td></tr>
+<tr><td><pre>import java.awt.geom.Point2D;
+import java.io.Serializable;
+import java.util.Collection;
+import javax.units.Unit;
+<span class="del">import javax.units.SI;</span>
+<span class="del">import javax.units.NonSI;</span>
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import 
org.opengis.referencing.operation.MathTransform;</span>
+<span class="del">import 
org.opengis.referencing.operation.MathTransform2D;</span>
+<span class="del">import 
org.opengis.referencing.operation.TransformException;</span>
+<span class="del">import 
org.opengis.parameter.InvalidParameterValueException;</span>
+<span class="del">import 
org.opengis.parameter.InvalidParameterNameException;</span>
+<span class="del">import 
org.opengis.parameter.ParameterNotFoundException;</span>
+<span class="del">import org.opengis.parameter.ParameterDescriptorGroup;</span>
+<span class="del">import org.opengis.parameter.ParameterDescriptor;</span>
+<span class="del">import org.opengis.parameter.ParameterValueGroup;</span>
+<span class="del">import org.opengis.parameter.ParameterValue;</span>
+<span class="del"></span>
+<span class="del">// Geotools dependencies</span>
+import org.geotools.measure.Latitude;
+import org.geotools.measure.Longitude;
+import org.geotools.referencing.Identifier;
+import org.geotools.referencing.operation.MathTransformProvider;
+import org.geotools.referencing.operation.transform.AbstractMathTransform;
+<span class="del">import org.geotools.metadata.citation.Citation;</span>
+import org.geotools.resources.cts.ResourceKeys;
+import org.geotools.resources.cts.Resources;
+<span class="del">import org.geotools.resources.XMath;</span>
+
+
+/**</pre></td>
+<td><pre>import java.awt.geom.Point2D;
+import java.io.Serializable;
+import java.util.Collection;
+<span class="add"></span>
+<span class="add">import javax.units.NonSI;</span>
+<span class="add">import javax.units.SI;</span>
+import javax.units.Unit;
+
+import org.geotools.measure.Latitude;
+import org.geotools.measure.Longitude;
+<span class="add">import org.geotools.metadata.citation.Citation;</span>
+import org.geotools.referencing.Identifier;
+import org.geotools.referencing.operation.MathTransformProvider;
+import org.geotools.referencing.operation.transform.AbstractMathTransform;
+<span class="add">import org.geotools.resources.XMath;</span>
+import org.geotools.resources.cts.ResourceKeys;
+import org.geotools.resources.cts.Resources;
+<span class="add">import 
org.opengis.parameter.InvalidParameterValueException;</span>
+<span class="add">import org.opengis.parameter.ParameterDescriptor;</span>
+<span class="add">import org.opengis.parameter.ParameterDescriptorGroup;</span>
+<span class="add">import 
org.opengis.parameter.ParameterNotFoundException;</span>
+<span class="add">import org.opengis.parameter.ParameterValue;</span>
+<span class="add">import org.opengis.parameter.ParameterValueGroup;</span>
+<span class="add">import 
org.opengis.referencing.operation.MathTransform;</span>
+<span class="add">import 
org.opengis.referencing.operation.MathTransform2D;</span>
+<span class="add">import 
org.opengis.referencing.operation.TransformException;</span>
+
+
+/**</pre></td></tr>
+<tr><td><pre>* WKT (Well Know Text) or XML (not yet implemented) are more 
appropriate.
+*
+* @version $Id$
+<span class="del">* @author AndrÃ© Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*</pre></td>
+<td><pre>* WKT (Well Know Text) or XML (not yet implemented) are more 
appropriate.
+*
+* @version $Id$
+<span class="add">* @author AndrÃ¯Â¿Â½ Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*</pre></td></tr>
+<tr><td><pre>protected final double excentricity;
+
+/**
+<span class="del"> * The square of excentricity: eÂ² = (aÂ²-bÂ²)/aÂ² 
where</span>
+ * &lt;var&gt;e&lt;/var&gt; is the {@linkplain #excentricity excentricity},
+ * &lt;var&gt;a&lt;/var&gt; is the {@linkplain #semiMajor semi major} axis 
length and
+ * &lt;var&gt;b&lt;/var&gt; is the {@linkplain #semiMinor semi minor} axis 
length.</pre></td>
+<td><pre>protected final double excentricity;
+
+/**
+<span class="add"> * The square of excentricity: eÃ¯Â¿Â½ = 
(aÃ¯Â¿Â½-bÃ¯Â¿Â½)/aÃ¯Â¿Â½ where</span>
+ * &lt;var&gt;e&lt;/var&gt; is the {@linkplain #excentricity excentricity},
+ * &lt;var&gt;a&lt;/var&gt; is the {@linkplain #semiMajor semi major} axis 
length and
+ * &lt;var&gt;b&lt;/var&gt; is the {@linkplain #semiMinor semi minor} axis 
length.</pre></td></tr>
+<tr><td><pre>/**
+ * Central longitude in &lt;u&gt;radians&lt;/u&gt;. Default value is 0, the 
Greenwich meridian.
+ * This is called '&lt;var&gt;lambda0&lt;/var&gt;' in Snyder.
+ */
+<span class="del">protected final double centralMeridian;</span>
+
+/**
+ * Latitude of origin in &lt;u&gt;radians&lt;/u&gt;. Default value is 0, the 
equator.</pre></td>
+<td><pre>/**
+ * Central longitude in &lt;u&gt;radians&lt;/u&gt;. Default value is 0, the 
Greenwich meridian.
+ * This is called '&lt;var&gt;lambda0&lt;/var&gt;' in Snyder.
+<span class="add"> *</span>
+<span class="add"> * &lt;strong&gt;Consider this field as 
final&lt;/strong&gt;. It is not final only</span>
+<span class="add"> * because some classes need to modify it at construction 
time.</span>
+ */
+<span class="add">protected double centralMeridian;</span>
+
+/**
+ * Latitude of origin in &lt;u&gt;radians&lt;/u&gt;. Default value is 0, the 
equator.</pre></td></tr>
+<tr><td><pre>*         &lt;ul&gt;
+*           &lt;li&gt;"semi_major" (mandatory: no default)&lt;/li&gt;
+*           &lt;li&gt;"semi_minor" (mandatory: no default)&lt;/li&gt;
+<span class="del">*           &lt;li&gt;"central_meridian"   (default to 
0Â°)&lt;/li&gt;</span>
+<span class="del">*           &lt;li&gt;"latitude_of_origin" (default to 
0Â°)&lt;/li&gt;</span>
+*           &lt;li&gt;"scale_factor"       (default to 1 )&lt;/li&gt;
+*           &lt;li&gt;"false_easting"      (default to 0 )&lt;/li&gt;
+*           &lt;li&gt;"false_northing"     (default to 0 
)&lt;/li&gt;</pre></td>
+<td><pre>*         &lt;ul&gt;
+*           &lt;li&gt;"semi_major" (mandatory: no default)&lt;/li&gt;
+*           &lt;li&gt;"semi_minor" (mandatory: no default)&lt;/li&gt;
+<span class="add">*           &lt;li&gt;"central_meridian"   (default to 
0Ã¯Â¿Â½)&lt;/li&gt;</span>
+<span class="add">*           &lt;li&gt;"latitude_of_origin" (default to 
0Ã¯Â¿Â½)&lt;/li&gt;</span>
+*           &lt;li&gt;"scale_factor"       (default to 1 )&lt;/li&gt;
+*           &lt;li&gt;"false_easting"      (default to 0 )&lt;/li&gt;
+*           &lt;li&gt;"false_northing"     (default to 0 
)&lt;/li&gt;</pre></td></tr>
+<tr><td><pre>/*
+ * Makes sure that the longitude before conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="del"> * This is because the user may have a big area ranging from 
-180Â° to +180Â°. With the</span>
+<span class="del"> * slight rounding errors related to map projections, the 
180Â° longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="del"> * box from 30Â° to +180Â° would become 30Â° to -180Â°, 
which is probably not what the user</span>
+ * wanted.
+ */
+ptDst = transformNormalized(centralMeridian!=0 ?</pre></td>
+<td><pre>/*
+ * Makes sure that the longitude before conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="add"> * This is because the user may have a big area ranging from 
-180Ã¯Â¿Â½ to +180Ã¯Â¿Â½. With the</span>
+<span class="add"> * slight rounding errors related to map projections, the 
180Ã¯Â¿Â½ longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="add"> * box from 30Ã¯Â¿Â½ to +180Ã¯Â¿Â½ would become 30Ã¯Â¿Â½ to 
-180Ã¯Â¿Â½, which is probably not what the user</span>
+ * wanted.
+ */
+ptDst = transformNormalized(centralMeridian!=0 ?</pre></td></tr>
+<tr><td><pre>    throws ProjectionException
+{
+    /*
+<span class="del">     * VÃ©rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="del">     * chevauchent et que la destination est aprÃ¨s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; dstOffset);</pre></td>
+<td><pre>    throws ProjectionException
+{
+    /*
+<span class="add">     * VÃ¯Â¿Â½rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="add">     * chevauchent et que la destination est aprÃ¯Â¿Â½s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; 
dstOffset);</pre></td></tr>
+<tr><td><pre>/*
+ * Makes sure that the longitude after conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="del"> * This is because the user may have a big area ranging from 
-180Â° to +180Â°. With the</span>
+<span class="del"> * slight rounding errors related to map projections, the 
180Â° longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="del"> * box from 30Â° to +180Â° would become 30Â° to -180Â°, 
which is probably not what the user</span>
+ * wanted.
+ */
+final double x = Math.toDegrees(centralMeridian!=0 ?</pre></td>
+<td><pre>/*
+ * Makes sure that the longitude after conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="add"> * This is because the user may have a big area ranging from 
-180Ã¯Â¿Â½ to +180Ã¯Â¿Â½. With the</span>
+<span class="add"> * slight rounding errors related to map projections, the 
180Ã¯Â¿Â½ longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="add"> * box from 30Ã¯Â¿Â½ to +180Ã¯Â¿Â½ would become 30Ã¯Â¿Â½ to 
-180Ã¯Â¿Â½, which is probably not what the user</span>
+ * wanted.
+ */
+final double x = Math.toDegrees(centralMeridian!=0 ?</pre></td></tr>
+<tr><td><pre>        throws TransformException
+{
+    /*
+<span class="del">     * VÃ©rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="del">     * chevauchent et que la destination est aprÃ¨s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; dstOffset);</pre></td>
+<td><pre>        throws TransformException
+{
+    /*
+<span class="add">     * VÃ¯Â¿Â½rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="add">     * chevauchent et que la destination est aprÃ¯Â¿Â½s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; 
dstOffset);</pre></td></tr>
+<tr><td><pre>}
+
+/**
+<span class="del"> * Compute function &lt;code&gt;f(s,c,eÂ²) = c/sqrt(1 - 
sÂ²&amp;times;eÂ²)&lt;/code&gt; needed for the true scale</span>
+ * latitude (Snyder 14-15), where &lt;var&gt;s&lt;/var&gt; and 
&lt;var&gt;c&lt;/var&gt; are the sine and cosine of
+<span class="del"> * the true scale latitude, and &lt;var&gt;eÂ²&lt;/var&gt; 
is the {@linkplain #excentricitySquared</span>
+ * eccentricity squared}.
+ */
+final double msfn(final double s, final double c) {</pre></td>
+<td><pre>}
+
+/**
+<span class="add"> * Compute function &lt;code&gt;f(s,c,eÃ¯Â¿Â½) = c/sqrt(1 - 
sÃ¯Â¿Â½&amp;times;eÃ¯Â¿Â½)&lt;/code&gt; needed for the true scale</span>
+ * latitude (Snyder 14-15), where &lt;var&gt;s&lt;/var&gt; and 
&lt;var&gt;c&lt;/var&gt; are the sine and cosine of
+<span class="add"> * the true scale latitude, and 
&lt;var&gt;eÃ¯Â¿Â½&lt;/var&gt; is the {@linkplain #excentricitySquared</span>
+ * eccentricity squared}.
+ */
+final double msfn(final double s, final double c) {</pre></td></tr>
+<tr><td><pre>}
+
+/**
+<span class="del"> * Compute function (15-9) from Snyder equivalent to 
negative of function (7-7).</span>
+ */
+final double tsfn(final double phi, double sinphi) {
+    sinphi *= excentricity;</pre></td>
+<td><pre>}
+
+/**
+<span class="add"> * Compute function (15-9) and (9-13) from Snyder.</span>
+<span class="add"> * Equivalent to negative of function (7-7).</span>
+ */
+final double tsfn(final double phi, double sinphi) {
+    sinphi *= excentricity;</pre></td></tr>
+<tr><td><pre>/**
+ * The operation parameter descriptor for the {@link #centralMeridian 
centralMeridian}
+<span class="del"> * parameter value. Valid values range is from -180 to 
180Â°. Default value is 0.</span>
+ */
+public static final ParameterDescriptor CENTRAL_MERIDIAN = createDescriptor(
+        new Identifier[] {</pre></td>
+<td><pre>/**
+ * The operation parameter descriptor for the {@link #centralMeridian 
centralMeridian}
+<span class="add"> * parameter value. Valid values range is from -180 to 
180Ã¯Â¿Â½. Default value is 0.</span>
+ */
+public static final ParameterDescriptor CENTRAL_MERIDIAN = createDescriptor(
+        new Identifier[] {</pre></td></tr>
+<tr><td><pre>    new Identifier(Citation.OPEN_GIS, "central_meridian"),
+    new Identifier(Citation.EPSG,     "Longitude of natural origin"),
+    new Identifier(Citation.EPSG,     "Longitude of false origin"),
+<span class="del">    new Identifier(Citation.ESRI,     
"Longitude_Of_Center"),</span>
+    new Identifier(Citation.ESRI,     "Longitude_Of_Origin"),
+    new Identifier(Citation.GEOTIFF,  "NatOriginLong")
+},
+0, -180, 180, NonSI.DEGREE_ANGLE);</pre></td>
+<td><pre>    new Identifier(Citation.OPEN_GIS, "central_meridian"),
+    new Identifier(Citation.EPSG,     "Longitude of natural origin"),
+    new Identifier(Citation.EPSG,     "Longitude of false origin"),
+    new Identifier(Citation.ESRI,     "Longitude_Of_Origin"),
+<span class="add">    new Identifier(Citation.ESRI,     
"Longitude_Of_Center"),  //ESRI uses this in orthographic (not to be confused 
with Longitude_Of_Center in oblique mercator)</span>
+    new Identifier(Citation.GEOTIFF,  "NatOriginLong")
+},
+0, -180, 180, NonSI.DEGREE_ANGLE);</pre></td></tr>
+<tr><td><pre>/**
+ * The operation parameter descriptor for the {@link #latitudeOfOrigin 
latitudeOfOrigin}
+<span class="del"> * parameter value. Valid values range is from -90 to 90Â°. 
Default value is 0.</span>
+ */
+public static final ParameterDescriptor LATITUDE_OF_ORIGIN = createDescriptor(
+        new Identifier[] {</pre></td>
+<td><pre>/**
+ * The operation parameter descriptor for the {@link #latitudeOfOrigin 
latitudeOfOrigin}
+<span class="add"> * parameter value. Valid values range is from -90 to 
90Ã¯Â¿Â½. Default value is 0.</span>
+ */
+public static final ParameterDescriptor LATITUDE_OF_ORIGIN = createDescriptor(
+        new Identifier[] {</pre></td></tr>
+<tr><td><pre>    new Identifier(Citation.OPEN_GIS, "latitude_of_origin"),
+    new Identifier(Citation.EPSG,     "Latitude of false origin"),
+    new Identifier(Citation.EPSG,     "Latitude of natural origin"),
+<span class="del">    new Identifier(Citation.ESRI,     
"Latitude_Of_Center"),</span>
+    new Identifier(Citation.GEOTIFF,  "NatOriginLat")
+},
+0, -90, 90, NonSI.DEGREE_ANGLE);</pre></td>
+<td><pre>    new Identifier(Citation.OPEN_GIS, "latitude_of_origin"),
+    new Identifier(Citation.EPSG,     "Latitude of false origin"),
+    new Identifier(Citation.EPSG,     "Latitude of natural origin"),
+<span class="add">    new Identifier(Citation.ESRI,     "Latitude_Of_Center"), 
 //ESRI uses this in orthographic</span>
+    new Identifier(Citation.GEOTIFF,  "NatOriginLat")
+},
+0, -90, 90, NonSI.DEGREE_ANGLE);</pre></td></tr>
+<tr><td><pre>new Identifier[] {
+    new Identifier(Citation.OPEN_GIS, "scale_factor"),
+    new Identifier(Citation.EPSG,     "Scale factor at natural origin"),
+<span class="del">    new Identifier(Citation.GEOTIFF,  
"ScaleAtNatOrigin")</span>
+},
+1, 0, Double.POSITIVE_INFINITY, Unit.ONE);</pre></td>
+<td><pre>new Identifier[] {
+    new Identifier(Citation.OPEN_GIS, "scale_factor"),
+    new Identifier(Citation.EPSG,     "Scale factor at natural origin"),
+<span class="add">    new Identifier(Citation.GEOTIFF,  
"ScaleAtNatOrigin"),</span>
+<span class="add">    new Identifier(Citation.GEOTIFF,  "ScaleAtCenter")</span>
+},
+1, 0, Double.POSITIVE_INFINITY, Unit.ONE);</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/Mercator.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/10796/Mercator.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/10796/Mercator.xhtml (added)
+++ sis/ip-review/rev/10796/Mercator.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Mercator changes for revisions 9354:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Mercator changes for revisions 9354:10796</h1>
+
+<p>Some changes in this commit seem to be the result of some "<cite>auto 
reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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 keep removed.</p>
+
+<p>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 <a 
href="Mercator2SP.xhtml">Mercator2SP</a>).
+Note also that those information duplicate the ones provided in <a 
href="Mercator1SP.xhtml">Mercator1SP</a> and <a 
href="Mercator2SP.xhtml">Mercator2SP</a> classes.
+Apache SIS consolidates those definitions.</p>
+
+<p>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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r9354:10796 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/Mercator.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 9354</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le 
DÃ©veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it and/or</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le 
DÃ¯Â¿Â½veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it 
and/or</pre></td></tr>
+<tr><td><pre>package org.geotools.referencing.operation.projection;
+
+// J2SE dependencies and extensions
+<span class="del">import java.util.Map;</span>
+<span class="del">import java.util.Locale;</span>
+<span class="del">import java.util.HashMap;</span>
+import java.util.Collection;
+<span class="del">import java.awt.geom.Point2D;</span>
+import javax.units.NonSI;
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import org.opengis.parameter.ParameterValue;</span>
+import org.opengis.parameter.ParameterDescriptor;
+<span class="del">import org.opengis.parameter.ParameterValueGroup;</span>
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+import org.opengis.referencing.operation.MathTransform;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.measure.Latitude;</span>
+<span class="del">import org.geotools.referencing.Identifier;</span>
+<span class="del">import 
org.geotools.referencing.operation.MathTransformFactory;  // For Javadoc</span>
+<span class="del">import 
org.geotools.referencing.operation.MathTransformProvider; // For Javadoc</span>
+<span class="del">import org.geotools.metadata.citation.Citation;</span>
+<span class="del">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="del">import org.geotools.resources.cts.Resources;</span>
+
+<span class="del"></span>
+/**
+ * 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</pre></td>
+<td><pre>package org.geotools.referencing.operation.projection;
+
+// J2SE dependencies and extensions
+<span class="add">import java.awt.geom.Point2D;</span>
+import java.util.Collection;
+<span class="add"></span>
+import javax.units.NonSI;
+
+<span class="add">import org.geotools.measure.Latitude;</span>
+<span class="add">import org.geotools.metadata.citation.Citation;</span>
+<span class="add">import org.geotools.referencing.Identifier;</span>
+<span class="add">import 
org.geotools.referencing.operation.MathTransformFactory;</span>
+<span class="add">import 
org.geotools.referencing.operation.MathTransformProvider;</span>
+<span class="add">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="add">import org.geotools.resources.cts.Resources;</span>
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+<span class="add">import org.opengis.parameter.ParameterValueGroup;</span>
+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</pre></td></tr>
+<tr><td><pre>* @see &lt;A 
HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html"&gt;"mercator_2sp";
 on Remote Sensing&lt;/A&gt;
+*
+* @version $Id$
+<span class="del">* @author AndrÃ© Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*/</pre></td>
+<td><pre>* @see &lt;A 
HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html"&gt;"mercator_2sp";
 on Remote Sensing&lt;/A&gt;
+*
+* @version $Id$
+<span class="add">* @author AndrÃ¯Â¿Â½ Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*/</pre></td></tr>
+<tr><td><pre>    new Identifier(Citation.EPSG,     "Mercator (1SP)"),
+    new Identifier(Citation.EPSG,     "9804"),
+    new Identifier(Citation.GEOTIFF,  "CT_Mercator"),
+<span class="del">    new Identifier(Citation.ESRI,     "Mercator"),</span>
+    new Identifier(Citation.GEOTOOLS, Resources.formatInternational(
+                                      
ResourceKeys.CYLINDRICAL_MERCATOR_PROJECTION))
+}, new ParameterDescriptor[] {</pre></td>
+<td><pre>    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[] {</pre></td></tr>
+<tr><td><pre>public static final class Provider2SP extends Provider {
+    /**
+     * The operation parameter descriptor for the {@link #standardParallel 
standard parallel}
+<span class="del">     * parameter value. Valid values range is from -90 to 
90Â°. Default value is 0.</span>
+     */
+    public static final ParameterDescriptor STANDARD_PARALLEL = 
createDescriptor(
+            new Identifier[] {</pre></td>
+<td><pre>public static final class Provider2SP extends Provider {
+    /**
+     * The operation parameter descriptor for the {@link #standardParallel 
standard parallel}
+<span class="add">     * parameter value. Valid values range is from -90 to 
90Ã¯Â¿Â½. Default value is 0.</span>
+     */
+    public static final ParameterDescriptor STANDARD_PARALLEL = 
createDescriptor(
+            new Identifier[] {</pre></td></tr>
+<tr><td><pre> * Construct a new map projection from the supplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="del"> * @param  The expected parameter descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+Mercator(final ParameterValueGroup parameters, final Collection 
expected)</pre></td>
+<td><pre> * Construct a new map projection from the supplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="add"> * @param  expected The expected parameter 
descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+Mercator(final ParameterValueGroup parameters, final Collection 
expected)</pre></td></tr>
+<tr><td><pre> * Construct a new map projection from the suplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="del"> * @param  The expected parameter descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+protected Spherical(final ParameterValueGroup parameters, final Collection 
expected)</pre></td>
+<td><pre> * Construct a new map projection from the suplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="add"> * @param  expected The expected parameter 
descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+protected Spherical(final ParameterValueGroup parameters, final Collection 
expected)</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/Mercator.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/Mercator.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/Mercator1SP.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/10796/Mercator1SP.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/10796/Mercator1SP.xhtml (added)
+++ sis/ip-review/rev/10796/Mercator1SP.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Mercator1SP changes for revisions 9354:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Mercator1SP changes for revisions 9354:10796</h1>
+
+<p>Some changes in this commit seem to be the result of some "<cite>auto 
reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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 keep removed.</p>
+
+<p>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 <a 
href="Mercator2SP.xhtml">Mercator2SP</a>).</p>
+
+<p>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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r9354:10796 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/Mercator1SP.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 9354</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le 
DÃ©veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it and/or</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le 
DÃ¯Â¿Â½veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it 
and/or</pre></td></tr>
+<tr><td><pre>package org.geotools.referencing.operation.projection;
+
+// J2SE dependencies and extensions
+<span class="del">import java.util.Map;</span>
+<span class="del">import java.util.Locale;</span>
+<span class="del">import java.util.HashMap;</span>
+import java.util.Collection;
+<span class="del">import java.awt.geom.Point2D;</span>
+import javax.units.NonSI;
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import org.opengis.parameter.ParameterValue;</span>
+import org.opengis.parameter.ParameterDescriptor;
+<span class="del">import org.opengis.parameter.ParameterValueGroup;</span>
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+import org.opengis.referencing.operation.MathTransform;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.measure.Latitude;</span>
+<span class="del">import org.geotools.referencing.Identifier;</span>
+<span class="del">import 
org.geotools.referencing.operation.MathTransformFactory;  // For Javadoc</span>
+<span class="del">import 
org.geotools.referencing.operation.MathTransformProvider; // For Javadoc</span>
+<span class="del">import org.geotools.metadata.citation.Citation;</span>
+<span class="del">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="del">import org.geotools.resources.cts.Resources;</span>
+
+<span class="del"></span>
+/**
+ * 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</pre></td>
+<td><pre>package org.geotools.referencing.operation.projection;
+
+// J2SE dependencies and extensions
+<span class="add">import java.awt.geom.Point2D;</span>
+import java.util.Collection;
+<span class="add"></span>
+import javax.units.NonSI;
+
+<span class="add">import org.geotools.measure.Latitude;</span>
+<span class="add">import org.geotools.metadata.citation.Citation;</span>
+<span class="add">import org.geotools.referencing.Identifier;</span>
+<span class="add">import 
org.geotools.referencing.operation.MathTransformFactory;</span>
+<span class="add">import 
org.geotools.referencing.operation.MathTransformProvider;</span>
+<span class="add">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="add">import org.geotools.resources.cts.Resources;</span>
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+<span class="add">import org.opengis.parameter.ParameterValueGroup;</span>
+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</pre></td></tr>
+<tr><td><pre>* @see &lt;A 
HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html"&gt;"mercator_2sp";
 on Remote Sensing&lt;/A&gt;
+*
+* @version $Id$
+<span class="del">* @author AndrÃ© Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*/</pre></td>
+<td><pre>* @see &lt;A 
HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html"&gt;"mercator_2sp";
 on Remote Sensing&lt;/A&gt;
+*
+* @version $Id$
+<span class="add">* @author AndrÃ¯Â¿Â½ Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*/</pre></td></tr>
+<tr><td><pre>    new Identifier(Citation.EPSG,     "Mercator (1SP)"),
+    new Identifier(Citation.EPSG,     "9804"),
+    new Identifier(Citation.GEOTIFF,  "CT_Mercator"),
+<span class="del">    new Identifier(Citation.ESRI,     "Mercator"),</span>
+    new Identifier(Citation.GEOTOOLS, Resources.formatInternational(
+                                      
ResourceKeys.CYLINDRICAL_MERCATOR_PROJECTION))
+}, new ParameterDescriptor[] {</pre></td>
+<td><pre>    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[] {</pre></td></tr>
+<tr><td><pre>public static final class Provider2SP extends Provider {
+    /**
+     * The operation parameter descriptor for the {@link #standardParallel 
standard parallel}
+<span class="del">     * parameter value. Valid values range is from -90 to 
90Â°. Default value is 0.</span>
+     */
+    public static final ParameterDescriptor STANDARD_PARALLEL = 
createDescriptor(
+            new Identifier[] {</pre></td>
+<td><pre>public static final class Provider2SP extends Provider {
+    /**
+     * The operation parameter descriptor for the {@link #standardParallel 
standard parallel}
+<span class="add">     * parameter value. Valid values range is from -90 to 
90Ã¯Â¿Â½. Default value is 0.</span>
+     */
+    public static final ParameterDescriptor STANDARD_PARALLEL = 
createDescriptor(
+            new Identifier[] {</pre></td></tr>
+<tr><td><pre> * Construct a new map projection from the supplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="del"> * @param  The expected parameter descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+Mercator(final ParameterValueGroup parameters, final Collection 
expected)</pre></td>
+<td><pre> * Construct a new map projection from the supplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="add"> * @param  expected The expected parameter 
descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+Mercator(final ParameterValueGroup parameters, final Collection 
expected)</pre></td></tr>
+<tr><td><pre> * Construct a new map projection from the suplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="del"> * @param  The expected parameter descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+protected Spherical(final ParameterValueGroup parameters, final Collection 
expected)</pre></td>
+<td><pre> * Construct a new map projection from the suplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="add"> * @param  expected The expected parameter 
descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+protected Spherical(final ParameterValueGroup parameters, final Collection 
expected)</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/Mercator1SP.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/Mercator1SP.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/10796/Mercator2SP.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/10796/Mercator2SP.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/10796/Mercator2SP.xhtml (added)
+++ sis/ip-review/rev/10796/Mercator2SP.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Mercator2SP changes for revisions 9354:10796</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Mercator2SP changes for revisions 9354:10796</h1>
+
+<p>Some changes in this commit seem to be the result of some "<cite>auto 
reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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 keep removed.</p>
+
+<p>Other changes are the removal of ESRI parameter names. This changes has not 
be done in Apache SIS.</p>
+
+<p>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.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r9354:10796 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/Mercator2SP.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 9354</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le 
DÃ©veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it and/or</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le 
DÃ¯Â¿Â½veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it 
and/or</pre></td></tr>
+<tr><td><pre>package org.geotools.referencing.operation.projection;
+
+// J2SE dependencies and extensions
+<span class="del">import java.util.Map;</span>
+<span class="del">import java.util.Locale;</span>
+<span class="del">import java.util.HashMap;</span>
+import java.util.Collection;
+<span class="del">import java.awt.geom.Point2D;</span>
+import javax.units.NonSI;
+
+<span class="del">// OpenGIS dependencies</span>
+<span class="del">import org.opengis.parameter.ParameterValue;</span>
+import org.opengis.parameter.ParameterDescriptor;
+<span class="del">import org.opengis.parameter.ParameterValueGroup;</span>
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+import org.opengis.referencing.operation.MathTransform;
+
+<span class="del">// Geotools dependencies</span>
+<span class="del">import org.geotools.measure.Latitude;</span>
+<span class="del">import org.geotools.referencing.Identifier;</span>
+<span class="del">import 
org.geotools.referencing.operation.MathTransformFactory;  // For Javadoc</span>
+<span class="del">import 
org.geotools.referencing.operation.MathTransformProvider; // For Javadoc</span>
+<span class="del">import org.geotools.metadata.citation.Citation;</span>
+<span class="del">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="del">import org.geotools.resources.cts.Resources;</span>
+
+<span class="del"></span>
+/**
+ * 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</pre></td>
+<td><pre>package org.geotools.referencing.operation.projection;
+
+// J2SE dependencies and extensions
+<span class="add">import java.awt.geom.Point2D;</span>
+import java.util.Collection;
+<span class="add"></span>
+import javax.units.NonSI;
+
+<span class="add">import org.geotools.measure.Latitude;</span>
+<span class="add">import org.geotools.metadata.citation.Citation;</span>
+<span class="add">import org.geotools.referencing.Identifier;</span>
+<span class="add">import 
org.geotools.referencing.operation.MathTransformFactory;</span>
+<span class="add">import 
org.geotools.referencing.operation.MathTransformProvider;</span>
+<span class="add">import org.geotools.resources.cts.ResourceKeys;</span>
+<span class="add">import org.geotools.resources.cts.Resources;</span>
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.ParameterNotFoundException;
+<span class="add">import org.opengis.parameter.ParameterValueGroup;</span>
+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</pre></td></tr>
+<tr><td><pre>* @see &lt;A 
HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html"&gt;"mercator_2sp";
 on Remote Sensing&lt;/A&gt;
+*
+* @version $Id$
+<span class="del">* @author AndrÃ© Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*/</pre></td>
+<td><pre>* @see &lt;A 
HREF="http://www.remotesensing.org/geotiff/proj_list/mercator_2sp.html"&gt;"mercator_2sp";
 on Remote Sensing&lt;/A&gt;
+*
+* @version $Id$
+<span class="add">* @author AndrÃ¯Â¿Â½ Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*/</pre></td></tr>
+<tr><td><pre>    new Identifier(Citation.EPSG,     "Mercator (1SP)"),
+    new Identifier(Citation.EPSG,     "9804"),
+    new Identifier(Citation.GEOTIFF,  "CT_Mercator"),
+<span class="del">    new Identifier(Citation.ESRI,     "Mercator"),</span>
+    new Identifier(Citation.GEOTOOLS, Resources.formatInternational(
+                                      
ResourceKeys.CYLINDRICAL_MERCATOR_PROJECTION))
+}, new ParameterDescriptor[] {</pre></td>
+<td><pre>    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[] {</pre></td></tr>
+<tr><td><pre>public static final class Provider2SP extends Provider {
+    /**
+     * The operation parameter descriptor for the {@link #standardParallel 
standard parallel}
+<span class="del">     * parameter value. Valid values range is from -90 to 
90Â°. Default value is 0.</span>
+     */
+    public static final ParameterDescriptor STANDARD_PARALLEL = 
createDescriptor(
+            new Identifier[] {</pre></td>
+<td><pre>public static final class Provider2SP extends Provider {
+    /**
+     * The operation parameter descriptor for the {@link #standardParallel 
standard parallel}
+<span class="add">     * parameter value. Valid values range is from -90 to 
90Ã¯Â¿Â½. Default value is 0.</span>
+     */
+    public static final ParameterDescriptor STANDARD_PARALLEL = 
createDescriptor(
+            new Identifier[] {</pre></td></tr>
+<tr><td><pre> * Construct a new map projection from the supplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="del"> * @param  The expected parameter descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+Mercator(final ParameterValueGroup parameters, final Collection 
expected)</pre></td>
+<td><pre> * Construct a new map projection from the supplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="add"> * @param  expected The expected parameter 
descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+Mercator(final ParameterValueGroup parameters, final Collection 
expected)</pre></td></tr>
+<tr><td><pre> * Construct a new map projection from the suplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="del"> * @param  The expected parameter descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+protected Spherical(final ParameterValueGroup parameters, final Collection 
expected)</pre></td>
+<td><pre> * Construct a new map projection from the suplied parameters.
+ *
+ * @param  parameters The parameter values in standard units.
+<span class="add"> * @param  expected The expected parameter 
descriptors.</span>
+ * @throws ParameterNotFoundException if a mandatory parameter is missing.
+ */
+protected Spherical(final ParameterValueGroup parameters, final Collection 
expected)</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/10796/Mercator2SP.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/10796/Mercator2SP.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/11695/HEADER.html
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/11695/HEADER.html?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/11695/HEADER.html (added)
+++ sis/ip-review/rev/11695/HEADER.html Mon Mar 16 16:18:13 2015
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 11695</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 11695</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>rschulz</td></tr>
+  <tr><td><b>Date:</b></td><td>2005-02-28</td></tr>
+  <tr><td><b>Message:</b></td><td>converted centralMeridian and 
latitudeOfOrigin to degrees in checkTransform()</td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/11695/HEADER.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/11695/HEADER.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/11695/MapProjection.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/11695/MapProjection.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/11695/MapProjection.xhtml (added)
+++ sis/ip-review/rev/11695/MapProjection.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MapProjection changes for revisions 11694:11695</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MapProjection changes for revisions 11694:11695</h1>
+
+<p>This change will not be ported to Apache SIS.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r11694:11695 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/MapProjection.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 11694</th><th>Revision 11695</th></tr>
+<tr><td><pre>    if (distance &gt; getToleranceForAssertions(longitude, 
latitude)) {
+        // Do not fail for NaN values.
+        throw new AssertionError("\u03B5=" + distance +
+<span class="del">                                 " (\u0394\u03BB=" + 
(longitude-centralMeridian) + "\u00B0" +</span>
+<span class="del">                                 ", \u0394\u03C6=" + 
(latitude-latitudeOfOrigin) + "\u00B0)");</span>
+    }
+} catch (TransformException exception) {
+    final AssertionError error = new 
AssertionError(exception.getLocalizedMessage());</pre></td>
+<td><pre>    if (distance &gt; getToleranceForAssertions(longitude, latitude)) 
{
+        // Do not fail for NaN values.
+        throw new AssertionError("\u03B5=" + distance +
+<span class="add">                                 " (\u0394\u03BB=" + 
(longitude-Math.toDegrees(centralMeridian)) + "\u00B0" +</span>
+<span class="add">                                 ", \u0394\u03C6=" + 
(latitude-Math.toDegrees(latitudeOfOrigin)) + "\u00B0)");</span>
+    }
+} catch (TransformException exception) {
+    final AssertionError error = new 
AssertionError(exception.getLocalizedMessage());</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/11695/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/11695/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/12238/HEADER.html
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/12238/HEADER.html?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/12238/HEADER.html (added)
+++ sis/ip-review/rev/12238/HEADER.html Mon Mar 16 16:18:13 2015
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 12238</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 12238</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>dzwiers</td></tr>
+  <tr><td><b>Date:</b></td><td>2005-03-15</td></tr>
+  <tr><td><b>Message:</b></td><td>crs hack for jody</td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/12238/HEADER.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/12238/HEADER.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/12238/MapProjection.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/12238/MapProjection.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/12238/MapProjection.xhtml (added)
+++ sis/ip-review/rev/12238/MapProjection.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MapProjection changes for revisions 12237:12238</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MapProjection changes for revisions 12237:12238</h1>
+
+<p>Most changes in this commit seem to be the result of some "<cite>auto 
reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> 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 keep removed.</p>
+
+<p>This commit contains also a <code>catch (Throwable t)</code> statement 
which will not be ported to Apache SIS.</p>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r12237:12238 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/MapProjection.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 12237</th><th>Revision 12238</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le 
DÃ©veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it and/or</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le 
DÃ¯Â¿Â½veloppement</span>
+ * (C) 1999, Fisheries and Oceans Canada
+ *
+ *    This library is free software; you can redistribute it 
and/or</pre></td></tr>
+<tr><td><pre>* WKT (Well Know Text) or XML (not yet implemented) are more 
appropriate.
+*
+* @version $Id$
+<span class="del">* @author AndrÃ© Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*</pre></td>
+<td><pre>* WKT (Well Know Text) or XML (not yet implemented) are more 
appropriate.
+*
+* @version $Id$
+<span class="add">* @author AndrÃ¯Â¿Â½ Gosselin</span>
+* @author Martin Desruisseaux
+* @author Rueben Schulz
+*</pre></td></tr>
+<tr><td><pre>protected final double excentricity;
+
+/**
+<span class="del"> * The square of excentricity: eÂ² = (aÂ²-bÂ²)/aÂ² 
where</span>
+ * &lt;var&gt;e&lt;/var&gt; is the {@linkplain #excentricity excentricity},
+ * &lt;var&gt;a&lt;/var&gt; is the {@linkplain #semiMajor semi major} axis 
length and
+ * &lt;var&gt;b&lt;/var&gt; is the {@linkplain #semiMinor semi minor} axis 
length.</pre></td>
+<td><pre>protected final double excentricity;
+
+/**
+<span class="add"> * The square of excentricity: eÃ¯Â¿Â½ = 
(aÃ¯Â¿Â½-bÃ¯Â¿Â½)/aÃ¯Â¿Â½ where</span>
+ * &lt;var&gt;e&lt;/var&gt; is the {@linkplain #excentricity excentricity},
+ * &lt;var&gt;a&lt;/var&gt; is the {@linkplain #semiMajor semi major} axis 
length and
+ * &lt;var&gt;b&lt;/var&gt; is the {@linkplain #semiMinor semi minor} axis 
length.</pre></td></tr>
+<tr><td><pre>*         &lt;ul&gt;
+*           &lt;li&gt;"semi_major" (mandatory: no default)&lt;/li&gt;
+*           &lt;li&gt;"semi_minor" (mandatory: no default)&lt;/li&gt;
+<span class="del">*           &lt;li&gt;"central_meridian"   (default to 
0Â°)&lt;/li&gt;</span>
+<span class="del">*           &lt;li&gt;"latitude_of_origin" (default to 
0Â°)&lt;/li&gt;</span>
+*           &lt;li&gt;"scale_factor"       (default to 1 )&lt;/li&gt;
+*           &lt;li&gt;"false_easting"      (default to 0 )&lt;/li&gt;
+*           &lt;li&gt;"false_northing"     (default to 0 
)&lt;/li&gt;</pre></td>
+<td><pre>*         &lt;ul&gt;
+*           &lt;li&gt;"semi_major" (mandatory: no default)&lt;/li&gt;
+*           &lt;li&gt;"semi_minor" (mandatory: no default)&lt;/li&gt;
+<span class="add">*           &lt;li&gt;"central_meridian"   (default to 
0Ã¯Â¿Â½)&lt;/li&gt;</span>
+<span class="add">*           &lt;li&gt;"latitude_of_origin" (default to 
0Ã¯Â¿Â½)&lt;/li&gt;</span>
+*           &lt;li&gt;"scale_factor"       (default to 1 )&lt;/li&gt;
+*           &lt;li&gt;"false_easting"      (default to 0 )&lt;/li&gt;
+*           &lt;li&gt;"false_northing"     (default to 0 
)&lt;/li&gt;</pre></td></tr>
+<tr><td><pre>/*
+ * Makes sure that the longitude before conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="del"> * This is because the user may have a big area ranging from 
-180Â° to +180Â°. With the</span>
+<span class="del"> * slight rounding errors related to map projections, the 
180Â° longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="del"> * box from 30Â° to +180Â° would become 30Â° to -180Â°, 
which is probably not what the user</span>
+ * wanted.
+ */
+ptDst = transformNormalized(centralMeridian!=0 ?</pre></td>
+<td><pre>/*
+ * Makes sure that the longitude before conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="add"> * This is because the user may have a big area ranging from 
-180Ã¯Â¿Â½ to +180Ã¯Â¿Â½. With the</span>
+<span class="add"> * slight rounding errors related to map projections, the 
180Ã¯Â¿Â½ longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="add"> * box from 30Ã¯Â¿Â½ to +180Ã¯Â¿Â½ would become 30Ã¯Â¿Â½ to 
-180Ã¯Â¿Â½, which is probably not what the user</span>
+ * wanted.
+ */
+ptDst = transformNormalized(centralMeridian!=0 ?</pre></td></tr>
+<tr><td><pre>    throws ProjectionException
+{
+    /*
+<span class="del">     * VÃ©rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="del">     * chevauchent et que la destination est aprÃ¨s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; dstOffset);</pre></td>
+<td><pre>    throws ProjectionException
+{
+    /*
+<span class="add">     * VÃ¯Â¿Â½rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="add">     * chevauchent et que la destination est aprÃ¯Â¿Â½s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; 
dstOffset);</pre></td></tr>
+<tr><td><pre>/*
+ * Makes sure that the longitude after conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="del"> * This is because the user may have a big area ranging from 
-180Â° to +180Â°. With the</span>
+<span class="del"> * slight rounding errors related to map projections, the 
180Â° longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="del"> * box from 30Â° to +180Â° would become 30Â° to -180Â°, 
which is probably not what the user</span>
+ * wanted.
+ */
+final double x = Math.toDegrees(centralMeridian!=0 ?</pre></td>
+<td><pre>/*
+ * Makes sure that the longitude after conversion stay within +/- PI radians. 
As a
+ * special case, we do not check the range if no rotation were applied on the 
longitude.
+<span class="add"> * This is because the user may have a big area ranging from 
-180Ã¯Â¿Â½ to +180Ã¯Â¿Â½. With the</span>
+<span class="add"> * slight rounding errors related to map projections, the 
180Ã¯Â¿Â½ longitude may be slightly</span>
+ * over the limit. Rolling the longitude would changes its sign. For example a 
bounding
+<span class="add"> * box from 30Ã¯Â¿Â½ to +180Ã¯Â¿Â½ would become 30Ã¯Â¿Â½ to 
-180Ã¯Â¿Â½, which is probably not what the user</span>
+ * wanted.
+ */
+final double x = Math.toDegrees(centralMeridian!=0 ?</pre></td></tr>
+<tr><td><pre>        throws TransformException
+{
+    /*
+<span class="del">     * VÃ©rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="del">     * chevauchent et que la destination est aprÃ¨s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; dstOffset);</pre></td>
+<td><pre>        throws TransformException
+{
+    /*
+<span class="add">     * VÃ¯Â¿Â½rifie s'il faudra parcourir le tableau en sens 
inverse.</span>
+     * Ce sera le cas si les tableaux source et destination se
+<span class="add">     * chevauchent et que la destination est aprÃ¯Â¿Â½s la 
source.</span>
+     */
+    final boolean reverse = (src==dest &amp;&amp; srcOffset&lt;dstOffset 
&amp;&amp;
+                             srcOffset+(2*numPts) &gt; 
dstOffset);</pre></td></tr>
+<tr><td><pre>}
+
+/**
+<span class="del"> * Compute function &lt;code&gt;f(s,c,eÂ²) = c/sqrt(1 - 
sÂ²&amp;times;eÂ²)&lt;/code&gt; needed for the true scale</span>
+ * latitude (Snyder 14-15), where &lt;var&gt;s&lt;/var&gt; and 
&lt;var&gt;c&lt;/var&gt; are the sine and cosine of
+<span class="del"> * the true scale latitude, and &lt;var&gt;eÂ²&lt;/var&gt; 
is the {@linkplain #excentricitySquared</span>
+ * eccentricity squared}.
+ */
+final double msfn(final double s, final double c) {</pre></td>
+<td><pre>}
+
+/**
+<span class="add"> * Compute function &lt;code&gt;f(s,c,eÃ¯Â¿Â½) = c/sqrt(1 - 
sÃ¯Â¿Â½&amp;times;eÃ¯Â¿Â½)&lt;/code&gt; needed for the true scale</span>
+ * latitude (Snyder 14-15), where &lt;var&gt;s&lt;/var&gt; and 
&lt;var&gt;c&lt;/var&gt; are the sine and cosine of
+<span class="add"> * the true scale latitude, and 
&lt;var&gt;eÃ¯Â¿Â½&lt;/var&gt; is the {@linkplain #excentricitySquared</span>
+ * eccentricity squared}.
+ */
+final double msfn(final double s, final double c) {</pre></td></tr>
+<tr><td><pre>/**
+ * The operation parameter descriptor for the {@link #centralMeridian 
centralMeridian}
+<span class="del"> * parameter value. Valid values range is from -180 to 
180Â°. Default value is 0.</span>
+ */
+public static final ParameterDescriptor CENTRAL_MERIDIAN = createDescriptor(
+        new Identifier[] {</pre></td>
+<td><pre>/**
+ * The operation parameter descriptor for the {@link #centralMeridian 
centralMeridian}
+<span class="add"> * parameter value. Valid values range is from -180 to 
180Ã¯Â¿Â½. Default value is 0.</span>
+ */
+public static final ParameterDescriptor CENTRAL_MERIDIAN = createDescriptor(
+        new Identifier[] {</pre></td></tr>
+<tr><td><pre>/**
+ * The operation parameter descriptor for the {@link #latitudeOfOrigin 
latitudeOfOrigin}
+<span class="del"> * parameter value. Valid values range is from -90 to 90Â°. 
Default value is 0.</span>
+ */
+public static final ParameterDescriptor LATITUDE_OF_ORIGIN = createDescriptor(
+        new Identifier[] {</pre></td>
+<td><pre>/**
+ * The operation parameter descriptor for the {@link #latitudeOfOrigin 
latitudeOfOrigin}
+<span class="add"> * parameter value. Valid values range is from -90 to 
90Ã¯Â¿Â½. Default value is 0.</span>
+ */
+public static final ParameterDescriptor LATITUDE_OF_ORIGIN = createDescriptor(
+        new Identifier[] {</pre></td></tr>
+<tr><td><pre> * Returns &lt;code&gt;true&lt;/code&gt; is the parameters use a 
spherical datum.
+ */
+static boolean isSpherical(final ParameterValueGroup values) {
+    return doubleValue(SEMI_MAJOR, values) ==
+           doubleValue(SEMI_MINOR, values);
+}
+
+/**
+ * Returns the parameter value for the specified operation 
parameter.</pre></td>
+<td><pre> * Returns &lt;code&gt;true&lt;/code&gt; is the parameters use a 
spherical datum.
+ */
+static boolean isSpherical(final ParameterValueGroup values) {
+<span class="add">    try {</span>
+    return doubleValue(SEMI_MAJOR, values) ==
+           doubleValue(SEMI_MINOR, values);
+}
+<span class="add">    catch( Throwable t){</span>
+<span class="add">       // probably could not find the requested values -- 
gobble error and and be forgiving</span>
+<span class="add">       return false;</span>
+<span class="add">    }</span>
+<span class="add">}</span>
+
+/**
+ * Returns the parameter value for the specified operation 
parameter.</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/12238/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/12238/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/MapProjection.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/20874/MapProjection.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/20874/MapProjection.xhtml (added)
+++ sis/ip-review/rev/20874/MapProjection.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>MapProjection changes for revisions 20755:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>MapProjection changes for revisions 20755:20874</h1>
+<p>Changes in GeoTools header mostly. This header does not apply to Apache SIS,
+provided that we port only the code from authors who accepted relicensing.</p>
+<p>Change in the constructor code has been removed.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r20755:20874 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/MapProjection.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20755</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2003, Geotools Project Managment Committee 
(PMC)</span>
+ * (C) 2001, Institut de Recherche pour le DÃ©veloppement
+ * (C) 2000, Frank Warmerdam
+ * (C) 1999, Fisheries and Oceans Canada</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+<span class="add"> *</span>
+<span class="add"> *   (C) 2003-2006, Geotools Project Managment Committee 
(PMC)</span>
+ * (C) 2001, Institut de Recherche pour le DÃ©veloppement
+ * (C) 2000, Frank Warmerdam
+ * (C) 1999, Fisheries and Oceans Canada</pre></td></tr>
+<tr><td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
+*    Lesser General Public License for more details.
+*
+<span class="del">*</span>
+*    This package contains formulas from the PROJ package of USGS.
+*    USGS's work is fully acknowledged here. This derived work has
+*    been relicensed under LGPL with Frank Warmerdam's permission.</pre></td>
+<td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+*    This package contains formulas from the PROJ package of USGS.
+*    USGS's work is fully acknowledged here. This derived work has
+*    been relicensed under LGPL with Frank Warmerdam's 
permission.</pre></td></tr>
+<tr><td><pre> * Default constructor.
+ */
+public Inverse() {
+<span class="del">    MapProjection.this.super();</span>
+}
+
+/**</pre></td>
+<td><pre> * Default constructor.
+ */
+public Inverse() {
+<span class="add">    super(MapProjection.this);</span>
+}
+
+/**</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/MapProjection.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/Mercator.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/20874/Mercator.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/20874/Mercator.xhtml (added)
+++ sis/ip-review/rev/20874/Mercator.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Mercator changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Mercator changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header mostly. This header does not apply to Apache SIS,
+provided that we port only the code from authors who accepted relicensing.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r20873:20874 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/Mercator.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2003, Geotools Project Managment Committee 
(PMC)</span>
+ * (C) 2001, Institut de Recherche pour le DÃ©veloppement
+ * (C) 2000, Frank Warmerdam
+ * (C) 1999, Fisheries and Oceans Canada</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+<span class="add"> *</span>
+<span class="add"> *   (C) 2003-2006, Geotools Project Managment Committee 
(PMC)</span>
+ * (C) 2001, Institut de Recherche pour le DÃ©veloppement
+ * (C) 2000, Frank Warmerdam
+ * (C) 1999, Fisheries and Oceans Canada</pre></td></tr>
+<tr><td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
the GNU
+*    Lesser General Public License for more details.
+*
+<span class="del">*</span>
+*    This package contains formulas from the PROJ package of USGS.
+*    USGS's work is fully acknowledged here. This derived work has
+*    been relicensed under LGPL with Frank Warmerdam's permission.</pre></td>
+<td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+*    This package contains formulas from the PROJ package of USGS.
+*    USGS's work is fully acknowledged here. This derived work has
+*    been relicensed under LGPL with Frank Warmerdam's 
permission.</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/Mercator.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/Mercator.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/Mercator1SP.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/20874/Mercator1SP.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/20874/Mercator1SP.xhtml (added)
+++ sis/ip-review/rev/20874/Mercator1SP.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Mercator1SP changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Mercator1SP changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header mostly. This header does not apply to Apache SIS,
+provided that we port only the code from authors who accepted relicensing.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r20873:20874 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/Mercator1SP.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2005, Geotools Project Managment Committee 
(PMC)</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="del"> *    License as published by the Free Software Foundation; 
either</span>
+<span class="del"> *    version 2.1 of the License, or (at your option) any 
later version.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+ *
+<span class="add"> *   (C) 2005-2006, Geotools Project Managment Committee 
(PMC)</span>
+<span class="add"> *</span>
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="add"> *    License as published by the Free Software 
Foundation;</span>
+<span class="add"> *    version 2.1 of the License.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty 
of</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/Mercator1SP.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/Mercator1SP.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/20874/Mercator2SP.xhtml
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/20874/Mercator2SP.xhtml?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/20874/Mercator2SP.xhtml (added)
+++ sis/ip-review/rev/20874/Mercator2SP.xhtml Mon Mar 16 16:18:13 2015
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Mercator2SP changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Mercator2SP changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header mostly. This header does not apply to Apache SIS,
+provided that we port only the code from authors who accepted relicensing.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change 
--ignore-all-space --ignore-eol-style" -r20873:20874 
http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/projection/Mercator2SP.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2005, Geotools Project Managment Committee 
(PMC)</span>
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="del"> *    License as published by the Free Software Foundation; 
either</span>
+<span class="del"> *    version 2.1 of the License, or (at your option) any 
later version.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td>
+<td><pre>/*
+<span class="add"> *    GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> *    http://geotools.org</span>
+ *
+<span class="add"> *   (C) 2005-2006, Geotools Project Managment Committee 
(PMC)</span>
+<span class="add"> *</span>
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+<span class="add"> *    License as published by the Free Software 
Foundation;</span>
+<span class="add"> *    version 2.1 of the License.</span>
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty 
of</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/20874/Mercator2SP.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/20874/Mercator2SP.xhtml
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: sis/ip-review/rev/23993/HEADER.html
URL: 
http://svn.apache.org/viewvc/sis/ip-review/rev/23993/HEADER.html?rev=1667056&view=auto
==============================================================================
--- sis/ip-review/rev/23993/HEADER.html (added)
+++ sis/ip-review/rev/23993/HEADER.html Mon Mar 16 16:18:13 2015
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 23993</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 23993</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>jezekjan</td></tr>
+  <tr><td><b>Date:</b></td><td>2007-01-21</td></tr>
+  <tr><td><b>Message:</b></td><td>EPSG aliases added to fix Krovak EPSG 
definition.</td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/23993/HEADER.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/ip-review/rev/23993/HEADER.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

svn commit: r1667056 [2/3] - in /sis/ip-review: ./ rev/07845/ rev/09131/ rev/09505/ rev/10796/ rev/11695/ rev/12238/ rev/20874/ rev/23993/ rev/25606/ rev/29681/

Reply via email to