Merge branch 'ode-787' into open-ode

# Conflicts: # .travis.yml # jpo-ode-plugins/pom.xml # jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/BsmPart2ContentBuilder.java # jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilder.java # jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/builders/VehicleSafetyExtensionsBuilder.java # jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/BsmPart2ContentBuilderTest.java # jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/SupplementalVehicleExtensionsBuilderTest.java # jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/TrailerHistoryPointBuilderTest.java # jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/VehicleSafetyExtensionsBuilderTest.java # jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/VelocityBuilderTest.java # jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/WeatherReportBuilderTest.java # jpo-ode-plugins/src/test/java/us/dot/its/jpo/ode/plugin/j2735/builders/WiperSetBuilderTest.java # jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/OdeProperties.java # jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/BsmDecoderHelper.java # jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/OdeBsmDataCreatorHelper.java # jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/coder/stream/JsonDecoderPublisher.java # jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/traveler/TimController.java # jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/bsm/BsmReceiver.java # jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/vsd/VsdReceiver.java # jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/coder/stream/JsonDecoderPublisherTest.java # jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/traveler/TimControllerTest.java # jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/udp/bsm/BsmReceiverTest.java
dan-du-car · Nov 28, 2018 · ee694fb · ee694fb
2 parents cd85b43 + 37e0ce7
commit ee694fb
Show file tree

Hide file tree

Showing 112 changed files with 4,221 additions and 1,103 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,7 @@
 ## ODE Release Notes ##
 -----------------------
+### November 2018
+- ODE-787 Publish J2735 version of Broadcast TIM in addition to the REST request version (see GitHub Issue #262). Please see https://github.com/usdot-jpo-ode/jpo-ode/wiki/Schema-Version-6-Change-Notice for details.
 ### Sprint 38
 - ODE-769 Initiated output schema change SOP. See https://github.com/usdot-jpo-ode/jpo-ode/wiki/SchemaVersion-5-Change-Notice for details
 - ODE-771 Fixed PPM crash bug

diff --git a/clean-build-and-deploy.cmd b/clean-build-and-deploy.cmd
@@ -1,5 +1,5 @@
 call docker-compose stop
 call docker-compose rm -f -v
-call mvn clean install
+call mvn clean install -DskipTests
 call docker-compose up --build -d
 call docker-compose ps
diff --git a/data/TIM_Message_Testing_Files/tim_geometry_multi_rsu_no_sdw.json b/data/TIM_Message_Testing_Files/tim_geometry_multi_rsu_no_sdw.json
@@ -0,0 +1,110 @@
+{
+ "request": {
+ "rsus": [
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.1",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "0",
+ "rsuTimeout": "2000"
+ },
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.2",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "1",
+ "rsuTimeout": "1000"
+ },
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.3",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "1",
+ "rsuTimeout": "1000"
+ }
+ ],
+ "snmp": {
+ "rsuid": "00000083",
+ "msgid": "31",
+ "mode": "1",
+ "channel": "178",
+ "interval": "2",
+ "deliverystart": "2017-06-01T17:47:11-05:00",
+ "deliverystop": "2018-01-01T17:47:11-05:15",
+ "enable": "1",
+ "status": "4"
+ }
+ },
+ "tim": {
+ "msgCnt": "13",
+ "timeStamp": "2017-03-13T01:07:11-05:00",
+ "packetID": "EC9C236B0000000000",
+ "urlB": "null",
+ "dataframes": [
+ {
+ "sspTimRights": "0",
+ "frameType": "advisory",
+ "msgId": {
+ "roadSignID": {
+ "position": {
+ "latitude": "41.678473",
+ "longitude": "-108.782775",
+ "elevation": "917.1432"
+ },
+ "viewAngle": "1010101010101010",
+ "mutcdCode": "warning",
+ "crc": "0000000000000000"
+ }
+ },
+ "startDateTime": "2017-12-01T17:47:11-05:00",
+ "durationTime": "22",
+ "priority": "0",
+ "sspLocationRights": "3",
+ "regions": [
+ {
+ "name": "bob",
+ "regulatorID": "23",
+ "segmentID": "33",
+ "anchorPosition": {
+ "latitude": "41.678473",
+ "longitude": "-108.782775",
+ "elevation": "917.1432"
+ },
+ "laneWidth": "7",
+ "directionality": "3",
+ "closedPath": "false",
+ "direction": "1010101010101010",
+ "description": "geometry",
+ "geometry": {
+ "direction": "1010101010101010",
+ "extent": "1",
+ "laneWidth": "33",
+ "circle": {
+ "position": {
+ "latitude": "41.678473",
+ "longitude": "-108.782775",
+ "elevation": "917.1432"
+ },
+ "radius": "15",
+ "units": "7"
+ }
+ }
+ }
+ ],
+ "sspMsgTypes": "2",
+ "sspMsgContent": "3",
+ "content": "Advisory",
+ "items": [
+ "125",
+ "some text",
+ "250",
+ "'98765"
+ ],
+ "url": "null"
+ }
+ ]
+ }
+}
diff --git a/data/TIM_Message_Testing_Files/tim_geometry_multi_rsu_sdw.json b/data/TIM_Message_Testing_Files/tim_geometry_multi_rsu_sdw.json
@@ -0,0 +1,118 @@
+{
+ "request": {
+ "rsus": [
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.1",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "0",
+ "rsuTimeout": "2000"
+ },
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.2",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "1",
+ "rsuTimeout": "1000"
+ },
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.3",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "1",
+ "rsuTimeout": "1000"
+ }
+ ],
+ "snmp": {
+ "rsuid": "00000083",
+ "msgid": "31",
+ "mode": "1",
+ "channel": "178",
+ "interval": "2",
+ "deliverystart": "2017-06-01T17:47:11-05:00",
+ "deliverystop": "2018-01-01T17:47:11-05:15",
+ "enable": "1",
+ "status": "4"
+ },
+ "sdw": {
+ "ttl": "oneweek",
+ "serviceRegion": {
+ "nwCorner": {
+ "latitude": "44.998459",
+ "longitude": "-111.040817"
+ },
+ "seCorner": {
+ "latitude": "41.104674",
+ "longitude": "-104.111312"
+ }
+ }
+ }
+ },
+ "tim": {
+ "msgCnt": "13",
+ "timeStamp": "2017-03-13T01:07:11-05:00",
+ "packetID": "EC9C236B0000000000",
+ "urlB": "null",
+ "dataframes": [
+ {
+ "sspTimRights": "0",
+ "frameType": "advisory",
+ "msgId": {
+ "roadSignID": {
+ "position": {
+ "latitude": "41.678473",
+ "longitude": "-108.782775",
+ "elevation": "917.1432"
+ },
+ "viewAngle": "1010101010101010",
+ "mutcdCode": "warning",
+ "crc": "0000000000000000"
+ }
+ },
+ "startDateTime": "2017-12-01T17:47:11-05:00",
+ "durationTime": "22",
+ "priority": "0",
+ "sspLocationRights": "3",
+ "regions": [
+ {
+ "name": "bob",
+ "regulatorID": "23",
+ "segmentID": "33",
+ "anchorPosition": {
+ "latitude": "41.678473",
+ "longitude": "-108.782775",
+ "elevation": "917.1432"
+ },
+ "laneWidth": "7",
+ "directionality": "3",
+ "closedPath": "false",
+ "direction": "1010101010101010",
+ "description": "geometry",
+ "geometry": {
+ "direction": "1010101010101010",
+ "extent": "1",
+ "laneWidth": "33",
+ "circle": {
+ "position": {
+ "latitude": "41.678473",
+ "longitude": "-108.782775",
+ "elevation": "917.1432"
+ },
+ "radius": "15",
+ "units": "7"
+ }
+ }
+ }
+ ],
+ "sspMsgTypes": "2",
+ "sspMsgContent": "3",
+ "content": "Advisory",
+ "items": ["125","some text", "250", "'98765"],
+ "url": "null"
+ }
+ ]
+ }
+}
diff --git a/data/TIM_Message_Testing_Files/tim_path_LL_single_rsu_no_sdw.json b/data/TIM_Message_Testing_Files/tim_path_LL_single_rsu_no_sdw.json
@@ -0,0 +1,107 @@
+{
+ "request": {
+ "rsus": [
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.1",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "0",
+ "rsuTimeout": "2000"
+ },
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.2",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "1",
+ "rsuTimeout": "1000"
+ },
+ {
+ "rsuIndex": "10",
+ "rsuTarget": "127.0.0.3",
+ "rsuUsername": "v3user",
+ "rsuPassword": "password",
+ "rsuRetries": "1",
+ "rsuTimeout": "1000"
+ }
+ ],
+ "snmp": {
+ "rsuid": "00000083",
+ "msgid": "31",
+ "mode": "1",
+ "channel": "178",
+ "interval": "2",
+ "deliverystart": "2017-06-01T17:47:11-05:00",
+ "deliverystop": "2018-01-01T17:47:11-05:15",
+ "enable": "1",
+ "status": "4"
+ }
+ },
+ "tim": {
+ "msgCnt": "1",
+ "timeStamp": "2017-08-03T22:25:36.297Z",
+ "urlB": "null",
+ "packetID": "EC9C236B0000000000",
+ "dataframes": [
+ {
+ "startDateTime": "2017-08-02T22:25:00.000Z",
+ "durationTime": 1,
+ "sspTimRights": "0",
+ "frameType": "advisory",
+ "msgId": {
+ "roadSignID": {
+ "position": {
+ "latitude": "41.678473",
+ "longitude": "-108.782775",
+ "elevation": "917.1432"
+ },
+ "viewAngle": "1010101010101010",
+ "mutcdCode": "warning",
+ "crc": "0000000000000000"
+ }
+ },
+ "priority": "0",
+ "sspLocationRights": "3",
+ "regions": [
+ {
+ "name": "Testing TIM",
+ "regulatorID": "0",
+ "segmentID": "33",
+ "anchorPosition": {
+ "latitude": "41.2500807",
+ "longitude": "-111.0093847",
+ "elevation": "2020.6969900289998"
+ },
+ "laneWidth": "7",
+ "directionality": "3",
+ "closedPath": "false",
+ "description": "path",
+ "path": {
+ "scale": "0",
+ "type": "ll",
+ "nodes": [
+ {
+ "nodeLong": "0.0030982",
+ "nodeLat": "0.0014562",
+ "delta": "node-LL3"
+ },
+ {
+ "nodeLong": "-111.0093847",
+ "nodeLat": "41.2500807",
+ "delta": "node-LatLon"
+ }
+ ]
+ },
+ "direction": "0000000000001010"
+ }
+ ],
+ "sspMsgTypes": "2",
+ "sspMsgContent": "3",
+ "content": "Advisory",
+ "items": ["125","some text", "250", "'98765"],
+ "url": "null"
+ }
+ ]
+ }
+}