Changeset 30504 in osm

Timestamp:

2014-06-30T20:48:13+02:00 (10 years ago)

Author:

glebius

Message:

Fixes for r30234.

• No need to embrace JsonObject.getJsonNumber() into try {}. This method doesn't throw JsonException.
• Lat/Lon must be always present of TPV mode >= 2, so we don't need to check for these fields.
• Speed/Track may be missing in TPV, so first check that the JsonObject is not null. This fixes instant crashes of LiveGPS.

File:

• applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java (modified) (2 diffs)

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java

@@ -259 +259 @@
     private LiveGpsData ParseJSON(String line) {
         JsonObject report;
-        String type;
-        double lat = 0;
-        double lon = 0;
+        double lat, lon;
         float speed = 0;
         float course = 0;
@@ -269 +267 @@
         try {
             report = Json.createReader(new StringReader(line)).readObject();
-            type = report.getString("class");
         } catch (JsonException jex) {
             Main.warn("LiveGps: line read from gpsd is not a JSON object:" + line);
             return null;
         }
-        if (!type.equals("TPV"))
+        if (!report.getString("class").equals("TPV") || report.getInt("mode") < 2)
             return null;
 
-        try {
-            lat = report.getJsonNumber("lat").doubleValue();
-            lon = report.getJsonNumber("lon").doubleValue();
-            speed = (new Float(report.getJsonNumber("speed").doubleValue())).floatValue();
-            course = (new Float(report.getJsonNumber("track").doubleValue())).floatValue();
-            JsonNumber epxJson = report.getJsonNumber("epx");
-            if (epxJson != null)
-                epx = (new Float(epxJson.doubleValue())).floatValue();
-            JsonNumber epyJson = report.getJsonNumber("epy");
-            if (epyJson != null)
-                epy = (new Float(epyJson.doubleValue())).floatValue();
-
-            return new LiveGpsData(lat, lon, course, speed, epx, epy);
-        } catch (JsonException je) {
-            Main.debug(je.getMessage());
-        }
-
-        return null;
+        lat = report.getJsonNumber("lat").doubleValue();
+        lon = report.getJsonNumber("lon").doubleValue();
+
+        JsonNumber epxJson = report.getJsonNumber("epx");
+        JsonNumber epyJson = report.getJsonNumber("epy");
+        JsonNumber speedJson = report.getJsonNumber("speed");
+        JsonNumber trackJson = report.getJsonNumber("track");
+
+        if (speedJson != null)
+            speed = (float )speedJson.doubleValue();
+        if (trackJson != null)
+            course = (float )trackJson.doubleValue();
+        if (epxJson != null)
+            epx = (float )epxJson.doubleValue();
+        if (epyJson != null)
+            epy = (float )epyJson.doubleValue();
+
+        return new LiveGpsData(lat, lon, course, speed, epx, epy);
     }