Changeset 814 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2008-08-21T00:47:19+02:00 (16 years ago)

Author:

stoecker

Message:

fix import error in NMEA. Closes #1433.

File:

• trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -60 +60 @@
                 TIME(1),
                 /** Warning from the receiver (A = data ok, V = warning) */
-                RECEIVER_WARNING(2), WIDTH_NORTH(3), WIDTH_NORTH_NAME(4), LENGTH_EAST(5), LENGTH_EAST_NAME(
-                        6),
+                RECEIVER_WARNING(2), 
+                WIDTH_NORTH(3), WIDTH_NORTH_NAME(4), 
+                LENGTH_EAST(5), LENGTH_EAST_NAME(6),
                 /** Speed in knots */
                 SPEED(7), COURSE(8), DATE(9),
@@ -168 +169 @@
 
                 int latdeg = Integer.parseInt(widthNorth.substring(0, 2));
+                double latmin = Double.parseDouble(widthNorth.substring(2));
+                double lat = latdeg + latmin / 60;
                 if ("S".equals(e[GPRMC.WIDTH_NORTH_NAME.position])) {
-                        latdeg = -latdeg;
-                }
-                double latmin = Double.parseDouble(widthNorth.substring(2));
+                        lat = -lat;
+                }       
 
                 int londeg = Integer.parseInt(lengthEast.substring(0, 3));
+                double lonmin = Double.parseDouble(lengthEast.substring(3));
+                double lon = londeg + lonmin / 60;
                 if ("W".equals(e[GPRMC.LENGTH_EAST_NAME.position])) {
-                        londeg = -londeg;
+                        lon = -lon;
                 }
-                double lonmin = Double.parseDouble(lengthEast.substring(3));
-
-                return new LatLon(latdeg + latmin / 60, londeg + lonmin / 60);
+                
+                return new LatLon(lat, lon);
         }
 }