Skip to content

Commit c498442

Browse files
committed
Merge branch 'release/2025-q1' of github.com:usdot-jpo-ode/jpo-conflictmonitor into release/2025-q1
2 parents baa7f7e + 453d28c commit c498442

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

jpo-conflictmonitor/scripts/IntegrationTestScripts/MAP_MinData-valid.csv

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SPAT,41,{"metadata":{"logFileName":"","recordType":"spatTx","securityResultCode":"success","receivedMessageDetails":{"locationData":null,"rxSource":"NA"},"encodings":null,"payloadType":"us.dot.its.jpo.ode.model.OdeSpatPayload","serialId":{"streamId":"24d9dfcb-1ca0-41b8-8576-f4a00a51218e","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","recordGeneratedBy":null,"sanitized":false,"odePacketID":"","odeTimStartDateTime":"","spatSource":"V2X","originIp":"10.11.81.12","isCertPresent":false},"payload":{"data":{"timeStamp":"@MINUTE_OF_YEAR@","name":null,"intersectionStateList":{"intersectionStatelist":[{"name":null,"id":{"region":99,"id":12109},"revision":0,"status":{"failureFlash":false,"noValidSPATisAvailableAtThisTime":false,"fixedTimeOperation":false,"standbyOperation":false,"trafficDependentOperation":false,"manualControlIsEnabled":false,"off":false,"stopTimeIsActivated":false,"recentChangeInMAPassignedLanesIDsUsed":false,"recentMAPmessageUpdate":false,"failureMode":false,"noValidMAPisAvailableAtThisTime":false,"signalPriorityIsActive":false,"preemptIsActive":false},"moy":"@MINUTE_OF_YEAR@","timeStamp":"@MILLI_OF_MINUTE@","enabledLanes":null,"states":{"movementList":[{"movementName":null,"signalGroup":2,"state_time_speed":{"movementEventList":[{"eventState":"PROTECTED_MOVEMENT_ALLOWED","timing":{"startTime":1870,"minEndTime":1870,"maxEndTime":1870,"likelyTime":null,"confidence":null,"nextTime":1870},"speeds":null}]},"maneuverAssistList":null},{"movementName":null,"signalGroup":4,"state_time_speed":{"movementEventList":[{"eventState":"STOP_AND_REMAIN","timing":{"startTime":1188,"minEndTime":1188,"maxEndTime":1188,"likelyTime":null,"confidence":null,"nextTime":1188},"speeds":null}]},"maneuverAssistList":null},{"movementName":null,"signalGroup":6,"state_time_speed":{"movementEventList":[{"eventState":"PROTECTED_MOVEMENT_ALLOWED","timing":{"startTime":1870,"minEndTime":1870,"maxEndTime":1870,"likelyTime":null,"confidence":null,"nextTime":1870},"speeds":null}]},"maneuverAssistList":null}]},"maneuverAssistList":null}]}},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735SPAT"}}
1+
SPAT,41,{"metadata":{"asn1":"001300","logFileName":"","recordType":"spatTx","securityResultCode":"success","receivedMessageDetails":{"locationData":null,"rxSource":"NA"},"encodings":null,"payloadType":"us.dot.its.jpo.ode.model.OdeSpatPayload","serialId":{"streamId":"24d9dfcb-1ca0-41b8-8576-f4a00a51218e","bundleSize":1,"bundleId":0,"recordId":0,"serialNumber":0},"odeReceivedAt":"@ISO_DATE_TIME@","schemaVersion":6,"maxDurationTime":0,"recordGeneratedAt":"","recordGeneratedBy":null,"sanitized":false,"odePacketID":"","odeTimStartDateTime":"","spatSource":"V2X","originIp":"10.11.81.12","isCertPresent":false},"payload":{"data":{"timeStamp":"@MINUTE_OF_YEAR@","name":null,"intersectionStateList":{"intersectionStatelist":[{"name":null,"id":{"region":99,"id":12109},"revision":0,"status":{"failureFlash":false,"noValidSPATisAvailableAtThisTime":false,"fixedTimeOperation":false,"standbyOperation":false,"trafficDependentOperation":false,"manualControlIsEnabled":false,"off":false,"stopTimeIsActivated":false,"recentChangeInMAPassignedLanesIDsUsed":false,"recentMAPmessageUpdate":false,"failureMode":false,"noValidMAPisAvailableAtThisTime":false,"signalPriorityIsActive":false,"preemptIsActive":false},"moy":"@MINUTE_OF_YEAR@","timeStamp":"@MILLI_OF_MINUTE@","enabledLanes":null,"states":{"movementList":[{"movementName":null,"signalGroup":2,"state_time_speed":{"movementEventList":[{"eventState":"PROTECTED_MOVEMENT_ALLOWED","timing":{"startTime":1870,"minEndTime":1870,"maxEndTime":1870,"likelyTime":null,"confidence":null,"nextTime":1870},"speeds":null}]},"maneuverAssistList":null},{"movementName":null,"signalGroup":4,"state_time_speed":{"movementEventList":[{"eventState":"STOP_AND_REMAIN","timing":{"startTime":1188,"minEndTime":1188,"maxEndTime":1188,"likelyTime":null,"confidence":null,"nextTime":1188},"speeds":null}]},"maneuverAssistList":null},{"movementName":null,"signalGroup":6,"state_time_speed":{"movementEventList":[{"eventState":"PROTECTED_MOVEMENT_ALLOWED","timing":{"startTime":1870,"minEndTime":1870,"maxEndTime":1870,"likelyTime":null,"confidence":null,"nextTime":1870},"speeds":null}]},"maneuverAssistList":null}]},"maneuverAssistList":null}]}},"dataType":"us.dot.its.jpo.ode.plugin.j2735.J2735SPAT"}}

jpo-conflictmonitor/src/main/resources/logback.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<!-- Uncomment to enable detailed debugging info for event aggregation -->
1616
<!--<logger name="us.dot.its.jpo.conflictmonitor.monitor.processors.aggregation" level="DEBUG"/>-->
1717

18+
<logger name="us.dot.its.jpo.conflictmonitor.monitor.topologies.validation" level="WARN"/>
19+
1820
<logger name="us.dot.its.jpo.conflictmonitor" level="INFO" />
1921

2022
<root level="ERROR">

0 commit comments

Comments
 (0)