refactor

src/main/java/telraam/App.java

@@ -17,9 +17,9 @@
 import telraam.database.daos.*;
 import telraam.database.models.Station;
 import telraam.healthchecks.TemplateHealthCheck;
-import telraam.logic.Lapper;
-import telraam.logic.external.ExternalLapper;
-import telraam.logic.robust.RobustLapper;
+import telraam.logic.lapper.Lapper;
+import telraam.logic.lapper.external.ExternalLapper;
+import telraam.logic.lapper.robust.RobustLapper;
 import telraam.station.Fetcher;
 import telraam.util.AcceptedLapsUtil;
 import telraam.websocket.WebSocketConnection;

src/main/java/telraam/logic/lapper/Lapper.java

@@ -1,4 +1,4 @@
-package telraam.logic;
+package telraam.logic.lapper;
 
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import telraam.database.models.Detection;

src/main/java/telraam/logic/lapper/external/ExternalLapper.java

@@ -1,4 +1,4 @@
-package telraam.logic.external;
+package telraam.logic.lapper.external;
 
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import org.jdbi.v3.core.Jdbi;
@@ -7,8 +7,8 @@
 import telraam.database.models.Detection;
 import telraam.database.models.Lap;
 import telraam.database.models.LapSource;
-import telraam.logic.Lapper;
-import telraam.logic.external.models.ExternalLapperTeamLaps;
+import telraam.logic.lapper.Lapper;
+import telraam.logic.lapper.external.models.ExternalLapperTeamLaps;
 
 import java.sql.Timestamp;
 import java.util.Comparator;

src/main/java/telraam/logic/lapper/external/ExternalLapperResource.java

@@ -1,10 +1,10 @@
-package telraam.logic.external;
+package telraam.logic.lapper.external;
 
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
-import telraam.logic.external.models.ExternalLapperStats;
-import telraam.logic.external.models.ExternalLapperTeamLaps;
+import telraam.logic.lapper.external.models.ExternalLapperStats;
+import telraam.logic.lapper.external.models.ExternalLapperTeamLaps;
 
 import java.util.List;
 

src/main/java/telraam/logic/lapper/external/models/ExternalLapperLap.java

@@ -1,4 +1,4 @@
-package telraam.logic.external.models;
+package telraam.logic.lapper.external.models;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/telraam/logic/lapper/external/models/ExternalLapperStats.java

@@ -1,4 +1,4 @@
-package telraam.logic.external.models;
+package telraam.logic.lapper.external.models;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/telraam/logic/lapper/external/models/ExternalLapperTeamLaps.java

@@ -1,4 +1,4 @@
-package telraam.logic.external.models;
+package telraam.logic.lapper.external.models;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/telraam/logic/lapper/robust/RobustLapper.java

@@ -1,4 +1,4 @@
-package telraam.logic.robust;
+package telraam.logic.lapper.robust;
 
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import org.jdbi.v3.core.Jdbi;
@@ -10,7 +10,7 @@
 import telraam.database.models.Lap;
 import telraam.database.models.LapSource;
 import telraam.database.models.Station;
-import telraam.logic.Lapper;
+import telraam.logic.lapper.Lapper;
 
 import java.sql.Timestamp;
 import java.util.*;

src/main/java/telraam/logic/lapper/simple/SimpleLapper.java

@@ -1,11 +1,11 @@
-package telraam.logic.simple;
+package telraam.logic.lapper.simple;
 
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import org.jdbi.v3.core.Jdbi;
 import telraam.database.daos.LapDAO;
 import telraam.database.daos.LapSourceDAO;
 import telraam.database.models.*;
-import telraam.logic.Lapper;
+import telraam.logic.lapper.Lapper;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/telraam/logic/positioner/CircularQueue.java

@@ -1,4 +1,4 @@
-package telraam.logic.positioners;
+package telraam.logic.positioner;
 
 import java.util.LinkedList;
 

src/main/java/telraam/logic/positioner/Position.java

@@ -1,4 +1,29 @@
-package telraam.logic.positioner;
+package telraam.logic.positioners;
 
+import lombok.Getter;
+import lombok.Setter;
+import telraam.database.models.Team;
+import telraam.websocket.WebSocketMessageSingleton;
+
+@Getter @Setter
 public class Position {
+    private Team team;
+    private float progress; // Progress of the lap. Between 0-1
+    private float speed; // Current speed. Progress / second
+
+    public Position(Team team) {
+        this.team = team;
+        this.progress = 0;
+        this.speed = 0;
+    }
+
+    private String toWebsocketMessage() {
+        return String.format("{\"topic\": \"position\", \"data\": {\"team\": %d, \"progress\": %.4f, \"speed\": %.5f}}", team.getId(), this.progress, this.speed);
+    }
+
+    public void send() {
+        WebSocketMessageSingleton.getInstance().sendToAll(
+                this.toWebsocketMessage()
+        );
+    }
 }

src/main/java/telraam/logic/positioner/SimplePositioner.java

@@ -1,4 +1,4 @@
-package telraam.logic.positioners;
+package telraam.logic.positioner;
 
 import org.jdbi.v3.core.Jdbi;
 import telraam.database.daos.BatonSwitchoverDAO;

src/main/java/telraam/station/Fetcher.java

@@ -7,7 +7,7 @@
 import telraam.database.models.Baton;
 import telraam.database.models.Detection;
 import telraam.database.models.Station;
-import telraam.logic.Lapper;
+import telraam.logic.lapper.Lapper;
 import telraam.station.models.RonnyDetection;
 import telraam.station.models.RonnyResponse;
 

src/test/java/telraam/logic/simple/SimpleLapperTest.java

@@ -8,8 +8,8 @@
 import telraam.database.models.Detection;
 import telraam.database.models.Lap;
 import telraam.database.models.LapSource;
-import telraam.logic.Lapper;
-import telraam.logic.simple.SimpleLapper;
+import telraam.logic.lapper.Lapper;
+import telraam.logic.lapper.simple.SimpleLapper;
 
 import java.sql.Timestamp;
 import java.util.Optional;