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

Timestamp:

2009-02-17T19:17:26+01:00 (15 years ago)

Author:

stoecker

Message:

fixed #1642. patch by xeen

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxReader.java (modified) (1 diff)
• NmeaReader.java (modified) (2 diffs)
• OsmReader.java (modified) (1 diff)

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

@@ -224 +224 @@
                 break;
             case wpt:
-                if (qName.equals("ele") || qName.equals("magvar")
-                        || qName.equals("geoidheight") || qName.equals("name")
-                        || qName.equals("sym") || qName.equals("type")) {
+                if (   qName.equals("ele")  || qName.equals("magvar")
+                    || qName.equals("name") || qName.equals("geoidheight")
+                    || qName.equals("type") || qName.equals("sym")) {
                     currentWayPoint.attr.put(qName, accumulator.toString());
+                } else if(qName.equals("hdop") /*|| qName.equals("vdop") ||
+                        qName.equals("pdop")*/) {
+                    try {
+                        currentWayPoint.attr.put(qName, Float.parseFloat(accumulator.toString()));
+                    } catch(Exception e) {
+                        currentWayPoint.attr.put(qName, new Float(0));
+                    }
                 } else if (qName.equals("time")) {
                     currentWayPoint.attr.put(qName, accumulator.toString());

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

@@ -309 +309 @@
                 // h-dilution
                 accu=e[GPGGA.HDOP.position];
-                if(!accu.equals("")) {
-                    Double.parseDouble(accu);
-                    currentwp.attr.put("hdop", accu);
-                }
+                if(!accu.equals(""))
+                    currentwp.attr.put("hdop", Float.parseFloat(accu));
                 // fix
                 accu=e[GPGGA.QUALITY.position];
@@ -356 +354 @@
                 // vdop
                 accu=e[GPGSA.VDOP.position];
-                if(!accu.equals("")) {
-                    Double.parseDouble(accu);
-                    currentwp.attr.put("vdop", accu);
-                }
+                if(!accu.equals(""))
+                    currentwp.attr.put("vdop", Float.parseFloat(accu));
                 // hdop
                 accu=e[GPGSA.HDOP.position];
-                if(!accu.equals("")) {
-                    Double.parseDouble(accu);
-                    currentwp.attr.put("hdop", accu);
-                }
+                if(!accu.equals(""))
+                    currentwp.attr.put("hdop", Float.parseFloat(accu));
                 // pdop
                 accu=e[GPGSA.PDOP.position];
-                if(!accu.equals("")) {
-                    Double.parseDouble(accu);
-                    currentwp.attr.put("pdop", accu);
-                }
+                if(!accu.equals(""))
+                    currentwp.attr.put("pdop", Float.parseFloat(accu));
             }
             else if(e[0].equals("$GPRMC")) {

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

@@ -478 +478 @@
       * @param ref The dataset that is search in for references first. If
       *      the Reference is not found here, Main.ds is searched and a copy of the
-      *  elemet found there is returned.
+      *  element found there is returned.
       */
      public static DataSet parseDataSet(InputStream source, DataSet ref, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {