sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1785681 - in /sis/branches/JDK8/core/sis-referencing-by-identifiers/src: main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
Date Mon, 06 Mar 2017 16:35:58 GMT
Author: desruisseaux
Date: Mon Mar  6 16:35:58 2017
New Revision: 1785681

URL: http://svn.apache.org/viewvc?rev=1785681&view=rev
Log:
Fix west/east confusion.

Modified:
    sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
    sis/branches/JDK8/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java

Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java?rev=1785681&r1=1785680&r2=1785681&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/LocationFormat.java
[UTF-8] Mon Mar  6 16:35:58 2017
@@ -76,8 +76,8 @@ import org.apache.sis.util.resources.Voc
  *   ┌─────────────────────────────────────────────────────────────┐
  *   │ Location type:               Grid zone designator           │
  *   │ Geographic identifier:       32TNL83                        │
- *   │ East bound:                    580,000 m    —     9°57′00″E │
- *   │ West bound:                    590,000 m    —    10°04′13″E │
+ *   │ West bound:                    580,000 m    —     9°57′00″E │
+ *   │ East bound:                    590,000 m    —    10°04′13″E │
  *   │ South bound:                 4,530,000 m    —    40°54′58″N │
  *   │ North bound:                 4,540,000 m    —    41°00′27″N │
  *   │ Representative position:       585,000 m    —    10°00′36″E │
@@ -113,8 +113,8 @@ public class LocationFormat extends Comp
      * {@link Vocabulary.Keys} constants for the east, west, south and north bounds, in that
order.
      */
     private static final short[] BOUND_KEY = {
-        Vocabulary.Keys.EastBound,
         Vocabulary.Keys.WestBound,
+        Vocabulary.Keys.EastBound,
         Vocabulary.Keys.SouthBound,
         Vocabulary.Keys.NorthBound,
         Vocabulary.Keys.RepresentativePosition,

Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java?rev=1785681&r1=1785680&r2=1785681&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
[UTF-8] Mon Mar  6 16:35:58 2017
@@ -50,8 +50,8 @@ public final strictfp class LocationForm
         assertMultilinesEquals(
                 "┌─────────────────────────────────────────┐\n"
+
                 "│ Geographic identifier:       A location │\n" +
-                "│ East bound:                   8°00′00″E │\n" +
-                "│ West bound:                  10°00′00″E │\n" +
+                "│ West bound:                   8°00′00″E │\n" +
+                "│ East bound:                  10°00′00″E │\n" +
                 "│ South bound:                  2°00′00″S │\n" +
                 "│ North bound:                 30°00′00″N │\n" +
                 "│ Representative position:      9°00′00″E │\n" +
@@ -79,8 +79,8 @@ public final strictfp class LocationForm
         assertMultilinesEquals(
                 "┌────────────────────────────────────────────────────┐\n"
+
                 "│ Geographic identifier:       A location            │\n" +
-                "│ East bound:                    388,719 m           │\n" +
-                "│ West bound:                    611,281 m           │\n" +
+                "│ West bound:                    388,719 m           │\n" +
+                "│ East bound:                    611,281 m           │\n" +
                 "│ South bound:                  -221,095 m           │\n" +
                 "│ North bound:                 3,319,207 m           │\n" +
                 "│ Representative position:       500,000 m           │\n" +
@@ -111,8 +111,8 @@ public final strictfp class LocationForm
         assertMultilinesEquals(
                 "┌─────────────────────────────────────────────────────────────┐\n"
+
                 "│ Geographic identifier:       A location                     │\n" +
-                "│ East bound:                    388,719 m    —     8°00′00″E │\n"
+
-                "│ West bound:                    611,281 m    —    10°00′00″E │\n"
+
+                "│ West bound:                    388,719 m    —     8°00′00″E │\n"
+
+                "│ East bound:                    611,281 m    —    10°00′00″E │\n"
+
                 "│ South bound:                  -221,095 m    —     2°00′00″S │\n"
+
                 "│ North bound:                 3,319,207 m    —    30°00′00″N │\n"
+
                 "│ Representative position:       500,000 m    —     9°00′00″E │\n"
+



Mime
View raw message