Changeset 13602 in josm for trunk/src/org/openstreetmap/josm/data/coor/conversion

Timestamp:

2018-04-07T20:42:34+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16129 - projections rework for new ESRI file

File:

• trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java

@@ -50 +50 @@
     private static final Pattern P_XML = Pattern.compile(
             "lat=[\"']([+|-]?\\d+[.,]\\d+)[\"']\\s+lon=[\"']([+|-]?\\d+[.,]\\d+)[\"']");
+
+    private static final String FLOAT = "(\\d+(\\.\\d*)?)";
+    /** Degree-Minute-Second pattern **/
+    private static final String DMS = "(?<neg1>-)?"
+            + "(?=\\d)(?:(?<single>" + FLOAT + ")|"
+            + "((?<degree>" + FLOAT + ")d)?"
+            + "((?<minutes>" + FLOAT + ")\')?"
+            + "((?<seconds>" + FLOAT + ")\")?)"
+            + "(?:[NE]|(?<neg2>[SW]))?";
+    private static final Pattern P_DMS = Pattern.compile("^" + DMS + "$");
 
     private static class LatLonHolder {
@@ -199 +209 @@
      */
     public static double parseCoordinate(String angleStr) {
-        final String floatPattern = "(\\d+(\\.\\d*)?)";
         // pattern does all error handling.
-        Matcher in = Pattern.compile("^(?<neg1>-)?"
-                + "(?=\\d)(?:(?<single>" + floatPattern + ")|"
-                + "((?<degree>" + floatPattern + ")d)?"
-                + "((?<minutes>" + floatPattern + ")\')?"
-                + "((?<seconds>" + floatPattern + ")\")?)"
-                + "(?:[NE]|(?<neg2>[SW]))?$").matcher(angleStr);
+        Matcher in = P_DMS.matcher(angleStr);
 
         if (!in.find()) {