Changeset 1388 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-02-09T10:05:19+01:00 (16 years ago)

Author:

stoecker

Message:

fix NMEA parsing: #1853

File:

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

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

@@ -158 +158 @@
     }
     public int getParserChecksumErrors() {
-        return ps.checksum_errors;
+        return ps.checksum_errors+ps.no_checksum;
     }
     public int getParserMalformed() {
@@ -219 +219 @@
         protected int malformed = 0;
         protected int checksum_errors = 0;
+        protected int no_checksum = 0;
         protected int unknown = 0;
         protected int zero_coord = 0;
@@ -235 +236 @@
             // and result in a malformed packet.
             String[] chkstrings = s.split("\\*");
-            byte[] chb = chkstrings[0].getBytes();
-            int chk=0;
-            for(int i = 1; i < chb.length; i++) chk ^= chb[i];
-            if(Integer.parseInt(chkstrings[1].substring(0,2),16) != chk) {
-                //System.out.println("Checksum error");
-                ps.checksum_errors++;
-                ps.p_Wp=null;
-                return false;
-            }
+            if(chkstrings.length > 1)
+            {
+                byte[] chb = chkstrings[0].getBytes();
+                int chk=0;
+                for(int i = 1; i < chb.length; i++) chk ^= chb[i];
+                if(Integer.parseInt(chkstrings[1].substring(0,2),16) != chk) {
+                    //System.out.println("Checksum error");
+                    ps.checksum_errors++;
+                    ps.p_Wp=null;
+                    return false;
+                }
+            }
+            else
+                ps.no_checksum++;
             // now for the content
             String[] e = chkstrings[0].split(",");
@@ -435 +441 @@
         } catch(Exception x) {
             // out of bounds and such
+            // x.printStackTrace();
             // System.out.println("Malformed line: "+s.toString().trim());
             ps.malformed++;
@@ -460 +467 @@
         int latdeg = Integer.parseInt(widthNorth.substring(0, latdegsep));
         double latmin = Double.parseDouble(widthNorth.substring(latdegsep));
+        if(latdeg < 0) // strange data with '-' sign
+            latmin *= -1.0;
         double lat = latdeg + latmin / 60;
         if ("S".equals(ns)) {
@@ -470 +479 @@
         int londeg = Integer.parseInt(lengthEast.substring(0, londegsep));
         double lonmin = Double.parseDouble(lengthEast.substring(londegsep));
+        if(londeg < 0) // strange data with '-' sign
+            lonmin *= -1.0;
         double lon = londeg + lonmin / 60;
         if ("W".equals(ew)) {