Add revision counter

jpo-conflictmonitor/scripts/IntegrationTestScripts/BSM_Revisions.csv

@@ -0,0 +1,7 @@
+BSM,1000,{"metadata":{"bsmSource":"RV","logFileName":"","recordType":"bsmTx","securityResultCode":"success","receivedMessageDetails":{"locationData":{"latitude":"","longitude":"","elevation":"","speed":"","heading":""},"rxSource":"RV"},"payloadType":"us.dot.its.jpo.ode.model.OdeBsmPayload","serialId":{"streamId":"","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","sanitized":false,"odePacketID":"","odeTimStartDateTime":"","originIp":"10.11.81.28"},"payload":{"data":{"coreData":{"msgCnt":56,"id":"@TEMP_ID@","secMark":"@MILLI_OF_MINUTE@","position":{"latitude":39.644797,"longitude":-105.0816018,"elevation":0},"accelSet":{"accelLong":0,"accelYaw":0},"accuracy":{"semiMajor":0,"semiMinor":0,"orientation":0},"transmission":"UNAVAILABLE","speed":22.42,"heading":180.5,"brakes":{"wheelBrakes":{"leftFront":false,"rightFront":false,"unavailable":true,"leftRear":false,"rightRear":false},"traction":"unavailable","abs":"off","scs":"unavailable","brakeBoost":"unavailable","auxBrakes":"unavailable"},"size":{"width":0,"length":0}},"partII":[{"id":"VehicleSafetyExtensions","value":{"pathHistory":{"crumbData":[]},"pathPrediction":{"confidence":0,"radiusOfCurve":0}}}]},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}}
+BSM,1000,{"metadata":{"bsmSource":"RV","logFileName":"","recordType":"bsmTx","securityResultCode":"success","receivedMessageDetails":{"locationData":{"latitude":"","longitude":"","elevation":"","speed":"","heading":""},"rxSource":"RV"},"payloadType":"us.dot.its.jpo.ode.model.OdeBsmPayload","serialId":{"streamId":"","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","sanitized":false,"odePacketID":"","odeTimStartDateTime":"","originIp":"10.11.81.28"},"payload":{"data":{"coreData":{"msgCnt":56,"id":"@TEMP_ID@","secMark":"@MILLI_OF_MINUTE@","position":{"latitude":39.644797,"longitude":-105.0816018,"elevation":0},"accelSet":{"accelLong":0,"accelYaw":0},"accuracy":{"semiMajor":0,"semiMinor":0,"orientation":0},"transmission":"UNAVAILABLE","speed":22.42,"heading":180.5,"brakes":{"wheelBrakes":{"leftFront":false,"rightFront":false,"unavailable":true,"leftRear":false,"rightRear":false},"traction":"unavailable","abs":"off","scs":"unavailable","brakeBoost":"unavailable","auxBrakes":"unavailable"},"size":{"width":0,"length":0}},"partII":[{"id":"VehicleSafetyExtensions","value":{"pathHistory":{"crumbData":[]},"pathPrediction":{"confidence":0,"radiusOfCurve":0}}}]},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}}
+BSM,2000,{"metadata":{"bsmSource":"RV","logFileName":"","recordType":"bsmTx","securityResultCode":"success","receivedMessageDetails":{"locationData":{"latitude":"","longitude":"","elevation":"","speed":"","heading":""},"rxSource":"RV"},"payloadType":"us.dot.its.jpo.ode.model.OdeBsmPayload","serialId":{"streamId":"","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","sanitized":false,"odePacketID":"","odeTimStartDateTime":"","originIp":"10.11.81.28"},"payload":{"data":{"coreData":{"msgCnt":56,"id":"@TEMP_ID@","secMark":"@MILLI_OF_MINUTE@","position":{"latitude":39.644797,"longitude":-105.0816018,"elevation":0},"accelSet":{"accelLong":0,"accelYaw":0},"accuracy":{"semiMajor":0,"semiMinor":0,"orientation":0},"transmission":"UNAVAILABLE","speed":22.42,"heading":180.5,"brakes":{"wheelBrakes":{"leftFront":false,"rightFront":false,"unavailable":true,"leftRear":false,"rightRear":false},"traction":"unavailable","abs":"off","scs":"unavailable","brakeBoost":"unavailable","auxBrakes":"unavailable"},"size":{"width":0,"length":0}},"partII":[{"id":"VehicleSafetyExtensions","value":{"pathHistory":{"crumbData":[]},"pathPrediction":{"confidence":0,"radiusOfCurve":0}}}]},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}}
+BSM,3000,{"metadata":{"bsmSource":"RV","logFileName":"","recordType":"bsmTx","securityResultCode":"success","receivedMessageDetails":{"locationData":{"latitude":"","longitude":"","elevation":"","speed":"","heading":""},"rxSource":"RV"},"payloadType":"us.dot.its.jpo.ode.model.OdeBsmPayload","serialId":{"streamId":"","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","sanitized":false,"odePacketID":"","odeTimStartDateTime":"","originIp":"10.11.81.28"},"payload":{"data":{"coreData":{"msgCnt":57,"id":"@TEMP_ID@","secMark":"@MILLI_OF_MINUTE@","position":{"latitude":39.644797,"longitude":-105.0816018,"elevation":0},"accelSet":{"accelLong":0,"accelYaw":0},"accuracy":{"semiMajor":0,"semiMinor":0,"orientation":0},"transmission":"UNAVAILABLE","speed":22.42,"heading":180.5,"brakes":{"wheelBrakes":{"leftFront":false,"rightFront":false,"unavailable":true,"leftRear":false,"rightRear":false},"traction":"unavailable","abs":"off","scs":"unavailable","brakeBoost":"unavailable","auxBrakes":"unavailable"},"size":{"width":0,"length":0}},"partII":[{"id":"VehicleSafetyExtensions","value":{"pathHistory":{"crumbData":[]},"pathPrediction":{"confidence":0,"radiusOfCurve":0}}}]},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}}
+BSM,4000,{"metadata":{"bsmSource":"RV","logFileName":"","recordType":"bsmTx","securityResultCode":"success","receivedMessageDetails":{"locationData":{"latitude":"","longitude":"","elevation":"","speed":"","heading":""},"rxSource":"RV"},"payloadType":"us.dot.its.jpo.ode.model.OdeBsmPayload","serialId":{"streamId":"","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","sanitized":false,"odePacketID":"","odeTimStartDateTime":"","originIp":"10.11.81.28"},"payload":{"data":{"coreData":{"msgCnt":58,"id":"@TEMP_ID@","secMark":"@MILLI_OF_MINUTE@","position":{"latitude":39.644797,"longitude":-105.0816018,"elevation":0},"accelSet":{"accelLong":0,"accelYaw":0},"accuracy":{"semiMajor":0,"semiMinor":0,"orientation":0},"transmission":"UNAVAILABLE","speed":22.42,"heading":190.5,"brakes":{"wheelBrakes":{"leftFront":false,"rightFront":false,"unavailable":true,"leftRear":false,"rightRear":false},"traction":"unavailable","abs":"off","scs":"unavailable","brakeBoost":"unavailable","auxBrakes":"unavailable"},"size":{"width":0,"length":0}},"partII":[{"id":"VehicleSafetyExtensions","value":{"pathHistory":{"crumbData":[]},"pathPrediction":{"confidence":0,"radiusOfCurve":0}}}]},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}}
+BSM,5000,{"metadata":{"bsmSource":"RV","logFileName":"","recordType":"bsmTx","securityResultCode":"success","receivedMessageDetails":{"locationData":{"latitude":"","longitude":"","elevation":"","speed":"","heading":""},"rxSource":"RV"},"payloadType":"us.dot.its.jpo.ode.model.OdeBsmPayload","serialId":{"streamId":"","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","sanitized":false,"odePacketID":"","odeTimStartDateTime":"","originIp":"10.11.81.28"},"payload":{"data":{"coreData":{"msgCnt":59,"id":"@TEMP_ID@","secMark":"@MILLI_OF_MINUTE@","position":{"latitude":39.644797,"longitude":-105.0816018,"elevation":0},"accelSet":{"accelLong":0,"accelYaw":0},"accuracy":{"semiMajor":0,"semiMinor":0,"orientation":0},"transmission":"UNAVAILABLE","speed":22.42,"heading":190.5,"brakes":{"wheelBrakes":{"leftFront":false,"rightFront":false,"unavailable":true,"leftRear":false,"rightRear":false},"traction":"unavailable","abs":"on","scs":"unavailable","brakeBoost":"unavailable","auxBrakes":"unavailable"},"size":{"width":0,"length":0}},"partII":[{"id":"VehicleSafetyExtensions","value":{"pathHistory":{"crumbData":[]},"pathPrediction":{"confidence":0,"radiusOfCurve":0}}}]},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}}
+BSM,6000,{"metadata":{"bsmSource":"RV","logFileName":"","recordType":"bsmTx","securityResultCode":"success","receivedMessageDetails":{"locationData":{"latitude":"","longitude":"","elevation":"","speed":"","heading":""},"rxSource":"RV"},"payloadType":"us.dot.its.jpo.ode.model.OdeBsmPayload","serialId":{"streamId":"","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":7,"maxDurationTime":0,"recordGeneratedAt":"","sanitized":false,"odePacketID":"","odeTimStartDateTime":"","originIp":"10.11.81.28"},"payload":{"data":{"coreData":{"msgCnt":59,"id":"@TEMP_ID@","secMark":"@MILLI_OF_MINUTE@","position":{"latitude":39.644797,"longitude":-105.0816018,"elevation":0},"accelSet":{"accelLong":0,"accelYaw":0},"accuracy":{"semiMajor":0,"semiMinor":0,"orientation":0},"transmission":"UNAVAILABLE","speed":22.42,"heading":190.5,"brakes":{"wheelBrakes":{"leftFront":false,"rightFront":false,"unavailable":true,"leftRear":false,"rightRear":false},"traction":"unavailable","abs":"on","scs":"unavailable","brakeBoost":"unavailable","auxBrakes":"unavailable"},"size":{"width":0,"length":0}},"partII":[{"id":"VehicleSafetyExtensions","value":{"pathHistory":{"crumbData":[]},"pathPrediction":{"confidence":0,"radiusOfCurve":0}}}]},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}}

jpo-conflictmonitor/src/main/java/us/dot/its/jpo/conflictmonitor/ConflictMonitorProperties.java

@@ -59,6 +59,12 @@
 import us.dot.its.jpo.conflictmonitor.monitor.algorithms.message_ingest.MessageIngestParameters;
 import us.dot.its.jpo.conflictmonitor.monitor.algorithms.repartition.RepartitionAlgorithmFactory;
 import us.dot.its.jpo.conflictmonitor.monitor.algorithms.repartition.RepartitionParameters;
+import us.dot.its.jpo.conflictmonitor.monitor.algorithms.map_revision_counter.MapRevisionCounterAlgorithmFactory;
+import us.dot.its.jpo.conflictmonitor.monitor.algorithms.map_revision_counter.MapRevisionCounterParameters;
+import us.dot.its.jpo.conflictmonitor.monitor.algorithms.spat_revision_counter.SpatRevisionCounterAlgorithmFactory;
+import us.dot.its.jpo.conflictmonitor.monitor.algorithms.spat_revision_counter.SpatRevisionCounterParameters;
+import us.dot.its.jpo.conflictmonitor.monitor.algorithms.bsm_revision_counter.BsmRevisionCounterAlgorithmFactory;
+import us.dot.its.jpo.conflictmonitor.monitor.algorithms.bsm_revision_counter.BsmRevisionCounterParameters;
 import us.dot.its.jpo.conflictmonitor.monitor.algorithms.stop_line_passage.StopLinePassageAlgorithmFactory;
 import us.dot.its.jpo.conflictmonitor.monitor.algorithms.stop_line_passage.StopLinePassageParameters;
 import us.dot.its.jpo.conflictmonitor.monitor.algorithms.stop_line_passage_assessment.StopLinePassageAssessmentAlgorithmFactory;
@@ -147,6 +153,18 @@ public class ConflictMonitorProperties implements EnvironmentAware  {
    private String repartitionAlgorithm;
    private RepartitionParameters repartitionAlgorithmParameters;
 
+   private MapRevisionCounterAlgorithmFactory mapRevisionCounterAlgorithmFactory;
+   private String mapRevisionCounterAlgorithm;
+   private MapRevisionCounterParameters mapRevisionCounterAlgorithmParameters;
+
+   private SpatRevisionCounterAlgorithmFactory spatRevisionCounterAlgorithmFactory;
+   private String spatRevisionCounterAlgorithm;
+   private SpatRevisionCounterParameters spatRevisionCounterAlgorithmParameters;
+
+   private BsmRevisionCounterAlgorithmFactory bsmRevisionCounterAlgorithmFactory;
+   private String bsmRevisionCounterAlgorithm;
+   private BsmRevisionCounterParameters bsmRevisionCounterAlgorithmParameters;
+
    private NotificationAlgorithmFactory notificationAlgorithmFactory;
    private String notificationAlgorithm;
    private NotificationParameters notificationAlgorithmParameters;
@@ -492,6 +510,56 @@ public void setRepartitionAlgorithmParameters(RepartitionParameters repartitionA
       this.repartitionAlgorithmParameters = repartitionAlgorithmParameters;
    }
 
+
+   @Autowired
+   public void setMapRevisionCounterAlgorithmFactory(MapRevisionCounterAlgorithmFactory mapRevisionCounterAlgorithmFactory) {
+      this.mapRevisionCounterAlgorithmFactory = mapRevisionCounterAlgorithmFactory;
+   }
+
+   @Value("${map.revision.counter.algorithm}")
+   public void setMapRevisionCorrectionAlgorithm(String mapRevisionCounterAlgorithm) {
+      this.mapRevisionCounterAlgorithm = mapRevisionCounterAlgorithm;
+   }
+
+   @Autowired
+   public void setMapRevisionCounterAlgorithmParameters(MapRevisionCounterParameters mapRevisionCounterAlgorithmParameters) {
+      this.mapRevisionCounterAlgorithmParameters = mapRevisionCounterAlgorithmParameters;
+   }
+
+
+
+   @Autowired
+   public void setSpatRevisionCounterAlgorithmFactory(SpatRevisionCounterAlgorithmFactory spatRevisionCounterAlgorithmFactory) {
+      this.spatRevisionCounterAlgorithmFactory = spatRevisionCounterAlgorithmFactory;
+   }
+
+   @Value("${spat.revision.counter.algorithm}")
+   public void setSpatRevisionCorrectionAlgorithm(String spatRevisionCounterAlgorithm) {
+      this.spatRevisionCounterAlgorithm = spatRevisionCounterAlgorithm;
+   }
+
+   @Autowired
+   public void setSpatRevisionCounterAlgorithmParameters(SpatRevisionCounterParameters spatRevisionCounterAlgorithmParameters) {
+      this.spatRevisionCounterAlgorithmParameters = spatRevisionCounterAlgorithmParameters;
+   }
+
+
+   @Autowired
+   public void setBsmRevisionCounterAlgorithmFactory(BsmRevisionCounterAlgorithmFactory bsmRevisionCounterAlgorithmFactory) {
+      this.bsmRevisionCounterAlgorithmFactory = bsmRevisionCounterAlgorithmFactory;
+   }
+
+   @Value("${bsm.revision.counter.algorithm}")
+   public void setBsmRevisionCorrectionAlgorithm(String bsmRevisionCounterAlgorithm) {
+      this.bsmRevisionCounterAlgorithm = bsmRevisionCounterAlgorithm;
+   }
+
+   @Autowired
+   public void setBsmRevisionCounterAlgorithmParameters(BsmRevisionCounterParameters bsmRevisionCounterAlgorithmParameters) {
+      this.bsmRevisionCounterAlgorithmParameters = bsmRevisionCounterAlgorithmParameters;
+   }
+
+
    public NotificationAlgorithmFactory getNotificationAlgorithmFactory() {
       return notificationAlgorithmFactory;
    }