Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/PositionalAccuracyConstant.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -21,8 +21,7 @@ import java.util.Collections;
 import java.io.ObjectStreamException;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.measure.quantity.Length;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.Record;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.quality.PositionalAccuracy;
@@ -104,6 +103,7 @@ public final class PositionalAccuracyCon
     /**
      * Creates an positional accuracy initialized to the given result.
      */
+    @SuppressWarnings("OverridableMethodCallDuringObjectConstruction")         
         // Safe because this class is final.
     private PositionalAccuracyConstant(final InternationalString 
measureDescription,
             final InternationalString evaluationMethodDescription, final 
boolean pass)
     {
@@ -131,7 +131,7 @@ public final class PositionalAccuracyCon
      *
      * <ul>
      *   <li>If at least one {@link QuantitativeResult} is found with a linear 
unit, then the largest
-     *       accuracy estimate is converted to {@linkplain SI#METRE metres} 
and returned.</li>
+     *       accuracy estimate is converted to {@linkplain Units#METRE metres} 
and returned.</li>
      *   <li>Otherwise, if the operation is a {@link Conversion}, then returns 
0 since a conversion
      *       is by definition accurate up to rounding errors.</li>
      *   <li>Otherwise, if the operation is a {@link Transformation}, then 
checks if the datum shift
@@ -166,7 +166,7 @@ public final class PositionalAccuracyCon
                                 for (final Object value : 
record.getAttributes().values()) {
                                     if (value instanceof Number) {
                                         double v = ((Number) 
value).doubleValue();
-                                        v = 
unitOfLength.getConverterTo(SI.METRE).convert(v);
+                                        v = 
unitOfLength.getConverterTo(Units.METRE).convert(v);
                                         if (v >= 0 && !(v <= accuracy)) {      
 // '!' is for replacing the NaN value.
                                             accuracy = v;
                                         }

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -19,7 +19,7 @@ package org.apache.sis.internal.referenc
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Collection;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import org.opengis.annotation.UML;
 import org.opengis.annotation.Specification;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -22,7 +22,7 @@ import java.util.Iterator;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.measure.quantity.Length;
 
 import org.opengis.util.FactoryException;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -19,9 +19,6 @@ package org.apache.sis.internal.referenc
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Collection;
-import javax.measure.unit.Unit;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.util.GenericName;
 import org.opengis.metadata.Identifier;
@@ -29,6 +26,7 @@ import org.opengis.parameter.ParameterDe
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.internal.util.Constants;
+import org.apache.sis.measure.Units;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.measure.MeasurementRange;
@@ -143,7 +141,7 @@ public abstract class AbstractProvider e
      */
     static ParameterDescriptor<Double> createZeroConstant(final 
ParameterBuilder builder) {
         final Double zero = +0.0;
-        return builder.createBounded(MeasurementRange.create(-0.0, true, zero, 
true, NonSI.DEGREE_ANGLE), zero);
+        return builder.createBounded(MeasurementRange.create(-0.0, true, zero, 
true, Units.DEGREE), zero);
     }
 
     /**
@@ -152,7 +150,7 @@ public abstract class AbstractProvider e
      * where the default value should be the value of another parameter 
instead than 0°.
      */
     static ParameterDescriptor<Double> createMandatoryLatitude(final 
ParameterBuilder builder) {
-        return builder.createBounded(Latitude.MIN_VALUE, Latitude.MAX_VALUE, 
Double.NaN, NonSI.DEGREE_ANGLE);
+        return builder.createBounded(Latitude.MIN_VALUE, Latitude.MAX_VALUE, 
Double.NaN, Units.DEGREE);
     }
 
     /**
@@ -162,28 +160,28 @@ public abstract class AbstractProvider e
         return builder.createBounded(MeasurementRange.create(
                 Latitude.MIN_VALUE, includePoles,
                 Latitude.MAX_VALUE, includePoles,
-                NonSI.DEGREE_ANGLE), 0.0);
+                Units.DEGREE), 0.0);
     }
 
     /**
      * Creates a descriptor for a longitude parameter in degrees with a 
default value of 0°.
      */
     static ParameterDescriptor<Double> createLongitude(final ParameterBuilder 
builder) {
-        return builder.createBounded(Longitude.MIN_VALUE, Longitude.MAX_VALUE, 
0.0, NonSI.DEGREE_ANGLE);
+        return builder.createBounded(Longitude.MIN_VALUE, Longitude.MAX_VALUE, 
0.0, Units.DEGREE);
     }
 
     /**
      * Creates a descriptor for a scale parameter with a default value of 1.
      */
     static ParameterDescriptor<Double> createScale(final ParameterBuilder 
builder) {
-        return builder.createStrictlyPositive(1.0, Unit.ONE);
+        return builder.createStrictlyPositive(1.0, Units.ONE);
     }
 
     /**
      * Creates a false easting, false northing or height parameter in metre 
with a default value of 0.
      */
     static ParameterDescriptor<Double> createShift(final ParameterBuilder 
builder) {
-        return builder.create(0.0, SI.METRE);
+        return builder.create(0.0, Units.METRE);
     }
 
     /**

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,7 +17,7 @@
 package org.apache.sis.internal.referencing.provider;
 
 import java.util.Arrays;
-import javax.measure.quantity.Quantity;
+import javax.measure.Quantity;
 import org.apache.sis.math.DecimalFunctions;
 
 
@@ -36,7 +36,7 @@ import org.apache.sis.math.DecimalFuncti
  * @version 0.7
  * @module
  */
-final class DatumShiftGridCompressed<C extends Quantity, T extends Quantity> 
extends DatumShiftGridFile<C,T> {
+final class DatumShiftGridCompressed<C extends Quantity<C>, T extends 
Quantity<T>> extends DatumShiftGridFile<C,T> {
     /**
      * Serial number for inter-operability with different versions.
      */
@@ -86,7 +86,7 @@ final class DatumShiftGridCompressed<C e
      * @param  scale     The factor by which to multiply each compressed value 
before to add to the average value.
      * @return The grid to use (may or may not be compressed).
      */
-    static <C extends Quantity, T extends Quantity> DatumShiftGridFile<C,T> 
compress(
+    static <C extends Quantity<C>, T extends Quantity<T>> 
DatumShiftGridFile<C,T> compress(
             final DatumShiftGridFile.Float<C,T> grid, double[] averages, final 
double scale)
     {
         final short[][] data = new short[grid.offsets.length][];

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,8 +18,8 @@ package org.apache.sis.internal.referenc
 
 import java.util.Arrays;
 import java.lang.reflect.Array;
-import javax.measure.unit.Unit;
-import javax.measure.quantity.Quantity;
+import javax.measure.Unit;
+import javax.measure.Quantity;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.GeneralParameterDescriptor;
@@ -49,16 +49,16 @@ import org.apache.sis.internal.jdk8.JDK8
  *       from {@code float} to {@code double} performed by the {@link 
#getCellValue(int, int, int)} method.</li>
  * </ul>
  *
- * @param <C> Dimension of the coordinate unit (usually {@link 
javax.measure.quantity.Angle}).
- * @param <T> Dimension of the translation unit (usually {@link 
javax.measure.quantity.Angle}
- *            or {@link javax.measure.quantity.Length}).
+ * @param  <C>  dimension of the coordinate unit (usually {@link 
javax.measure.quantity.Angle}).
+ * @param  <T>  dimension of the translation unit (usually {@link 
javax.measure.quantity.Angle}
+ *              or {@link javax.measure.quantity.Length}).
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
-public abstract class DatumShiftGridFile<C extends Quantity, T extends 
Quantity> extends DatumShiftGrid<C,T> {
+public abstract class DatumShiftGridFile<C extends Quantity<C>, T extends 
Quantity<T>> extends DatumShiftGrid<C,T> {
     /**
      * Serial number for inter-operability with different versions.
      */
@@ -212,7 +212,7 @@ public abstract class DatumShiftGridFile
      * Returns {@code this} casted to the given type, after verification that 
those types are valid.
      */
     @SuppressWarnings("unchecked")
-    final <NC extends Quantity, NT extends Quantity> DatumShiftGridFile<NC,NT> 
castTo(
+    final <NC extends Quantity<NC>, NT extends Quantity<NT>> 
DatumShiftGridFile<NC,NT> castTo(
             final Class<NC> coordinateType, final Class<NT> translationType)
     {
         super.getCoordinateUnit() .asType(coordinateType);
@@ -271,7 +271,7 @@ public abstract class DatumShiftGridFile
      * @version 0.7
      * @module
      */
-    static final class Float<C extends Quantity, T extends Quantity> extends 
DatumShiftGridFile<C,T> {
+    static final class Float<C extends Quantity<C>, T extends Quantity<T>> 
extends DatumShiftGridFile<C,T> {
         /**
          * Serial number for inter-operability with different versions.
          */

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -26,8 +26,6 @@ import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.IOException;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.Length;
 import org.opengis.parameter.ParameterValueGroup;
@@ -45,6 +43,7 @@ import org.apache.sis.internal.system.Da
 import org.apache.sis.internal.referencing.NilReferencingObject;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
+import org.apache.sis.measure.Units;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
@@ -85,7 +84,7 @@ import org.apache.sis.internal.jdk8.JDK8
  * @author  Simon Reynard (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -256,7 +255,7 @@ public class FranceGeocentricInterpolati
             return candidate;
         }
         return 
DefaultEllipsoid.createEllipsoid(Collections.singletonMap(Ellipsoid.NAME_KEY,
-                NilReferencingObject.UNNAMED), semiMajorAxis, semiMinorAxis, 
SI.METRE);
+                NilReferencingObject.UNNAMED), semiMajorAxis, semiMinorAxis, 
Units.METRE);
     }
 
     /**
@@ -418,7 +417,7 @@ public class FranceGeocentricInterpolati
                             nx = JDK8.toIntExact(Math.round((xf - x0) / Δx + 
1));
                             ny = JDK8.toIntExact(Math.round((yf - y0) / Δy + 
1));
                             grid = new DatumShiftGridFile.Float<>(3,
-                                    NonSI.DEGREE_ANGLE, SI.METRE, false,
+                                    Units.DEGREE, Units.METRE, false,
                                     x0, y0, Δx, Δy, nx, ny, PARAMETERS, file);
                         }
                         break;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,8 +17,6 @@
 package org.apache.sis.internal.referencing.provider;
 
 import java.util.List;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;
@@ -59,7 +57,7 @@ import org.apache.sis.util.logging.Loggi
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -80,42 +78,42 @@ public abstract class GeocentricAffine e
     /**
      * The operation parameter descriptor for the <cite>X-axis 
translation</cite>
      * ({@linkplain BursaWolfParameters#tX tX}) parameter value. Valid values 
range
-     * from negative to positive infinity. Units are {@linkplain SI#METRE 
metres}.
+     * from negative to positive infinity. Units are {@linkplain Units#METRE 
metres}.
      */
     public static final ParameterDescriptor<Double> TX;
 
     /**
      * The operation parameter descriptor for the <cite>Y-axis 
translation</cite>
      * ({@linkplain BursaWolfParameters#tY tY}) parameter value. Valid values 
range
-     * from negative to positive infinity. Units are {@linkplain SI#METRE 
metres}.
+     * from negative to positive infinity. Units are {@linkplain Units#METRE 
metres}.
      */
     public static final ParameterDescriptor<Double> TY;
 
     /**
      * The operation parameter descriptor for the <cite>Z-axis 
translation</cite>
      * ({@linkplain BursaWolfParameters#tZ tZ}) parameter value. Valid values 
range
-     * from negative to positive infinity. Units are {@linkplain SI#METRE 
metres}.
+     * from negative to positive infinity. Units are {@linkplain Units#METRE 
metres}.
      */
     public static final ParameterDescriptor<Double> TZ;
 
     /**
      * The operation parameter descriptor for the <cite>X-axis rotation</cite>
      * ({@linkplain BursaWolfParameters#rX rX}) parameter value.
-     * Units are {@linkplain NonSI#SECOND_ANGLE arc-seconds}.
+     * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
      */
     static final ParameterDescriptor<Double> RX;
 
     /**
      * The operation parameter descriptor for the <cite>Y-axis rotation</cite>
      * ({@linkplain BursaWolfParameters#rY rY}) parameter value.
-     * Units are {@linkplain NonSI#SECOND_ANGLE arc-seconds}.
+     * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
      */
     static final ParameterDescriptor<Double> RY;
 
     /**
      * The operation parameter descriptor for the <cite>Z-axis rotation</cite>
      * ({@linkplain BursaWolfParameters#rZ rZ}) parameter value.
-     * Units are {@linkplain NonSI#SECOND_ANGLE arc-seconds}.
+     * Units are {@linkplain Units#SECOND_ANGLE arc-seconds}.
      */
     static final ParameterDescriptor<Double> RZ;
 
@@ -141,7 +139,7 @@ public abstract class GeocentricAffine e
      * Convenience method for building the rotation parameters.
      */
     private static ParameterDescriptor<Double> createRotation(final 
ParameterBuilder builder, final String name, final String alias) {
-        return builder.addName(name).addName(Citations.OGC, 
alias).createBounded(-180*60*60, 180*60*60, 0, NonSI.SECOND_ANGLE);
+        return builder.addName(name).addName(Citations.OGC, 
alias).createBounded(-180*60*60, 180*60*60, 0, Units.ARC_SECOND);
     }
 
     /**

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,7 +17,6 @@
 package org.apache.sis.internal.referencing.provider;
 
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.unit.SI;
 import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.parameter.ParameterDescriptor;
@@ -30,6 +29,7 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.parameter.Parameters;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -40,7 +40,7 @@ import org.apache.sis.parameter.Paramete
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -67,34 +67,34 @@ public abstract class GeocentricAffineBe
 
     /**
      * The operation parameter descriptor for the {@code "src_semi_major"} 
optional parameter value.
-     * Valid values range from 0 to infinity. Units are {@linkplain SI#METRE 
metres}.
+     * Valid values range from 0 to infinity. Units are {@linkplain 
Units#METRE metres}.
      */
     public static final ParameterDescriptor<Double> SRC_SEMI_MAJOR;
 
     /**
      * The operation parameter descriptor for the {@code "src_semi_minor"} 
optional parameter value.
-     * Valid values range from 0 to infinity. Units are {@linkplain SI#METRE 
metres}.
+     * Valid values range from 0 to infinity. Units are {@linkplain 
Units#METRE metres}.
      */
     public static final ParameterDescriptor<Double> SRC_SEMI_MINOR;
 
     /**
      * The operation parameter descriptor for the {@code "src_semi_major"} 
optional parameter value.
-     * Valid values range from 0 to infinity. Units are {@linkplain SI#METRE 
metres}.
+     * Valid values range from 0 to infinity. Units are {@linkplain 
Units#METRE metres}.
      */
     public static final ParameterDescriptor<Double> TGT_SEMI_MAJOR;
 
     /**
      * The operation parameter descriptor for the {@code "src_semi_minor"} 
optional parameter value.
-     * Valid values range from 0 to infinity. Units are {@linkplain SI#METRE 
metres}.
+     * Valid values range from 0 to infinity. Units are {@linkplain 
Units#METRE metres}.
      */
     public static final ParameterDescriptor<Double> TGT_SEMI_MINOR;
 
     static {
         final ParameterBuilder builder = builder().setCodeSpace(Citations.OGC, 
Constants.OGC);
-        SRC_SEMI_MAJOR = 
builder.addName("src_semi_major").createStrictlyPositive(Double.NaN, SI.METRE);
-        SRC_SEMI_MINOR = 
builder.addName("src_semi_minor").createStrictlyPositive(Double.NaN, SI.METRE);
-        TGT_SEMI_MAJOR = 
builder.addName("tgt_semi_major").createStrictlyPositive(Double.NaN, SI.METRE);
-        TGT_SEMI_MINOR = 
builder.addName("tgt_semi_minor").createStrictlyPositive(Double.NaN, SI.METRE);
+        SRC_SEMI_MAJOR = 
builder.addName("src_semi_major").createStrictlyPositive(Double.NaN, 
Units.METRE);
+        SRC_SEMI_MINOR = 
builder.addName("src_semi_minor").createStrictlyPositive(Double.NaN, 
Units.METRE);
+        TGT_SEMI_MAJOR = 
builder.addName("tgt_semi_major").createStrictlyPositive(Double.NaN, 
Units.METRE);
+        TGT_SEMI_MINOR = 
builder.addName("tgt_semi_minor").createStrictlyPositive(Double.NaN, 
Units.METRE);
         DIMENSION      = 
builder.addName("dim").setRequired(false).createBounded(Integer.class, 2, 3, 
null);
     }
 
@@ -146,7 +146,7 @@ public abstract class GeocentricAffineBe
         MathTransform toGeocentric = 
EllipsoidToCentricTransform.createGeodeticConversion(factory,
                 pv.doubleValue(SRC_SEMI_MAJOR),
                 pv.doubleValue(SRC_SEMI_MINOR),
-                SI.METRE, getSourceDimensions() >= 3,
+                Units.METRE, getSourceDimensions() >= 3,
                 EllipsoidToCentricTransform.TargetType.CARTESIAN);
         /*
          * Create a "Geocentric to Geographic" conversion with ellipsoid axis 
length units converted to metres
@@ -155,7 +155,7 @@ public abstract class GeocentricAffineBe
         MathTransform toGeographic = 
EllipsoidToCentricTransform.createGeodeticConversion(factory,
                 pv.doubleValue(TGT_SEMI_MAJOR),
                 pv.doubleValue(TGT_SEMI_MINOR),
-                SI.METRE, getTargetDimensions() >= 3,
+                Units.METRE, getTargetDimensions() >= 3,
                 EllipsoidToCentricTransform.TargetType.CARTESIAN);
         try {
             toGeographic = toGeographic.inverse();

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,8 +16,6 @@
  */
 package org.apache.sis.internal.referencing.provider;
 
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.parameter.ParameterDescriptor;
@@ -29,6 +27,7 @@ import org.apache.sis.parameter.Paramete
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.matrix.Matrix4;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -38,7 +37,7 @@ import org.apache.sis.referencing.operat
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -69,9 +68,9 @@ public class GeographicOffsets extends G
     private static final ParameterDescriptorGroup PARAMETERS;
     static {
         final ParameterBuilder builder = builder();
-        TY = builder.addIdentifier("8601").addName("Latitude offset") 
.create(0, NonSI.DEGREE_ANGLE);
-        TX = builder.addIdentifier("8602").addName("Longitude 
offset").create(0, NonSI.DEGREE_ANGLE);
-        TZ = builder.addIdentifier("8603").addName("Vertical Offset") 
.create(0, SI.METRE);
+        TY = builder.addIdentifier("8601").addName("Latitude offset") 
.create(0, Units.DEGREE);
+        TX = builder.addIdentifier("8602").addName("Longitude 
offset").create(0, Units.DEGREE);
+        TZ = builder.addIdentifier("8603").addName("Vertical Offset") 
.create(0, Units.METRE);
         PARAMETERS = builder.addIdentifier("9660").addName("Geographic3D 
offsets").createGroup(TY, TX, TZ);
     }
 

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.internal.referencing.provider;
 
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.measure.quantity.Length;
 import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,10 +17,10 @@
 package org.apache.sis.internal.referencing.provider;
 
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.unit.Unit;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.apache.sis.parameter.ParameterBuilder;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -28,7 +28,7 @@ import org.apache.sis.parameter.Paramete
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.6
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -58,7 +58,7 @@ public final class LambertConformalMichi
         SCALE_FACTOR = builder
                 .addIdentifier("1051")
                 .addName("Ellipsoid scaling factor")
-                .createStrictlyPositive(Double.NaN, Unit.ONE);
+                .createStrictlyPositive(Double.NaN, Units.ONE);
 
         PARAMETERS = builder
                 .addIdentifier(IDENTIFIER)

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -20,8 +20,7 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.NoSuchElementException;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.Identifier;
@@ -38,6 +37,7 @@ import org.opengis.referencing.operation
 import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.measure.MeasurementRange;
+import org.apache.sis.measure.Units;
 import org.apache.sis.referencing.NamedIdentifier;
 import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 import org.apache.sis.metadata.iso.citation.Citations;
@@ -90,7 +90,7 @@ public abstract class MapProjection exte
     @Debug
     public static final DefaultParameterDescriptor<Double> ECCENTRICITY;
     static {
-        final MeasurementRange<Double> valueDomain = 
MeasurementRange.createGreaterThan(0, SI.METRE);
+        final MeasurementRange<Double> valueDomain = 
MeasurementRange.createGreaterThan(0, Units.METRE);
         final GenericName[] aliases = {
             new NamedIdentifier(Citations.ESRI,    "Semi_Major"),
             new NamedIdentifier(Citations.NETCDF,  "semi_major_axis"),

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -19,8 +19,7 @@ package org.apache.sis.internal.referenc
 import java.util.Map;
 import java.util.Collections;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.parameter.ParameterDescriptor;
@@ -37,6 +36,7 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.internal.referencing.NilReferencingObject;
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.util.Constants;
+import org.apache.sis.measure.Units;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Debug;
 
@@ -60,7 +60,7 @@ import org.apache.sis.util.Debug;
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -74,7 +74,7 @@ public final class Molodensky extends Ge
      * The operation parameter descriptor for the <cite>Semi-major axis length 
difference</cite>
      * optional parameter value. This parameter is defined by the EPSG 
database and can be used
      * in replacement of {@link #TGT_SEMI_MAJOR}.
-     * Units are {@linkplain SI#METRE metres}.
+     * Units are {@linkplain Units#METRE metres}.
      */
     public static final ParameterDescriptor<Double> AXIS_LENGTH_DIFFERENCE;
 
@@ -92,8 +92,8 @@ public final class Molodensky extends Ge
     public static final ParameterDescriptorGroup PARAMETERS;
     static {
         final ParameterBuilder builder = builder();
-        AXIS_LENGTH_DIFFERENCE = 
builder.addIdentifier("8654").addName("Semi-major axis length 
difference").create(Double.NaN, SI.METRE);
-        FLATTENING_DIFFERENCE  = 
builder.addIdentifier("8655").addName("Flattening 
difference").createBounded(-1, +1, Double.NaN, Unit.ONE);
+        AXIS_LENGTH_DIFFERENCE = 
builder.addIdentifier("8654").addName("Semi-major axis length 
difference").create(Double.NaN, Units.METRE);
+        FLATTENING_DIFFERENCE  = 
builder.addIdentifier("8655").addName("Flattening 
difference").createBounded(-1, +1, Double.NaN, Units.ONE);
         PARAMETERS = builder.setRequired(true)
                 .addIdentifier("9604")
                 .addName("Molodensky")
@@ -267,7 +267,7 @@ public final class Molodensky extends Ge
 
         /** Creates a new temporary ellipsoid with explicitely provided Δa and 
Δf values. */
         Ellipsoid(Map<String,?> name, double a, double b, double Δa, double 
Δf) {
-            super(name, a, b, Formulas.getInverseFlattening(a, b), false, 
SI.METRE);
+            super(name, a, b, Formulas.getInverseFlattening(a, b), false, 
Units.METRE);
             this.Δa = Δa;
             this.Δf = Δf;
         }

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -24,7 +24,6 @@ import java.nio.FloatBuffer;
 import java.nio.channels.ReadableByteChannel;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.measure.quantity.Angle;
-import javax.measure.unit.NonSI;
 import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
@@ -41,6 +40,7 @@ import org.apache.sis.util.CharSequences
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.internal.system.DataDirectory;
+import org.apache.sis.measure.Units;
 
 // Branch-dependent imports
 import java.nio.file.Path;
@@ -59,7 +59,7 @@ import java.nio.file.Files;
  * @author  Martin Desruisseaux (Geomatys)
  * @author  Rueben Schulz (UBC)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  *
  * @see <a href="http://www.ngs.noaa.gov/cgi-bin/nadcon.prl";>NADCON on-line 
computation</a>
@@ -392,7 +392,7 @@ public final class NADCON extends Abstra
             if (latitudeShifts == null) {
                 dim   = 1;                          // Dimension of latitudes.
                 scale = DEGREES_TO_SECONDS * Δy;    // NADCON shifts are 
positive north.
-                grid  = new DatumShiftGridFile.Float<>(2, NonSI.DEGREE_ANGLE, 
NonSI.DEGREE_ANGLE,
+                grid  = new DatumShiftGridFile.Float<>(2, Units.DEGREE, 
Units.DEGREE,
                         true, x0, y0, Δx, Δy, nx, ny, PARAMETERS, file, 
longitudeShifts);
                 grid.accuracy = SECOND_PRECISION / DEGREES_TO_SECONDS;
             } else {

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -28,8 +28,7 @@ import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.unit.Unit;
-import javax.measure.unit.NonSI;
+import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;
@@ -49,6 +48,7 @@ import org.apache.sis.util.collection.Ca
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Messages;
+import org.apache.sis.measure.Units;
 
 // Branch-dependent imports
 import java.nio.file.Files;
@@ -64,7 +64,7 @@ import org.apache.sis.internal.jdk8.JDK8
  * @author  Simon Reynard (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.7
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -299,13 +299,13 @@ public final class NTv2 extends Abstract
             final double precision;
             final String name = (String) get("GS_TYPE");
             if (name.equalsIgnoreCase("SECONDS")) {         // Most common 
value
-                unit = NonSI.SECOND_ANGLE;
+                unit = Units.ARC_SECOND;
                 precision = SECOND_PRECISION;                       // Used 
only as a hint; will not hurt if wrong.
             } else if (name.equalsIgnoreCase("MINUTES")) {
-                unit = NonSI.MINUTE_ANGLE;
+                unit = Units.ARC_MINUTE;
                 precision = SECOND_PRECISION / 60;                  // Used 
only as a hint; will not hurt if wrong.
             } else if (name.equalsIgnoreCase("DEGREES")) {
-                unit = NonSI.DEGREE_ANGLE;
+                unit = Units.DEGREE;
                 precision = SECOND_PRECISION / DEGREES_TO_SECONDS;  // Used 
only as a hint; will not hurt if wrong.
             } else {
                 throw new 
FactoryException(Errors.format(Errors.Keys.UnexpectedValueInElement_2, 
"GS_TYPE", name));

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,7 +17,6 @@
 package org.apache.sis.internal.referencing.provider;
 
 import java.util.List;
-import javax.measure.unit.NonSI;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
@@ -25,6 +24,7 @@ import org.opengis.parameter.GeneralPara
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.measure.Latitude;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.sis.measure.Latitude;
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.6
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -56,7 +56,7 @@ public final class PolarStereographicNor
         // Replace the "Standard Parallel" parameter from [-90 … 0]° domain to 
[0 … 90]° domain.
         final ParameterBuilder builder = builder();
         parameters[0] = 
builder.addNamesAndIdentifiers(parameters[0]).createBounded(
-                       0, Latitude.MAX_VALUE, Latitude.MAX_VALUE, 
NonSI.DEGREE_ANGLE);
+                       0, Latitude.MAX_VALUE, Latitude.MAX_VALUE, 
Units.DEGREE);
 
         PARAMETERS = builder
                 .addName(Citations.ESRI, "Stereographic_North_Pole")

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.internal.referencing.provider;
 
-import javax.measure.unit.NonSI;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
@@ -25,6 +24,7 @@ import org.apache.sis.parameter.Paramete
 import org.apache.sis.parameter.DefaultParameterDescriptor;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.MeasurementRange;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.sis.measure.Measuremen
  * @author  Rueben Schulz (UBC)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlTransient
@@ -66,7 +66,7 @@ public final class PolarStereographicSou
         final ParameterBuilder builder = builder();
         final ParameterDescriptor<?>[] parameters = {
             alternativeAuthority(PolarStereographicB.STANDARD_PARALLEL, 
Citations.ESRI, builder)
-                   .createBounded(Latitude.MIN_VALUE, 0, Latitude.MIN_VALUE, 
NonSI.DEGREE_ANGLE),
+                   .createBounded(Latitude.MIN_VALUE, 0, Latitude.MIN_VALUE, 
Units.DEGREE),
 
             forESRI(PolarStereographicB.LONGITUDE_OF_ORIGIN, builder),
                     PolarStereographicB.SCALE_FACTOR,                   // Not 
formally a parameter of this projection.

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,9 +16,6 @@
  */
 package org.apache.sis.internal.referencing.provider;
 
-import javax.measure.unit.Unit;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
@@ -30,6 +27,7 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.math.MathFunctions;
+import org.apache.sis.measure.Units;
 
 
 /**
@@ -38,7 +36,7 @@ import org.apache.sis.math.MathFunctions
  * @author  Martin Desruisseaux (MPO, IRD, Geomatys)
  * @author  Rueben Schulz (UBC)
  * @since   0.6
- * @version 0.7
+ * @version 0.8
  * @module
  *
  * @see <a 
href="http://www.remotesensing.org/geotiff/proj_list/transverse_mercator.html";>Transverse
 Mercator on RemoteSensing.org</a>
@@ -176,11 +174,11 @@ public final class TransverseMercator ex
         if (zone != 0) {
             name = "UTM zone " + zone + (isSouth ? 'S' : 'N');
         }
-        group.parameter(Constants.LATITUDE_OF_ORIGIN).setValue(latitude,  
NonSI.DEGREE_ANGLE);
-        group.parameter(Constants.CENTRAL_MERIDIAN)  .setValue(longitude, 
NonSI.DEGREE_ANGLE);
-        group.parameter(Constants.SCALE_FACTOR)      .setValue(0.9996, 
Unit.ONE);
-        group.parameter(Constants.FALSE_EASTING)     .setValue(500000, 
SI.METRE);
-        group.parameter(Constants.FALSE_NORTHING)    .setValue(isSouth ? 
10000000 : 0, SI.METRE);
+        group.parameter(Constants.LATITUDE_OF_ORIGIN).setValue(latitude,  
Units.DEGREE);
+        group.parameter(Constants.CENTRAL_MERIDIAN)  .setValue(longitude, 
Units.DEGREE);
+        group.parameter(Constants.SCALE_FACTOR)      .setValue(0.9996, 
Units.ONE);
+        group.parameter(Constants.FALSE_EASTING)     .setValue(500000, 
Units.METRE);
+        group.parameter(Constants.FALSE_NORTHING)    .setValue(isSouth ? 
10000000 : 0, Units.METRE);
         return name;
     }
 

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptor.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -21,7 +21,7 @@ import java.util.Set;
 import java.util.Map;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.CodeList;
 import org.opengis.parameter.ParameterValue;
 import org.opengis.parameter.ParameterDescriptor;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -67,11 +67,11 @@ import static org.apache.sis.util.Utilit
  *             ParameterBuilder builder = new ParameterBuilder();
  *             builder.setCodeSpace(Citations.EPSG, "EPSG").setRequired(true);
  *             ParameterDescriptor<?>[] parameters = {
- *                 builder.addName("Latitude of natural origin")    
.createBounded( -80,  +84, 0, NonSI.DEGREE_ANGLE),
- *                 builder.addName("Longitude of natural origin")   
.createBounded(-180, +180, 0, NonSI.DEGREE_ANGLE),
- *                 builder.addName("Scale factor at natural 
origin").createStrictlyPositive(1, Unit.ONE),
- *                 builder.addName("False easting")                 .create(0, 
SI.METRE),
- *                 builder.addName("False northing")                .create(0, 
SI.METRE)
+ *                 builder.addName("Latitude of natural origin")    
.createBounded( -80,  +84, 0, Units.DEGREE),
+ *                 builder.addName("Longitude of natural origin")   
.createBounded(-180, +180, 0, Units.DEGREE),
+ *                 builder.addName("Scale factor at natural 
origin").createStrictlyPositive(1, Units.ONE),
+ *                 builder.addName("False easting")                 .create(0, 
Units.METRE),
+ *                 builder.addName("False northing")                .create(0, 
Units.METRE)
  *             };
  *             builder.addIdentifier("9804")                    // Primary key 
in EPSG database.
  *                    .addName("Mercator (variant A)")          // EPSG name 
since October 2010.

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -25,9 +25,9 @@ import javax.xml.bind.annotation.XmlType
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.measure.unit.Unit;
-import javax.measure.converter.UnitConverter;
-import javax.measure.converter.ConversionException;
+import javax.measure.Unit;
+import javax.measure.UnitConverter;
+import javax.measure.IncommensurableException;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.parameter.ParameterValue;
 import org.opengis.parameter.ParameterDescriptor;
@@ -389,7 +389,7 @@ public class DefaultParameterValue<T> ex
         }
         try {
             return source.getConverterToAny(unit);
-        } catch (ConversionException e) {
+        } catch (IncommensurableException e) {
             throw new 
IllegalArgumentException(Errors.format(Errors.Keys.IncompatibleUnits_2, source, 
unit), e);
         }
     }

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -79,8 +79,8 @@ import java.util.Objects;
  *
  * {@preformat java
  *     ParameterValueGroup mercator = Mercator.PARAMETERS.createValue();
- *     mercator.parameter("Longitude of natural origin").setValue(-60, 
NonSI.DEGREE_ANGLE);  // 60°W
- *     mercator.parameter("Latitude of natural origin") .setValue( 40, 
NonSI.DEGREE_ANGLE);  // 40°N
+ *     mercator.parameter("Longitude of natural origin").setValue(-60, 
Units.DEGREE);  // 60°W
+ *     mercator.parameter("Latitude of natural origin") .setValue( 40, 
Units.DEGREE);  // 40°N
  *     // Keep default values for other parameters.
  * }
  * </div>

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/MapProjectionParameters.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,8 +18,7 @@ package org.apache.sis.parameter;
 
 import java.util.Collections;
 import java.util.Map;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.parameter.ParameterValue;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterNotFoundException;
@@ -27,6 +26,7 @@ import org.apache.sis.referencing.NamedI
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.measure.MeasurementRange;
+import org.apache.sis.measure.Units;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArraysExt;
 
@@ -44,7 +44,7 @@ import java.util.Objects;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.6
+ * @version 0.8
  * @module
  */
 final class MapProjectionParameters extends DefaultParameterValueGroup {
@@ -170,7 +170,7 @@ final class MapProjectionParameters exte
          */
         static final ParameterDescriptor<Double> DESCRIPTOR = new 
DefaultParameterDescriptor<>(
                 InverseFlattening.toMap(Constants.EARTH_RADIUS), 0, 1, 
Double.class,
-                MeasurementRange.createGreaterThan(0.0, SI.METRE), null, null);
+                MeasurementRange.createGreaterThan(0.0, Units.METRE), null, 
null);
 
         /**
          * The parameters for the semi-major and semi-minor axis length.
@@ -254,7 +254,7 @@ final class MapProjectionParameters exte
          */
         static final ParameterDescriptor<Double> DESCRIPTOR = new 
DefaultParameterDescriptor<>(
                 toMap(Constants.INVERSE_FLATTENING), 0, 1, Double.class,
-                MeasurementRange.createGreaterThan(0.0, Unit.ONE), null, null);
+                MeasurementRange.createGreaterThan(0.0, Units.ONE), null, 
null);
 
         /**
          * Helper method for {@link #DESCRIPTOR} constructions.

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.parameter;
 
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.GeneralParameterDescriptor;
@@ -73,22 +73,22 @@ import static org.apache.sis.util.Argume
  *   // Constructs the list of parameters.
  *   ParameterDescriptor<?>[] parameters = {
  *       builder.addName("Latitude of natural origin")              // Name in 
the default namespace ("EPSG" in this example).
- *              .createBounded( -80,  +84, 0, NonSI.DEGREE_ANGLE),  // 
Latitude of Mercator projection can not go to the poles.
+ *              .createBounded( -80,  +84, 0, Units.DEGREE),  // Latitude of 
Mercator projection can not go to the poles.
  *
  *       builder.addIdentifier("8802")                              // Primary 
key in default namespace ("EPSG" in this example).
  *              .addName("Longitude of natural origin")             // Primary 
name in default namespace ("EPSG" in this example).
  *              .addName(Citations.OGC, "central_meridian")         // First 
alias in "OGC" namespace.
  *              .addName(Citations.GEOTIFF, "NatOriginLong")        // Second 
alias in "GeoTIFF" namespace.
- *              .createBounded(-180, +180, 0, NonSI.DEGREE_ANGLE),  // 
Projection is valid on all the longitude range (±180°).
+ *              .createBounded(-180, +180, 0, Units.DEGREE),  // Projection is 
valid on all the longitude range (±180°).
  *
  *       builder.addName("Scale factor at natural origin")
- *              .createStrictlyPositive(1, Unit.ONE),
+ *              .createStrictlyPositive(1, Units.ONE),
  *
  *       builder.addName("False easting")
- *              .create(0, SI.METRE),
+ *              .create(0, Units.METRE),
  *
  *       builder.addName("False northing")
- *              .create(0, SI.METRE)
+ *              .create(0, Units.METRE)
  *   };
  *
  *   // Put all above parameters in a group.

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -33,7 +33,7 @@ import java.text.ParsePosition;
 import java.text.ParseException;
 import java.io.Console;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 
 import org.opengis.parameter.*;
 import org.opengis.util.ScopedName;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterTableRow.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterTableRow.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterTableRow.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterTableRow.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -29,7 +29,7 @@ import java.lang.reflect.Array;
 import java.io.IOException;
 import java.text.Format;
 import java.text.FieldPosition;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.Identifier;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.io.Serializable;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import org.opengis.util.MemberName;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValue.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValue.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValue.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValue.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.parameter;
 
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterValue;
 import org.apache.sis.internal.util.Cloner;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -21,9 +21,9 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.lang.reflect.Array;
-import javax.measure.unit.Unit;
-import javax.measure.converter.UnitConverter;
-import javax.measure.converter.ConversionException;
+import javax.measure.Unit;
+import javax.measure.UnitConverter;
+import javax.measure.IncommensurableException;
 import org.opengis.metadata.Identifier;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.GeneralParameterDescriptor;
@@ -151,7 +151,7 @@ final class Verifier {
                      */
                     try {
                         converter = unit.getConverterToAny(def);
-                    } catch (ConversionException e) {
+                    } catch (IncommensurableException e) {
                         throw new 
IllegalArgumentException(Errors.format(Errors.Keys.IncompatibleUnits_2, unit, 
def), e);
                     }
                     Class<?> componentType = valueClass.getComponentType();

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/package-info.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -73,8 +73,8 @@
  *
  * {@preformat java
  *     ParameterValueGroup group = Mercator.PARAMETERS.createValue();
- *     group.parameter("Longitude of natural origin").setValue(-60);   // 
Using default units (e.g. degrees).
- *     group.parameter("False easting").setValue(200.0, SI.KILOMETRE); // 
Using explicit units.
+ *     group.parameter("Longitude of natural origin").setValue(-60);        // 
Using default units (e.g. degrees).
+ *     group.parameter("False easting").setValue(200.0, Units.KILOMETRE);   // 
Using explicit units.
  * }
  * </div>
  *

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -20,7 +20,6 @@ import java.util.Map;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
-import javax.measure.unit.NonSI;
 import org.opengis.util.FactoryException;
 import org.opengis.geometry.Envelope;
 import org.opengis.referencing.NoSuchAuthorityCodeException;
@@ -48,6 +47,7 @@ import org.opengis.metadata.extent.Geogr
 import org.opengis.metadata.extent.GeographicExtent;
 import org.opengis.referencing.operation.CoordinateOperation;
 import org.opengis.referencing.operation.TransformException;
+import org.apache.sis.measure.Units;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.internal.metadata.AxisDirections;
@@ -815,7 +815,7 @@ check:  while (lower != 0 || upper != di
      */
     public static double getGreenwichLongitude(final GeodeticCRS crs) {
         ArgumentChecks.ensureNonNull("crs", crs);
-        return 
ReferencingUtilities.getGreenwichLongitude(crs.getDatum().getPrimeMeridian(), 
NonSI.DEGREE_ANGLE);
+        return 
ReferencingUtilities.getGreenwichLongitude(crs.getDatum().getPrimeMeridian(), 
Units.DEGREE);
     }
 
     /**

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -22,10 +22,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
-import javax.measure.unit.SI;
-import javax.measure.unit.NonSI;
-import javax.measure.unit.Unit;
-import javax.measure.quantity.Duration;
+import javax.measure.Unit;
+import javax.measure.quantity.Time;
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;
 import org.opengis.referencing.IdentifiedObject;
@@ -128,7 +126,7 @@ import org.apache.sis.internal.jdk8.JDK8
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  *
  * @see org.apache.sis.referencing.factory.CommonAuthorityFactory
@@ -148,7 +146,7 @@ public enum CommonCRS {
      *   <tr><th>Semi-major axis length:</th>  <td>6378137</td></tr>
      *   <tr><th>Semi-minor axis length:</th>  <td>6356752 
<i>(approximative)</i></td></tr>
      *   <tr><th>Inverse flattening:</th>      <td>298.257223563 
<i>(definitive)</i></td></tr>
-     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link SI#METRE}</td></tr>
+     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link 
Units#METRE}</td></tr>
      *   <tr><th>UTM zones:</th>               <td>1 to 60 in North and South 
hemispheres</td></tr>
      * </table></blockquote>
      */
@@ -166,7 +164,7 @@ public enum CommonCRS {
      *   <tr><th>Semi-major axis length:</th>  <td>6378135</td></tr>
      *   <tr><th>Semi-minor axis length:</th>  <td>6356751 
<i>(approximative)</i></td></tr>
      *   <tr><th>Inverse flattening:</th>      <td>298.26 
<i>(definitive)</i></td></tr>
-     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link SI#METRE}</td></tr>
+     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link 
Units#METRE}</td></tr>
      *   <tr><th>UTM zones:</th>               <td>1 to 60 in North and South 
hemispheres</td></tr>
      * </table></blockquote>
      */
@@ -187,7 +185,7 @@ public enum CommonCRS {
      *   <tr><th>Semi-major axis length:</th>  <td>6378137</td></tr>
      *   <tr><th>Semi-minor axis length:</th>  <td>6356752 
<i>(approximative)</i></td></tr>
      *   <tr><th>Inverse flattening:</th>      <td>298.257222101 
<i>(definitive)</i></td></tr>
-     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link SI#METRE}</td></tr>
+     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link 
Units#METRE}</td></tr>
      *   <tr><th>UTM zones:</th>               <td>1 to 23 in the North 
hemisphere</td></tr>
      * </table></blockquote>
      *
@@ -210,7 +208,7 @@ public enum CommonCRS {
      *   <tr><th>Prime meridian:</th>          <td>Greenwich</td></tr>
      *   <tr><th>Semi-major axis length:</th>  <td>6378206.4</td></tr>
      *   <tr><th>Semi-minor axis length:</th>  <td>6356583.8 
<i>(definitive)</i></td></tr>
-     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link SI#METRE}</td></tr>
+     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link 
Units#METRE}</td></tr>
      *   <tr><th>UTM zones:</th>               <td>1 to 22 in the North 
hemisphere</td></tr>
      * </table></blockquote>
      */
@@ -230,7 +228,7 @@ public enum CommonCRS {
      *   <tr><th>Semi-major axis length:</th>  <td>6378137</td></tr>
      *   <tr><th>Semi-minor axis length:</th>  <td>6356752 
<i>(approximative)</i></td></tr>
      *   <tr><th>Inverse flattening:</th>      <td>298.257222101 
<i>(definitive)</i></td></tr>
-     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link SI#METRE}</td></tr>
+     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link 
Units#METRE}</td></tr>
      *   <tr><th>UTM zones:</th>               <td>28 to 37 in the North 
hemisphere</td></tr>
      * </table></blockquote>
      *
@@ -253,7 +251,7 @@ public enum CommonCRS {
      *   <tr><th>Semi-major axis length:</th>  <td>6378388</td></tr>
      *   <tr><th>Semi-minor axis length:</th>  <td>6356912 
<i>(approximative)</i></td></tr>
      *   <tr><th>Inverse flattening:</th>      <td>297 
<i>(definitive)</i></td></tr>
-     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link SI#METRE}</td></tr>
+     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link 
Units#METRE}</td></tr>
      *   <tr><th>UTM zones:</th>               <td>28 to 38 in the North 
hemisphere</td></tr>
      * </table></blockquote>
      */
@@ -271,7 +269,7 @@ public enum CommonCRS {
      *   <tr><th>Prime meridian:</th>          <td>Greenwich</td></tr>
      *   <tr><th>Semi-major axis length:</th>  <td>6371007</td></tr>
      *   <tr><th>Semi-minor axis length:</th>  <td>6371007 
<i>(definitive)</i></td></tr>
-     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link SI#METRE}</td></tr>
+     *   <tr><th>Ellipsoid axes unit:</th>     <td>{@link 
Units#METRE}</td></tr>
      * </table></blockquote>
      *
      * @see 
org.apache.sis.referencing.datum.DefaultEllipsoid#getAuthalicRadius()
@@ -430,7 +428,7 @@ public enum CommonCRS {
      * <ul>
      *   <li>Axis order is (<var>longitude</var>, <var>latitude</var>).</li>
      *   <li>Axis directions are ({@linkplain AxisDirection#EAST East}, 
{@linkplain AxisDirection#NORTH North}).</li>
-     *   <li>Angular unit is {@link NonSI#DEGREE_ANGLE}.</li>
+     *   <li>Angular unit is {@link Units#DEGREE}.</li>
      *   <li>Prime meridian in Greenwich.</li>
      * </ul>
      *
@@ -1052,7 +1050,7 @@ public enum CommonCRS {
          *   <tr><th>Primary names:</th>            <td>"MSL height" 
&nbsp;(<i>datum:</i> "Mean Sea Level")</td></tr>
          *   <tr><th>Abbreviations or aliases:</th> <td>"mean sea level 
height" &nbsp;(<i>datum:</i> "MSL")</td></tr>
          *   <tr><th>Direction:</th>                <td>{@link 
AxisDirection#UP}</td></tr>
-         *   <tr><th>Unit:</th>                     <td>{@link 
SI#METRE}</td></tr>
+         *   <tr><th>Unit:</th>                     <td>{@link 
Units#METRE}</td></tr>
          * </table></blockquote>
          *
          * @see VerticalDatumType#GEOIDAL
@@ -1067,7 +1065,7 @@ public enum CommonCRS {
          *   <tr><th>Primary names:</th>            <td>"MSL depth" 
&nbsp;(<i>datum:</i> "Mean Sea Level")</td></tr>
          *   <tr><th>Abbreviations or aliases:</th> <td>"mean sea level depth" 
&nbsp;(<i>datum:</i> "MSL")</td></tr>
          *   <tr><th>Direction:</th>                <td>{@link 
AxisDirection#DOWN}</td></tr>
-         *   <tr><th>Unit:</th>                     <td>{@link 
SI#METRE}</td></tr>
+         *   <tr><th>Unit:</th>                     <td>{@link 
Units#METRE}</td></tr>
          * </table></blockquote>
          *
          * @see VerticalDatumType#GEOIDAL
@@ -1083,7 +1081,7 @@ public enum CommonCRS {
          *   <tr><th>Primary names:</th>            <td>"NAVD88 height" 
&nbsp;(<i>datum:</i> "North American Vertical Datum 1988")</td></tr>
          *   <tr><th>Abbreviations or aliases:</th> <td>" North American 
Vertical Datum of 1988 height (m)" &nbsp;(<i>datum:</i> "NAVD88")</td></tr>
          *   <tr><th>Direction:</th>                <td>{@link 
AxisDirection#UP}</td></tr>
-         *   <tr><th>Unit:</th>                     <td>{@link 
SI#METRE}</td></tr>
+         *   <tr><th>Unit:</th>                     <td>{@link 
Units#METRE}</td></tr>
          * </table></blockquote>
          *
          * @see CommonCRS#NAD83
@@ -1224,11 +1222,11 @@ public enum CommonCRS {
             final Unit<?> unit;
             switch (this) {
                 default: {
-                    unit = SI.METRE;
+                    unit = Units.METRE;
                     break;
                 }
                 case BAROMETRIC: {
-                    unit = SI.MetricPrefix.HECTO(SI.PASCAL);
+                    unit = Units.HECTOPASCAL;
                     break;
                 }
             }
@@ -1459,14 +1457,14 @@ public enum CommonCRS {
         @SuppressWarnings("fallthrough")
         private TimeCS cs() {
             final Map<String,?> cs, axis;
-            Unit<Duration> unit = SI.SECOND;
+            Unit<Time> unit = Units.SECOND;
             switch (this) {
                 default: {
                     // Share the coordinate system created for truncated 
Julian.
                     return TRUNCATED_JULIAN.crs().getCoordinateSystem();
                 }
                 case TRUNCATED_JULIAN: {
-                    unit = NonSI.DAY;
+                    unit = Units.DAY;
                     // Fall through
                 }
                 case UNIX: {

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -628,7 +628,7 @@ public final class IdentifiedObjects ext
      *   <tr><td>{@link 
org.opengis.referencing.operation.OperationMethod}</td>     <td>{@code 
method}</td>              <td>Operation method definition</td></tr>
      *   <tr><td>{@link org.opengis.parameter.ParameterDescriptor}</td>        
     <td>{@code parameter}</td>           <td>Operation parameter 
definition</td></tr>
      *   <tr><td>{@link org.opengis.referencing.ReferenceSystem}</td>          
     <td>{@code referenceSystem}</td>     <td>Value reference system 
definition</td></tr>
-     *   <tr><td>{@link javax.measure.unit.Unit}</td>                          
     <td>{@code uom}</td>                 <td>Unit of measure 
definition</td></tr>
+     *   <tr><td>{@link javax.measure.Unit}</td>                               
     <td>{@code uom}</td>                 <td>Unit of measure 
definition</td></tr>
      * </table>
      *
      * The type is followed by the {@linkplain NamedIdentifier#getVersion() 
codespace version} if available,

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/StandardDefinitions.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -18,9 +18,7 @@ package org.apache.sis.referencing;
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
-import javax.measure.unit.NonSI;
+import javax.measure.Unit;
 import javax.measure.quantity.Length;
 import org.opengis.referencing.datum.Ellipsoid;
 import org.opengis.referencing.datum.PrimeMeridian;
@@ -61,6 +59,7 @@ import org.apache.sis.referencing.operat
 import 
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.measure.Latitude;
+import org.apache.sis.measure.Units;
 
 import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
 import static org.opengis.referencing.IdentifiedObject.ALIAS_KEY;
@@ -76,7 +75,7 @@ import static org.apache.sis.internal.me
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 final class StandardDefinitions {
@@ -221,7 +220,7 @@ final class StandardDefinitions {
         double  semiMajorAxis; // No default value
         double  other;         // No default value
         boolean ivfDefinitive  = true;
-        Unit<Length> unit      = SI.METRE;
+        Unit<Length> unit      = Units.METRE;
         switch (code) {
             case 7030: name  = "WGS 84";                   alias = "WGS84";    
    semiMajorAxis = 6378137.0; other = 298.257223563; break;
             case 7043: name  = "WGS 72";                   alias = "NWL 10D";  
    semiMajorAxis = 6378135.0; other = 298.26;        break;
@@ -247,7 +246,7 @@ final class StandardDefinitions {
         final Map<String,Object> properties = new HashMap<>(4);
         properties.put(NAME_KEY, new NamedIdentifier(Citations.EPSG, 
"Greenwich")); // Name is fixed by ISO 19111.
         properties.put(IDENTIFIERS_KEY, new NamedIdentifier(Citations.EPSG, 
GREENWICH));
-        return new DefaultPrimeMeridian(properties, 0, NonSI.DEGREE_ANGLE);
+        return new DefaultPrimeMeridian(properties, 0, Units.DEGREE);
     }
 
     /**
@@ -360,7 +359,7 @@ final class StandardDefinitions {
      */
     static CoordinateSystemAxis createAxis(final short code) {
         final String name, abrv;
-        Unit<?> unit = SI.METRE;
+        Unit<?> unit = Units.METRE;
         double min = Double.NEGATIVE_INFINITY;
         double max = Double.POSITIVE_INFINITY;
         RangeMeaning rm = null;
@@ -368,17 +367,17 @@ final class StandardDefinitions {
         switch (code) {
             case 1:    name = "Easting";
                        abrv = "E";
-                       unit = SI.METRE;
+                       unit = Units.METRE;
                        dir  = AxisDirection.EAST;
                        break;
             case 2:    name = "Northing";
                        abrv = "N";
-                       unit = SI.METRE;
+                       unit = Units.METRE;
                        dir  = AxisDirection.NORTH;
                        break;
             case 60:   name = "Spherical latitude";
                        abrv = "φ′";                         // See 
HardCodedAxes.SPHERICAL_LATITUDE in tests.
-                       unit = NonSI.DEGREE_ANGLE;
+                       unit = Units.DEGREE;
                        dir  = AxisDirection.NORTH;
                        min  = Latitude.MIN_VALUE;
                        max  = Latitude.MAX_VALUE;
@@ -386,7 +385,7 @@ final class StandardDefinitions {
                        break;
             case 61:   name = "Spherical longitude";
                        abrv = "θ";                          // See 
HardCodedAxes.SPHERICAL_LONGITUDE in tests.
-                       unit = NonSI.DEGREE_ANGLE;
+                       unit = Units.DEGREE;
                        dir  = AxisDirection.EAST;
                        min  = Longitude.MIN_VALUE;
                        max  = Longitude.MAX_VALUE;
@@ -394,7 +393,7 @@ final class StandardDefinitions {
                        break;
             case 62:   name = "Geocentric radius";
                        abrv = "R";                          // See 
HardCodedAxes.GEOCENTRIC_RADIUS in tests.
-                       unit = SI.METRE;
+                       unit = Units.METRE;
                        dir  = AxisDirection.UP;
                        rm   = RangeMeaning.EXACT;
                        min  = 0;
@@ -402,7 +401,7 @@ final class StandardDefinitions {
             case 108:  // Used in Ellipsoidal 3D.
             case 106:  name = AxisNames.GEODETIC_LATITUDE;
                        abrv = "φ";
-                       unit = NonSI.DEGREE_ANGLE;
+                       unit = Units.DEGREE;
                        dir  = AxisDirection.NORTH;
                        min  = Latitude.MIN_VALUE;
                        max  = Latitude.MAX_VALUE;
@@ -411,7 +410,7 @@ final class StandardDefinitions {
             case 109:  // Used in Ellipsoidal 3D.
             case 107:  name = AxisNames.GEODETIC_LONGITUDE;
                        abrv = "λ";
-                       unit = NonSI.DEGREE_ANGLE;
+                       unit = Units.DEGREE;
                        dir  = AxisDirection.EAST;
                        min  = Longitude.MIN_VALUE;
                        max  = Longitude.MAX_VALUE;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.crs;
 import java.util.Map;
 import java.util.EnumMap;
 import java.util.ConcurrentModificationException;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSeeAlso;

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,8 +17,7 @@
 package org.apache.sis.referencing.crs;
 
 import java.util.Map;
-import javax.measure.unit.Unit;
-import javax.measure.unit.NonSI;
+import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
@@ -42,6 +41,7 @@ import org.apache.sis.referencing.Abstra
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.referencing.CRS;
+import org.apache.sis.measure.Units;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
 
@@ -61,7 +61,7 @@ import static org.apache.sis.util.Argume
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @XmlType(name = "GeodeticCRSType", propOrder = {
@@ -204,7 +204,7 @@ class DefaultGeodeticCRS extends Abstrac
         final PrimeMeridian pm = datum.getPrimeMeridian();
         final Unit<Angle> angularUnit = AxisDirections.getAngularUnit(cs, 
null);
         if (convention != Convention.WKT2_SIMPLIFIED ||     // Really this 
specific enum, not Convention.isSimplified().
-                ReferencingUtilities.getGreenwichLongitude(pm, 
NonSI.DEGREE_ANGLE) != 0)
+                ReferencingUtilities.getGreenwichLongitude(pm, Units.DEGREE) 
!= 0)
         {
             final Unit<Angle> oldUnit = 
formatter.addContextualUnit(angularUnit);
             formatter.indent(1);

Modified: 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java?rev=1764677&r1=1764676&r2=1764677&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
 [UTF-8] Thu Oct 13 13:50:40 2016
@@ -17,7 +17,7 @@
 package org.apache.sis.referencing.crs;
 
 import java.util.Map;
-import javax.measure.unit.Unit;
+import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.Length;
 import javax.xml.bind.annotation.XmlType;
@@ -329,10 +329,10 @@ public class DefaultProjectedCRS extends
      *     BaseGeodCRS[“NTF (Paris)”,
      *       Datum[“Nouvelle Triangulation Francaise”,
      *         Ellipsoid[“NTF”, 6378249.2, 293.4660212936269, 
LengthUnit[“metre”, 1]]],
-     *         PrimeMeridian[“Paris”, 2.5969213, AngleUnit[“grade”, 
0.015707963267948967]]],
+     *         PrimeMeridian[“Paris”, 2.5969213, AngleUnit[“grad”, 
0.015707963267948967]]],
      *     Conversion[“Lambert zone II”,
      *       Method[“Lambert Conic Conformal (1SP)”, Id[“EPSG”, 9801, 
Citation[“IOGP”]]],
-     *       Parameter[“Latitude of natural origin”, 52.0, AngleUnit[“grade”, 
0.015707963267948967], Id[“EPSG”, 8801]],
+     *       Parameter[“Latitude of natural origin”, 52.0, AngleUnit[“grad”, 
0.015707963267948967], Id[“EPSG”, 8801]],
      *       Parameter[“Longitude of natural origin”, 0.0, AngleUnit[“degree”, 
0.017453292519943295], Id[“EPSG”, 8802]],
      *       Parameter[“Scale factor at natural origin”, 0.99987742, 
ScaleUnit[“unity”, 1], Id[“EPSG”, 8805]],
      *       Parameter[“False easting”, 600000.0, LengthUnit[“metre”, 1], 
Id[“EPSG”, 8806]],



Reply via email to