From fdbd5dc73c506d3fdeef141e70cafb4f478057e2 Mon Sep 17 00:00:00 2001 From: cleanerx Date: Wed, 24 Jun 2015 17:44:33 +0000 Subject: [PATCH] F#https://github.com/OpenSeaMap/depth_webfrontend/issues/113: Provide offset type to database --- .../main/java/org/osm/depth/upload/messages/DepthSensor.java | 2 ++ .../depth/upload/resources/VesselConfigurationResource.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/org.osm.depth.upload/src/main/java/org/osm/depth/upload/messages/DepthSensor.java b/org.osm.depth.upload/src/main/java/org/osm/depth/upload/messages/DepthSensor.java index fae4166d..cffa277b 100644 --- a/org.osm.depth.upload/src/main/java/org/osm/depth/upload/messages/DepthSensor.java +++ b/org.osm.depth.upload/src/main/java/org/osm/depth/upload/messages/DepthSensor.java @@ -10,4 +10,6 @@ public class DepthSensor extends SBASSensor { public double angleofbeam; public double offsetKeel; + + public String offsetType; } diff --git a/org.osm.depth.upload/src/main/java/org/osm/depth/upload/resources/VesselConfigurationResource.java b/org.osm.depth.upload/src/main/java/org/osm/depth/upload/resources/VesselConfigurationResource.java index 858acce3..8269466c 100644 --- a/org.osm.depth.upload/src/main/java/org/osm/depth/upload/resources/VesselConfigurationResource.java +++ b/org.osm.depth.upload/src/main/java/org/osm/depth/upload/resources/VesselConfigurationResource.java @@ -345,7 +345,7 @@ public Response getAll(@javax.ws.rs.core.Context SecurityContext context) { "SELECT DISTINCT " + "v.id, v.name, v.description, v.loa, v.breadth, v.draft, v.height, v.displacement, v.mmsi, v.manufacturer, v.model, v.maximumspeed, v.type, " + "s.x, s.y, s.z, s.manufacturer, s.model, s.sensorid, " + - "d.x, d.y, d.z, d.manufacturer, d.model, d.sensorid, d.frequency, d.offsetkeel " + + "d.x, d.y, d.z, d.manufacturer, d.model, d.sensorid, d.frequency, d.offsetkeel, d.offsettype " + "FROM vesselconfiguration v LEFT JOIN depthsensor AS d ON (d.vesselconfigid = v.id) LEFT JOIN sbassensor AS s ON (s.vesselconfigid = v.id)"; if (context.isUserInRole("ADMIN")) { //$NON-NLS-1$ Statement statement = conn.createStatement(); @@ -415,6 +415,7 @@ private Response analyzeResult(ResultSet executeQuery) throws SQLException { vc.depthoffset.sensorId = executeQuery.getString(25); vc.depthoffset.frequency = executeQuery.getDouble(26); vc.depthoffset.offsetKeel = executeQuery.getDouble(27); + vc.depthoffset.offsetType = executeQuery.getString(28); list.add(vc); }