#44: add gnssid to SATObject

Author: Ben Turner

src/main/java/de/taimos/gpsd4java/backend/ResultParser.java

@@ -254,6 +254,7 @@ protected IGPSObject parsePRN(final JSONObject json) {
     sat.setElevation(json.optInt("el", -1));
     sat.setSignalStrength(json.optInt("ss", -1));
     sat.setUsed(json.optBoolean("used", false));
+    sat.setGnssId(json.optInt("gnssid", -1));
     gps = sat;
     return gps;
   }

src/main/java/de/taimos/gpsd4java/types/SATObject.java

@@ -36,6 +36,8 @@ public class SATObject implements IGPSObject {
 
   private int signalStrength = -1;
 
+  private int gnssId = -1;
+
   private boolean used = false;
 
   /**
@@ -132,6 +134,24 @@ public void setUsed(final boolean used) {
     this.used = used;
   }
 
+  /**
+   * The GNSSID field of the satellite, if available.
+   *
+   * @return gnssId
+   */
+  public int getGnssId() {
+    return gnssId;
+  }
+
+  /**
+   * The GNSSID field of the satellite, if available.
+   *
+   * @param gnssId the GNSSID field to set
+   */
+  public void setGnssId(final int gnssId) {
+    this.gnssId = gnssId;
+  }
+
   @Override
   public int hashCode() {
     final int prime = 31;
@@ -145,6 +165,8 @@ public int hashCode() {
     result = (prime * result) + (int) (temp ^ (temp >>> 32));
     temp = Double.doubleToLongBits(this.signalStrength);
     result = (prime * result) + (int) (temp ^ (temp >>> 32));
+    temp = Double.doubleToLongBits(this.gnssId);
+    result = (prime * result) + (int) (temp ^ (temp >>> 32));
     result = (prime * result) + ((this.used) ? 1 : 0);
     return result;
   }

src/test/java/de/taimos/gpsd4java/backend/ResultParserTest.java

@@ -0,0 +1,40 @@
+package de.taimos.gpsd4java.backend;
+
+import de.taimos.gpsd4java.types.SATObject;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ResultParserTest {
+
+  private ResultParser resultParser;
+
+  @Before
+  public void before() {
+    this.resultParser = new ResultParser();
+  }
+
+  @Test
+  public void testSatObject() {
+    final JSONObject json = new JSONObject();
+    json.put("PRN", 12);
+    json.put("gnssid", 44);
+    json.put("svid", 12);
+    json.put("az", 229);
+    json.put("el", 24);
+    json.put("prRes", 22.9);
+    json.put("qual", 1);
+    json.put("ss", 0);
+    json.put("used", false);
+    json.put("health", 1);
+    final SATObject satObject = (SATObject) this.resultParser.parsePRN(json);
+    Assert.assertEquals(12, satObject.getPRN());
+    Assert.assertEquals(44, satObject.getGnssId());
+    Assert.assertEquals(229, satObject.getAzimuth());
+    Assert.assertEquals(24, satObject.getElevation());
+    Assert.assertFalse(satObject.getUsed());
+    Assert.assertEquals(0, satObject.getSignalStrength());
+  }
+
+}