sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1740994 - in /sis/branches/JDK7: ./ application/sis-console/src/main/java/org/apache/sis/console/ application/sis-console/src/main/resources/org/apache/sis/console/ core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/pro...
Date Tue, 26 Apr 2016 10:38:43 GMT
Author: desruisseaux
Date: Tue Apr 26 10:38:43 2016
New Revision: 1740994

URL: http://svn.apache.org/viewvc?rev=1740994&view=rev
Log:
Merge from JDK8 branch improvement of "transform" command-line.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java
    sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
    sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options.properties
    sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options_fr.properties
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 26 10:38:43 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1740884
+/sis/branches/JDK8:1584960-1740992
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java
[UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/Command.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -52,7 +52,7 @@ import org.apache.sis.util.logging.Monol
  * <tr><td>{@code --format}    </td><td>The output format: {@code
xml}, {@code wkt}, {@code wkt1} or {@code text}.</td></tr>
  * <tr><td>{@code --locale}    </td><td>The locale to use for the
command output.</td></tr>
  * <tr><td>{@code --timezone}  </td><td>The timezone for the dates
to be formatted.</td></tr>
- * <tr><td>{@code --encoding}  </td><td>The encoding to use for the
command output.</td></tr>
+ * <tr><td>{@code --encoding}  </td><td>The encoding to use for the
command outputs and some inputs.</td></tr>
  * <tr><td>{@code --colors}    </td><td>Whether colorized output
shall be enabled.</td></tr>
  * <tr><td>{@code --brief}     </td><td>Whether the output should
contains only brief information.</td></tr>
  * <tr><td>{@code --verbose}   </td><td>Whether the output should
contains more detailed information.</td></tr>

Modified: sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
[UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -19,7 +19,7 @@ package org.apache.sis.console;
 import java.util.EnumSet;
 import java.util.Locale;
 import java.io.IOException;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.LineNumberReader;
 import java.io.InputStreamReader;
 import java.text.NumberFormat;
@@ -37,6 +37,7 @@ import org.opengis.referencing.NoSuchAut
 import org.opengis.referencing.crs.GeographicCRS;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.opengis.referencing.operation.SingleOperation;
 import org.opengis.referencing.operation.CoordinateOperation;
 import org.opengis.referencing.operation.ConcatenatedOperation;
@@ -47,11 +48,15 @@ import org.apache.sis.geometry.Immutable
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.referencing.DirectPositionView;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
+import org.apache.sis.internal.util.PatchedUnitFormat;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.internal.util.X364;
+import org.apache.sis.io.LineAppender;
+import org.apache.sis.io.TableAppender;
 import org.apache.sis.io.wkt.Colors;
 import org.apache.sis.io.wkt.Convention;
+import org.apache.sis.io.wkt.Transliterator;
 import org.apache.sis.io.wkt.WKTFormat;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.math.MathFunctions;
@@ -101,6 +106,11 @@ final class TransformCommand extends Met
     private final Vocabulary resources;
 
     /**
+     * Where to write the header before the data.
+     */
+    private TableAppender outHeader;
+
+    /**
      * The format to use for writing coordinate values.
      */
     private NumberFormat coordinateFormat;
@@ -182,22 +192,28 @@ final class TransformCommand extends Met
         /*
          * Prints the header: source CRS, target CRS, operation steps and positional accuracy.
          */
+        outHeader = new TableAppender(new LineAppender(out), " ");
+        outHeader.setMultiLinesCells(true);
         printHeader(Vocabulary.Keys.Source);      printNameAndIdentifier(operation.getSourceCRS());
         printHeader(Vocabulary.Keys.Destination); printNameAndIdentifier(operation.getTargetCRS());
         printHeader(Vocabulary.Keys.Methods);     printOperationMethods (operation, false);
-        out.println();
+        outHeader.nextLine();
         if (options.containsKey(Option.VERBOSE)) {
-            printHeader(Vocabulary.Keys.Details);
-            out.println();
             final WKTFormat f = new WKTFormat(locale, timezone);
             f.setConvention(options.containsKey(Option.DEBUG) ? Convention.INTERNAL : convention);
             if (colors) {
                 f.setColors(Colors.DEFAULT);
             }
-            for (final CharSequence line : CharSequences.splitOnEOL(f.format(operation.getMathTransform())))
{
-                printCommentLinePrefix();
-                out.print("  ");
-                out.println(line);
+            final CharSequence[] lines = CharSequences.splitOnEOL(f.format(operation.getMathTransform()));
+            for (int i=0; i<lines.length; i++) {
+                if (i == 0) {
+                    printHeader(Vocabulary.Keys.Details);
+                } else {
+                    printCommentLinePrefix();
+                    outHeader.nextColumn();
+                }
+                outHeader.append(lines[i]);
+                outHeader.nextLine();
             }
         }
         double accuracy = CRS.getLinearAccuracy(operation);
@@ -207,14 +223,17 @@ final class TransformCommand extends Met
             }
             printHeader(Vocabulary.Keys.Accuracy);
             if (colors) {
-                out.print(X364.FOREGROUND_YELLOW.sequence());       // Same as Colors.DEFAULT
for ElementKind.NUMBER
+                outHeader.append(X364.FOREGROUND_YELLOW.sequence());    // Same as Colors.DEFAULT
for ElementKind.NUMBER
             }
-            out.print(accuracy);
+            outHeader.append(Double.toString(accuracy));
             if (colors) {
-                out.print(X364.FOREGROUND_DEFAULT.sequence());
+                outHeader.append(X364.FOREGROUND_DEFAULT.sequence());
             }
-            out.println(" metres");
+            outHeader.append(" metres");
+            outHeader.nextLine();
         }
+        outHeader.flush();
+        outHeader = null;
         /*
          * At this point we finished to write the header. If there is at least one input
file,
          * compute the transformation needed for verifying if the input points are inside
the
@@ -223,7 +242,7 @@ final class TransformCommand extends Met
         final boolean useStandardInput = useStandardInput();
         if (useStandardInput || !files.isEmpty()) {
             computeDomainOfValidity();
-            ordinateWidth    = 14;                                      // Must be set before
computeNumFractionDigits(…).
+            ordinateWidth    = 15;                                      // Must be set before
computeNumFractionDigits(…).
             coordinateFormat = NumberFormat.getInstance(Locale.US);
             coordinateFormat.setGroupingUsed(false);
             computeNumFractionDigits(operation.getTargetCRS().getCoordinateSystem());
@@ -231,12 +250,12 @@ final class TransformCommand extends Met
             printAxes(operation.getTargetCRS().getCoordinateSystem());
             out.println();
             if (useStandardInput) {
-                try (LineNumberReader in = new LineNumberReader(new InputStreamReader(System.in)))
{
+                try (LineNumberReader in = new LineNumberReader(new InputStreamReader(System.in,
encoding))) {
                     transform(in, "stdin");
                 }
             } else {
                 for (final String file : files) {
-                    try (LineNumberReader in = new LineNumberReader(new FileReader(file)))
{
+                    try (LineNumberReader in = new LineNumberReader(new InputStreamReader(new
FileInputStream(file), encoding))) {
                         transform(in, file);
                     }
                 }
@@ -252,11 +271,11 @@ final class TransformCommand extends Met
      */
     private void printCommentLinePrefix() {
         if (colors) {
-            out.print(X364.FOREGROUND_GRAY.sequence());
+            outHeader.append(X364.FOREGROUND_GRAY.sequence());
         }
-        out.print("# ");
+        outHeader.append("# ");
         if (colors) {
-            out.print(X364.FOREGROUND_DEFAULT.sequence());
+            outHeader.append(X364.FOREGROUND_DEFAULT.sequence());
         }
     }
 
@@ -268,29 +287,29 @@ final class TransformCommand extends Met
      */
     private void printHeader(final short key) {
         printCommentLinePrefix();
-        out.print(resources.getLabel(key));
-        out.print(' ');
+        outHeader.append(resources.getLabel(key));
+        outHeader.nextColumn();
     }
 
     /**
      * Prints the name and authority code (if any) of the given object.
      */
     private void printNameAndIdentifier(final IdentifiedObject object) {
-        out.print(object.getName().getCode());
+        outHeader.append(object.getName().getCode());
         final String identifier = IdentifiedObjects.toString(IdentifiedObjects.getIdentifier(object,
null));
         if (identifier != null) {
-            out.print(' ');
+            outHeader.append(' ');
             if (colors) {
-                out.print(X364.FOREGROUND_CYAN.sequence());
+                outHeader.append(X364.FOREGROUND_CYAN.sequence());
             }
-            out.print('(');
-            out.print(identifier);
-            out.print(')');
+            outHeader.append('(');
+            outHeader.append(identifier);
+            outHeader.append(')');
             if (colors) {
-                out.print(X364.FOREGROUND_DEFAULT.sequence());
+                outHeader.append(X364.FOREGROUND_DEFAULT.sequence());
             }
         }
-        out.println();
+        outHeader.nextLine();
     }
 
     /**
@@ -310,14 +329,14 @@ final class TransformCommand extends Met
         } else if (step instanceof SingleOperation) {
             if (isNext) {
                 if (colors) {
-                    out.print(X364.FOREGROUND_GREEN.sequence());
+                    outHeader.append(X364.FOREGROUND_GREEN.sequence());
                 }
-                out.print(" → ");
+                outHeader.append(" → ");
                 if (colors) {
-                    out.print(X364.FOREGROUND_DEFAULT.sequence());
+                    outHeader.append(X364.FOREGROUND_DEFAULT.sequence());
                 }
             }
-            out.print(((SingleOperation) step).getMethod().getName().getCode());
+            outHeader.append(((SingleOperation) step).getMethod().getName().getCode());
         }
     }
 
@@ -325,16 +344,21 @@ final class TransformCommand extends Met
      * Prints a quoted text in the given color.
      * If the given text contains the quote character, it will be escaped.
      */
-    private void printQuotedText(final String text, final X364 color) {
-        if (colors) {
-            out.print(color.sequence());
-        }
-        out.print('"');
-        out.print(text.replace("\"", "\"\""));
-        out.print('"');
-        if (colors) {
-            out.print(X364.FOREGROUND_DEFAULT.sequence());
+    private void printQuotedText(String text, int fieldWidth, final X364 color) {
+        final boolean quoted;
+        if (text.indexOf('"') >= 0) {
+            text = text.replace("\"", "\"\"");
+            quoted = true;
+        } else {
+            quoted = (text.indexOf(',') >= 0);
         }
+        if (quoted) fieldWidth -= 2;
+        out.print(CharSequences.spaces(fieldWidth - text.length()));
+        if (colors) out.print(color.sequence());
+        if (quoted) out.print('"');
+        out.print(text);
+        if (quoted) out.print('"');
+        if (colors) out.print(X364.FOREGROUND_DEFAULT.sequence());
     }
 
     /*
@@ -350,9 +374,14 @@ final class TransformCommand extends Met
             if (i != 0) {
                 out.print(',');
             }
-            final String axis = cs.getAxis(i).getName().getCode();
-            out.print(CharSequences.spaces(ordinateWidth - (axis.length() + 2)));
-            printQuotedText(axis, X364.FOREGROUND_CYAN);
+            final CoordinateSystemAxis axis = cs.getAxis(i);
+            String name =  axis.getName().getCode();
+            name = Transliterator.DEFAULT.toShortAxisName(cs, axis.getDirection(), name);
+            final String unit = PatchedUnitFormat.toString(axis.getUnit());
+            if (unit != null && !unit.isEmpty()) {
+                name = name + " (" + unit + ')';
+            }
+            printQuotedText(name, ordinateWidth, X364.FOREGROUND_CYAN);
         }
     }
 
@@ -473,7 +502,7 @@ final class TransformCommand extends Met
                         }
                         if (!inside) {
                             out.print(",    ");
-                            printQuotedText(Errors.getResources(locale).getString(Errors.Keys.OutsideDomainOfValidity),
X364.FOREGROUND_RED);
+                            printQuotedText(Errors.getResources(locale).getString(Errors.Keys.OutsideDomainOfValidity),
0, X364.FOREGROUND_RED);
                         }
                     }
                     out.println();

Modified: sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options.properties?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options.properties
[ISO-8859-1] Tue Apr 26 10:38:43 2016
@@ -4,7 +4,7 @@ targetCRS=The Coordinate Reference Syste
 format=The output format: xml, wkt, wkt1 or text.
 locale=The locale to use for the command output.
 timezone=The timezone for the dates to be formatted.
-encoding=The encoding to use for the command output.
+encoding=The encoding to use for the command outputs and some inputs.
 colors=Whether colorized output shall be enabled.
 brief=Reduce the output to only brief information.
 verbose=Request the output to contain more detailed information.

Modified: sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options_fr.properties?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options_fr.properties
[ISO-8859-1] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options_fr.properties
[ISO-8859-1] Tue Apr 26 10:38:43 2016
@@ -4,7 +4,7 @@ targetCRS=Le système de référence des
 format=Le format de sortie: xml, wkt, wkt1 ou text.
 locale=Les paramètres régionaux à utiliser pour la sortie de la commande.
 timezone=Le fuseau horaire des dates à écrire.
-encoding=L\u2019encodage des caractères à utiliser pour la sortie de la commande.
+encoding=L\u2019encodage des caractères à utiliser pour la sortie de la commande et certaines
entrées.
 colors=Indique si l\u2019affichage peut être en couleurs.
 brief=Indique que la sortie de la commande ne doit contenir que de brèves informations.
 verbose=Indique que la sortie de la commande doit contenir des informations plus détaillées.

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=1740994&r1=1740993&r2=1740994&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] Tue Apr 26 10:38:43 2016
@@ -119,7 +119,7 @@ public final class Molodensky extends Ge
     public static ParameterDescriptorGroup internal() {
         final ParameterBuilder builder = builder().setCodeSpace(Citations.SIS, Constants.SIS);
         ParameterDescriptor<Boolean> abridged = builder.addName("abridged").create(Boolean.class,
null);
-        return builder.addName("Molodensky")
+        return builder.addName("Molodensky (radians domain)")
                 .createGroup(DIMENSION,
                              SRC_SEMI_MAJOR,
                              SRC_SEMI_MINOR,

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -603,7 +603,8 @@ public abstract class NormalizedProjecti
                 for (int i=1; i<parameters.length; i++) {
                     parameters[i] = builder.addName(names[i-1]).create(Double.class, null);
                 }
-                group = builder.addName(CharSequences.camelCaseToSentence(type.getSimpleName())).createGroup(1,
1, parameters);
+                group = builder.addName(CharSequences.camelCaseToSentence(
+                        type.getSimpleName()) + " (radians domain)").createGroup(1, 1, parameters);
                 DESCRIPTORS.put(type, group);
             }
         }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -443,7 +443,8 @@ public class EllipsoidToCentricTransform
                 final ParameterBuilder builder = new ParameterBuilder().setCodeSpace(Citations.SIS,
Constants.SIS);
                 final ParameterDescriptor<TargetType> target = builder.setRequired(true)
                         .addName("target").create(TargetType.class, TargetType.CARTESIAN);
-                DESCRIPTOR = builder.addName("Ellipsoid to centric").createGroup(1, 1, ECCENTRICITY,
target, DIMENSION);
+                DESCRIPTOR = builder.addName("Ellipsoid (radians domain) to centric")
+                        .createGroup(1, 1, ECCENTRICITY, target, DIMENSION);
             }
             return DESCRIPTOR;
         }
@@ -829,7 +830,7 @@ next:   while (--numPts >= 0) {
         @Override
         public ParameterDescriptorGroup getParameterDescriptors() {
             return new DefaultParameterDescriptorGroup(Collections.singletonMap(ParameterDescriptorGroup.NAME_KEY,
-                            new ImmutableIdentifier(Citations.SIS, Constants.SIS, "Centric
to ellipsoid")),
+                            new ImmutableIdentifier(Citations.SIS, Constants.SIS, "Centric
to ellipsoid (radians domain)")),
                     EllipsoidToCentricTransform.this.getParameterDescriptors());
         }
 

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -452,6 +452,6 @@ public class InterpolatedMolodenskyTrans
         };
         return new ParameterBuilder().setRequired(true)
                 .setCodeSpace(Citations.SIS, Constants.SIS)
-                .addName(context.getDescriptor().getName()).createGroup(param);
+                .addName(context.getDescriptor().getName().getCode() + " (radians domain)").createGroup(param);
     }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -383,7 +383,7 @@ public final strictfp class GeocentricTr
                 "    Parameter[“elt_0_0”, 0.017453292519943295],\n" +
                 "    Parameter[“elt_1_1”, 0.017453292519943295],\n" +
                 "    Parameter[“elt_2_2”, 1.567855942887398E-7]],\n" +
-                "  Param_MT[“Ellipsoid to centric”,\n" +
+                "  Param_MT[“Ellipsoid (radians domain) to centric”,\n" +
                 "    Parameter[“eccentricity”, 0.08181919084262157],\n" +
                 "    Parameter[“target”, “CARTESIAN”],\n" +
                 "    Parameter[“dim”, 3]],\n" +
@@ -396,7 +396,7 @@ public final strictfp class GeocentricTr
                 "    Parameter[“elt_1_3”, 1.512764667185502E-5],\n" +
                 "    Parameter[“elt_2_2”, 0.9999606483644456],\n" +
                 "    Parameter[“elt_2_3”, 1.8335353697517302E-5]],\n" +
-                "  Param_MT[“Centric to ellipsoid”,\n" +
+                "  Param_MT[“Centric to ellipsoid (radians domain)”,\n" +
                 "    Parameter[“eccentricity”, 0.08199188997902956],\n" +
                 "    Parameter[“target”, “CARTESIAN”],\n" +
                 "    Parameter[“dim”, 3]],\n" +

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -104,7 +104,7 @@ public final strictfp class LambertConic
     public void testNormalizedWKT() {
         createNormalizedProjection(true, 40);
         assertWktEqualsRegex("(?m)\\Q" +
-                "PARAM_MT[“Lambert conic conformal”,\n" +
+                "PARAM_MT[“Lambert conic conformal (radians domain)”,\n" +
                 "  PARAMETER[“eccentricity”, 0.0818191908426215],\n" +
                 "  PARAMETER[“n”, 0.64278760968653\\E\\d*\\Q]]\\E");  // 0.6427876096865393
in the original test.
     }

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -77,12 +77,12 @@ public final strictfp class MercatorTest
     @Test
     public void testNormalizedWKT() throws NoninvertibleTransformException {
         createNormalizedProjection(true);
-        assertWktEquals("PARAM_MT[“Mercator”,\n" +
+        assertWktEquals("PARAM_MT[“Mercator (radians domain)”,\n" +
                         "  PARAMETER[“eccentricity”, 0.0818191908426215]]");
 
         transform = transform.inverse();
         assertWktEquals("INVERSE_MT[\n" +
-                        "  PARAM_MT[“Mercator”,\n" +
+                        "  PARAM_MT[“Mercator (radians domain)”,\n" +
                         "    PARAMETER[“eccentricity”, 0.0818191908426215]]]");
     }
 

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -341,7 +341,7 @@ public final strictfp class EllipsoidToC
                 "    Parameter[“elt_0_0”, 0.017453292519943295],\n" +
                 "    Parameter[“elt_1_1”, 0.017453292519943295],\n" +
                 "    Parameter[“elt_2_2”, 1.567855942887398E-7]],\n" +
-                "  Param_MT[“Ellipsoid to centric”,\n" +
+                "  Param_MT[“Ellipsoid (radians domain) to centric”,\n" +
                 "    Parameter[“eccentricity”, 0.08181919084262157],\n" +
                 "    Parameter[“target”, “CARTESIAN”],\n" +
                 "    Parameter[“dim”, 3]],\n" +
@@ -361,7 +361,7 @@ public final strictfp class EllipsoidToC
                 "    Parameter[“elt_0_0”, 1.567855942887398E-7],\n" +
                 "    Parameter[“elt_1_1”, 1.567855942887398E-7],\n" +
                 "    Parameter[“elt_2_2”, 1.567855942887398E-7]],\n" +
-                "  Param_MT[“Centric to ellipsoid”,\n" +
+                "  Param_MT[“Centric to ellipsoid (radians domain)”,\n" +
                 "    Parameter[“eccentricity”, 0.08181919084262157],\n" +
                 "    Parameter[“target”, “CARTESIAN”],\n" +
                 "    Parameter[“dim”, 3]],\n" +

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransformTest.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -112,7 +112,7 @@ public final strictfp class Interpolated
                 "  Param_MT[“Affine parametric transformation”,\n" +
                 "    Parameter[“A0”, 0.017453292519943295, Id[“EPSG”, 8623]],\n"
+   // Degrees to radians conversion
                 "    Parameter[“B1”, 0.017453292519943295, Id[“EPSG”, 8640]]],\n"
+
-                "  Param_MT[“Molodensky inverse interpolation”,\n" +
+                "  Param_MT[“Molodensky inverse interpolation (radians domain)”,\n" +
                 "    Parameter[“src_semi_major”, 6378249.2],\n" +
                 "    Parameter[“src_semi_minor”, 6356515.0],\n" +
                 "    Parameter[“Semi-major axis length difference”, -112.2],\n" +

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java?rev=1740994&r1=1740993&r2=1740994&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
[UTF-8] Tue Apr 26 10:38:43 2016
@@ -458,7 +458,7 @@ public final strictfp class MolodenskyTr
                 "    Parameter[“num_col”, 4],\n" +
                 "    Parameter[“elt_0_0”, 0.017453292519943295],\n" +       // Degrees
to radians conversion
                 "    Parameter[“elt_1_1”, 0.017453292519943295]],\n" +
-                "  Param_MT[“Molodensky”,\n" +
+                "  Param_MT[“Molodensky (radians domain)”,\n" +
                 "    Parameter[“src_semi_major”, 6378137.0],\n" +
                 "    Parameter[“src_semi_minor”, 6356752.314245179],\n" +
                 "    Parameter[“Semi-major axis length difference”, 251.0],\n" +



Mime
View raw message