Skip to content

Commit

Permalink
F#OpenSeaMap/depth_webfrontend#113: Provide offset type to database
Browse files Browse the repository at this point in the history
  • Loading branch information
cleanerx committed Jun 24, 2015
1 parent d484d47 commit fdbd5dc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ public class DepthSensor extends SBASSensor {
public double angleofbeam;

public double offsetKeel;

public String offsetType;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit fdbd5dc

Please sign in to comment.