sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1683752 - /sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
Date Fri, 05 Jun 2015 13:40:28 GMT
Author: desruisseaux
Date: Fri Jun  5 13:40:28 2015
New Revision: 1683752

URL: http://svn.apache.org/r1683752
Log:
Bug fix: getUnitReplacement return the unit of the enclosing method, not of the inner method.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java?rev=1683752&r1=1683751&r2=1683752&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
[UTF-8] Fri Jun  5 13:40:28 2015
@@ -462,18 +462,18 @@ public final class ServicesForMetadata e
     /**
      * Returns the coordinate system of a geocentric CRS using axes in the given unit of
measurement.
      *
-     * @param  unit The unit of measurement for the geocentric CRS axes.
+     * @param  linearUnit The unit of measurement for the geocentric CRS axes.
      * @return The coordinate system for a geocentric CRS with axes using the given unit
of measurement.
      *
      * @since 0.6
      */
     @Override
-    public CartesianCS getGeocentricCS(final Unit<Length> unit) {
+    public CartesianCS getGeocentricCS(final Unit<Length> linearUnit) {
         CartesianCS cs = (CartesianCS) CommonCRS.WGS84.geocentric().getCoordinateSystem();
-        if (!SI.METRE.equals(unit)) {
+        if (!SI.METRE.equals(linearUnit)) {
             cs = (CartesianCS) CoordinateSystems.replaceAxes(cs, new AxisFilter() {
                 @Override public Unit<?> getUnitReplacement(final Unit<?> unit)
{
-                    return unit;
+                    return linearUnit;
                 }
             });
         }



Mime
View raw message