sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1520149 [2/2] - in /sis: branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/ branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/ branches/JDK7/core/sis-referencing/src/main/...
Date Wed, 04 Sep 2013 21:43:24 GMT
Added: sis/ip-review/rev/20874/DefaultEllipsoid.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/DefaultEllipsoid.xhtml?rev=1520149&view=auto
==============================================================================
--- sis/ip-review/rev/20874/DefaultEllipsoid.xhtml (added)
+++ sis/ip-review/rev/20874/DefaultEllipsoid.xhtml Wed Sep  4 21:43:23 2013
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultEllipsoid changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultEllipsoid changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option)
any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those
who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</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/datum/DefaultEllipsoid.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
+ *
+ *    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) 2003-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (C) 2001, Institut de Recherche pour le Développement
+ *
+ *    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>
+<tr><td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU
+*    Lesser General Public License for more details.
+*
+<span class="del">*    You should have received a copy of the GNU Lesser General Public</span>
+<span class="del">*    License along with this library; if not, write to the Free Software</span>
+<span class="del">*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
 USA</span>
+<span class="del">*</span>
+*    This class contains formulas from the public FTP area of NOAA.
+*    NOAAS's work is fully acknowledged here.
+*/</pre></td>
+<td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+*    This class contains formulas from the public FTP area of NOAA.
+*    NOAAS's work is fully acknowledged here.
+*/</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/20874/Spheroid.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/Spheroid.xhtml?rev=1520149&view=auto
==============================================================================
--- sis/ip-review/rev/20874/Spheroid.xhtml (added)
+++ sis/ip-review/rev/20874/Spheroid.xhtml Wed Sep  4 21:43:23 2013
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Spheroid changes for revisions 20873:20874</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>Spheroid changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option)
any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those
who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</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/datum/Spheroid.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
+ *
+ *    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) 2003-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (C) 2001, Institut de Recherche pour le Développement
+ *
+ *    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>
+<tr><td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU
+*    Lesser General Public License for more details.
+*
+<span class="del">*    You should have received a copy of the GNU Lesser General Public</span>
+<span class="del">*    License along with this library; if not, write to the Free Software</span>
+<span class="del">*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
 USA</span>
+<span class="del">*</span>
+*    This package contains documentation from OpenGIS specifications.
+*    OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td>
+<td><pre>*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+*    This package contains documentation from OpenGIS specifications.
+*    OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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

Added: sis/ip-review/rev/26413/DefaultEllipsoid.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/26413/DefaultEllipsoid.xhtml?rev=1520149&view=auto
==============================================================================
--- sis/ip-review/rev/26413/DefaultEllipsoid.xhtml (added)
+++ sis/ip-review/rev/26413/DefaultEllipsoid.xhtml Wed Sep  4 21:43:23 2013
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>DefaultEllipsoid changes for revisions 26412:26413</title>
+    <style type="text/css" media="all">
+      @import url("../../reports.css");
+    </style>
+  </head>
+  <body>
+    <div>
+      <h1>DefaultEllipsoid changes for revisions 26412:26413</h1>
+
+<p>In this commit, Andrea rightly pointed out that the "<cite>is inverse flattening
definitive?</cite>" information
+can be considered as metadata. Indeed, this information has no incidence on the numerical
calculations using ellipsoid
+properties.</p>
+
+<p>In SIS and Geotk, this is coded differently - in part because the <code>boolean</code>
argument has been replaced
+by a <code>ComparisonMode</code> enumeration - but the idea to ignore metadata
stay the same. While it can be coded
+in various way, the basic idea can hardly be different since the fact cited in the previous
paragraph is universal
+no matter how the ellipsoid could be coded. Assuming that copyrights apply to code, note
to the mathematical or the
+geographical concepts behind code, the same action is keep in SIS. The SIS code is (at the
time of commit):</p>
+
+<blockquote><pre>final Ellipsoid that = (Ellipsoid) object;
+if (mode == ComparisonMode.BY_CONTRACT) {
+    /*
+     * isIvfDefinitive has no incidence on calculation using ellipsoid parameters,
+     * so we consider it as metadata that can be ignored in IGNORE_METADATA mode.
+     */
+    if (isIvfDefinitive() != that.isIvfDefinitive()) {
+        return false;
+    }
+}</pre></blockquote>
+
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space
--ignore-eol-style" -r26412:26413 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/datum/DefaultEllipsoid.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 26412</th><th>Revision 26413</th></tr>
+<tr><td><pre>}
+if (super.equals(object, compareMetadata)) {
+    final DefaultEllipsoid that = (DefaultEllipsoid) object;
+<span class="del">    return this.ivfDefinitive == that.ivfDefinitive &amp;&amp;</span>
+           Double.doubleToLongBits(this.semiMajorAxis)     == Double.doubleToLongBits(that.semiMajorAxis)
    &amp;&amp;
+           Double.doubleToLongBits(this.semiMinorAxis)     == Double.doubleToLongBits(that.semiMinorAxis)
    &amp;&amp;
+           Double.doubleToLongBits(this.inverseFlattening) == Double.doubleToLongBits(that.inverseFlattening)
&amp;&amp;</pre></td>
+<td><pre>}
+if (super.equals(object, compareMetadata)) {
+    final DefaultEllipsoid that = (DefaultEllipsoid) object;
+<span class="add">    return (!compareMetadata || this.ivfDefinitive == that.ivfDefinitive)
&amp;&amp;</span>
+           Double.doubleToLongBits(this.semiMajorAxis)     == Double.doubleToLongBits(that.semiMajorAxis)
    &amp;&amp;
+           Double.doubleToLongBits(this.semiMinorAxis)     == Double.doubleToLongBits(that.semiMinorAxis)
    &amp;&amp;
+           Double.doubleToLongBits(this.inverseFlattening) == Double.doubleToLongBits(that.inverseFlattening)
&amp;&amp;</pre></td></tr>
+</table>
+    </div>
+  </body>
+</html>

Propchange: sis/ip-review/rev/26413/DefaultEllipsoid.xhtml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: sis/ip-review/rev/26413/HEADER.html
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/26413/HEADER.html?rev=1520149&view=auto
==============================================================================
--- sis/ip-review/rev/26413/HEADER.html (added)
+++ sis/ip-review/rev/26413/HEADER.html Wed Sep  4 21:43:23 2013
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="UTF-8"/>
+    <title>Revision 26413</title>
+  </head>
+  <body>
+    <div>
+      <h1>Revision 26413</h1>
+<table>
+  <tr><td><b>Author:</b></td><td>aaime</td></tr>
+  <tr><td><b>Date:</b></td><td>2007-08-01</td></tr>
+  <tr><td><b>Message:</b></td><td>Fix for GEOT-1411,
lenient datum comparisong should not consider ivDefinitive</td></tr>
+</table>
+    </div>
+  </body>
+</html>

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

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



Mime
View raw message