V2xrelease 6.2 (#283)

* Creating smaller deployment image

Lightweight Docker Container

Remove mysql calls

Issue-255: Create lightweight docker image

+ added .dockerignore and modified dockerfile

Issue-255: Dockerfile-dev

Issue-255: CircleCI arm lightweight build

* Issue-255: Added +x permissions to container scripts

* Issue-255: Remove unnecessary checkoutstep

* Issue-255: Rm git files from dockerignore.

* Issue-255: Remove git files from build context

+ Remove checkout step from CircleCI sonar-scanner workflow

* Issue-255:Rename dockerfile

* Issue-255:SonarScanner needs git files

* Issue-255:Dockerfile WRKDIR necessary for run script

* Issue-257:Fix logging

* Preemption sonar issues (#260)

* init

* init

* test

* update

* update

* update

* update

* update

* update

* update

* update

* merge Master to develop for hotfix6.1 (#266)

* Merge develop to release6.1 (#259)

* Creating smaller deployment image

Lightweight Docker Container

Remove mysql calls

Issue-255: Create lightweight docker image

+ added .dockerignore and modified dockerfile

Issue-255: Dockerfile-dev

Issue-255: CircleCI arm lightweight build

* Issue-255: Added +x permissions to container scripts

* Issue-255: Remove unnecessary checkoutstep

* Issue-255: Rm git files from dockerignore.

* Issue-255: Remove git files from build context

+ Remove checkout step from CircleCI sonar-scanner workflow

* Issue-255:Rename dockerfile

* Issue-255:SonarScanner needs git files

* Issue-255:Dockerfile WRKDIR necessary for run script

* Issue-257:Fix logging

Co-authored-by: Paul K Bourelly <paul.k.bourelly@leidos.com>

* Update Release_notes.md

Co-authored-by: dan-du-car <62157949+dan-du-car@users.noreply.github.com>
Co-authored-by: Paul K Bourelly <paul.k.bourelly@leidos.com>

* Merge Carma freight to release branch for 6.2 hotfix (#275)

* Issue-179: MobilityOperation plugin msg parse and parse

MobilityOperation Plugin consumes port_drayage messages and
queries PORT_DRAYAGE mysql DB for next action. Then forwards
this message using the DSRCMessageManager plugin

Issue-179:Docker-compose load port_drayage db

Issue-179:Const string strategy

Issue-179:DB name config and const string for Strat

Issue-179: Fix long/lat to ints, fixed outgoing json

* CF-143: Update Message schema, tables and logic

CF-143 In progress

CF-143: save point

Save point fixed port_drayage.sql

CF-143: Edited database tables and added new action with destination

CF-143: Fixed and clean logic for new message schema

CF-143: PR comments addressed

* CF-189:Integration testing updates

* Change MobilityOperationPlugin to CARMAFreightPlugin

Updated localhost.sql files with new plugin name

Edited header to remove mobilityoperationplugin name

* Rename to PortDrayagePlugin

+ Fix segfault with not found actions
+ Fix CMakefile
+ Fix sql file to only include necessary information

Added Dockerfile

Fix retrieve action variable names and added if

statment back

* Rebase on develop fixes

* Adding PortDrayage Webservice Maven Springboot proj

* Save point

* Save Point

* Save Point

* UI updates included TODO Better code commenting

* Remove PortDrayage WebService Client code.

* Remove PDClient build from dockerfile

* Added PR Comments

+ Updates openapi endpoint description
+ Added checks for duplicate request to REST controllers
+ fixed HTML table column name
+ Comments for application.properties
+ updated docker-compose
+ More unit test coverage

* Save Point

* Initial Testing attempt

* Onsite fixes plus logging for holding action insert

* Updated lightweight dockerfile

* Fix for holding confirmation

* Logging fix

* Rebase and PR prep

* PR prep and cleanup

* PR Comments

+ Added do while loops
+ Created global pointer for WebserviceClient

* PR build issue fixes

+ Dowhile fix
+ qapplication fix

* PR bug fixes

+ Using WebServiceClient pointer
+ Using local variables for REST response
+ Remove getter methods for client
+ Boolean flag for retry with bad responses

* Added PortDrayagePlugin to sonar-scanner.properties

Co-authored-by: Paul K Bourelly <paul.k.bourelly@leidos.com>
Co-authored-by: dan-du-car <62157949+dan-du-car@users.noreply.github.com>

* Release Candidate fixes

* Fixed Logging for V2X-Hub

* Sonar Scanner issue fixes

+ Using auto instead of data type
+ Using const reference instead of copy by value
+ Consolidating logging to reduce Cognitive Complexity

* Sonar Scanner issue fixes

+ Consolidate log statements for Cognitive Complexity
+ Use const reference instead of copy by value for std::string
+ exit(1) to indicate error
+ added this to connect calls
+ Fix possible memory leak in PortDrayagePlugin
HandleMobilityOperationMessage

* Added fix for inspection/unloading post

* Removed TODO and additional logging to decrease cognitive complexity

* PR Improvements

+ Added Operation Enum and method to translate to string
+ Added constants for default constructor for WebServiceClient
+ Added comments for Class definitions and Header comm

* 279 integrate port drayage webservice ci cd (#281)

* Issue-279: Added Port Drayage Webservice to CI/CD

+ Added Dockerfile to create Port Drayage Webservice image
+ Added circleci workflow to build Port Drayage Webservice and push
image

* Issue-279: Fixed CircleCI and Docker-compose

+ Added Port Drayage Web Service to docker-compose
+ Fixed docker build in circle ci for Port Drayage Web Service

* Issue-279: Fixed CircleCI base image for

Port Drayage maven build

* Issue-279: CircleCI Docker build fix

* Issue-279: CircleCI fix

* Issue-279:CircleCI Fix

* Issue-279: Running Docker daemon in CircleCI

* Issue-279: Sudo for starting daemon

* Issue-279: Remote Docker setup

* Issue-279:Correct circleCI script format

* Issue-279: CircleCI navigate to correct directory

* Issue-279: Release Updates

+ Updated default and starting config for DRSCImmediateForwardPlugin
to include mobility operation message by default.
+ Added sql files for verification test at suntrax

* Added button to clear all actions in web-service (#282)

+ This allows repeated demonstrations of one set of actions
with given actions IDs with requiring web-service restart.

Co-authored-by: Paul K Bourelly <paul.k.bourelly@leidos.com>
Co-authored-by: dan-du-car <62157949+dan-du-car@users.noreply.github.com>
Co-authored-by: Sudhakar Nallamothu <sknallamothu@gmail.com>
Co-authored-by: paulbourelly999 <77466294+paulbourelly999@users.noreply.github.com>

.circleci/config.yml

@@ -189,6 +189,49 @@ jobs:
         command: |
           echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
           docker push usdotfhwaops/v2xhubarm:latest
+  port_drayage_webservice_build_develop :
+    docker:
+      - image: cimg/openjdk:11.0.12
+    # Set working directory
+    working_directory: "/home/V2X-Hub"
+    steps:
+     - setup_remote_docker
+     - checkout
+     - run: 
+        name: Maven Build JAR
+        # Build Port Drayage Web Service
+        command: |
+          cd tools/port-drayage-webservice/
+          mvn clean install  
+     - run: 
+        name: Build Docker Image and Push
+        # Build and push Port Drayage Web Service Docker images
+        command: | 
+          cd tools/port-drayage-webservice/
+          docker build -t usdotfhwaops/port-drayage-webservice:latest .
+          echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
+          docker push usdotfhwaops/port-drayage-webservice:latest
+  port_drayage_webservice_build :
+    docker:
+      - image: cimg/openjdk:11.0.12
+    # Set working directory
+    steps:
+     - setup_remote_docker
+     - checkout
+     - run: 
+        name: Maven Build JAR
+        # Build Port Drayage Web Service
+        command: |
+          cd tools/port-drayage-webservice/
+          mvn clean install  
+     - run: 
+        name: Build Docker Image and Push
+        # Build and push Port Drayage Web Service Docker images
+        command: | 
+          cd tools/port-drayage-webservice/
+          docker build -t usdotfhwaops/port-drayage-webservice:${CIRCLE_BRANCH,,} .
+          echo "$DOCKERHUB_PASSWORD" | docker login --username $DOCKERHUB_USERNAME --password-stdin
+          docker push usdotfhwaops/port-drayage-webservice:${CIRCLE_BRANCH,,}
 workflows:
   version: 2
   build:
@@ -215,5 +258,13 @@ workflows:
       - sonar-scanner_develop:
           requires:
             - docker_build_push_develop
+      - port_drayage_webservice_build_develop:
+          filters:
+              branches:
+                only: develop
+      - port_drayage_webservice_build:
+          filters:
+            branches:
+              ignore: develop
 
 

.gitignore

@@ -76,4 +76,10 @@ Thumbs.db
 *.app
 
 #docker-compose variables
-.env
+.env
+
+#Maven build directory
+tools/port-drayage-webservice/target/
+
+#Java PKS for HTTPS setup
+tools/port-drayage-webservice/src/main/resources/tutorial.jks

.sonarqube/sonar-scanner.properties

@@ -47,7 +47,7 @@ sonar.modules=  PedestrianPlugin, \
   TmxTools, \
   MessageLoggerPlugin, \
   CommandPlugin, \
-  MobilityOperationPlugin, \
+  PortDrayagePlugin, \
   ODELoggerPlugin, \
   DsrcImmediateForwardPlugin, \
   MessageReceiverPlugin
@@ -61,7 +61,7 @@ TmxUtils.sonar.projectBaseDir                   =/home/V2X-Hub/src/tmx/TmxUtils
 CARMACloudPlugin.sonar.projectBaseDir		=/home/V2X-Hub/src/v2i-hub/CARMACloudPlugin
 CommandPlugin.sonar.projectBaseDir		=/home/V2X-Hub/src/v2i-hub/CommandPlugin
 CswPlugin.sonar.projectBaseDir			=/home/V2X-Hub/src/v2i-hub/CswPlugin
-MobilityOperationPlugin.sonar.projectBaseDir	=/home/V2X-Hub/src/v2i-hub/MobilityOperationPlugin
+PortDrayagePlugin.sonar.projectBaseDir	        =/home/V2X-Hub/src/v2i-hub/PortDrayagePlugin
 ODELoggerPlugin.sonar.projectBaseDir		=/home/V2X-Hub/src/v2i-hub/ODELoggerPlugin
 MessageLoggerPlugin.sonar.projectBaseDir            =/home/V2X-Hub/src/v2i-hub/MessageLoggerPlugin
 DmsPlugin.sonar.projectBaseDir                  =/home/V2X-Hub/src/v2i-hub/DmsPlugin
@@ -85,6 +85,7 @@ TmxTools.sonar.sources                    =src
 TmxUtils.sonar.sources                    =src
 MessageLoggerPlugin.sonar.sources             =src
 CswPlugin.sonar.sources                   =src
+PortDrayagePlugin.sonar.sources           =src
 DmsPlugin.sonar.sources                   =src
 DsrcImmediateForwardPlugin.sonar.sources  =src
 LocationPlugin.sonar.sources              =src
@@ -113,6 +114,7 @@ MobilityOperationPlugin.sonar.sources	  =src
 TmxUtils.sonar.cfamily.gcov.reportsPath                   =coverage
 #MessageLoggerPlugin.sonar.cfamily.gcov.reportsPath            =coverage
 #CswPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
+#PortDrayagePlugin.sonar.cfamily.gcov.reportsPath          =coverage
 #DmsPlugin.sonar.cfamily.gcov.reportsPath                  =coverage
 #DsrcImmediateForwardPlugin.sonar.cfamily.gcov.reportsPath =coverage
 #LocationPlugin.sonar.cfamily.gcov.reportsPath             =coverage
@@ -138,6 +140,7 @@ TmxUtils.sonar.tests=test
 #TmxTools.sonar.tests=test
 #MessageLoggerPlugin.sonar.tests=test
 #CswPlugin.sonar.tests=test
+#PortDrayagePlugin.sonar.tests=test
 #DmsPlugin.sonar.tests=test
 #DsrcImmediateForwardPlugin.sonar.tests=test
 #LocationPlugin.sonar.tests=test

Dockerfile

@@ -60,6 +60,11 @@ RUN make install
 WORKDIR /home/V2X-Hub/ext/ccserver
 RUN cmake . 
 RUN make
+RUN make install
+
+WORKDIR /home/V2X-Hub/ext/pdclient
+RUN cmake .
+RUN make
 RUN make install 
 
 ### setup and install v2x-hub core and plugins 
@@ -101,8 +106,8 @@ RUN ln -s ../bin TimPlugin/bin
 RUN zip TimPlugin.zip TimPlugin/bin/TimPlugin TimPlugin/manifest.json
 RUN ln -s ../bin CARMACloudPlugin/bin
 RUN zip CARMACloudPlugin.zip CARMACloudPlugin/bin/CARMACloudPlugin CARMACloudPlugin/manifest.json
-RUN ln -s ../bin MobilityOperationPlugin/bin
-RUN zip MobilityOperationPlugin.zip MobilityOperationPlugin/bin/MobilityOperationPlugin MobilityOperationPlugin/manifest.json
+RUN ln -s ../bin PortDrayagePlugin/bin
+RUN zip PortDrayagePlugin.zip PortDrayagePlugin/bin/PortDrayagePlugin PortDrayagePlugin/manifest.json
 RUN ln -s ../bin ODELoggerPlugin/bin
 RUN zip ODELoggerPlugin.zip ODELoggerPlugin/bin/ODELoggerPlugin ODELoggerPlugin/manifest.json
 

configuration/amd64/docker-compose.yml

@@ -16,6 +16,7 @@ services:
       - mysql_root_password
     volumes:
       - ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
+      - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
 
   php:
     image: usdotfhwaops/php:latest
@@ -27,7 +28,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubamd:latest
+    image: usdotfhwaops/v2xhubamd:v2xrelease_6.2
     container_name: v2xhub
     network_mode: host
     restart: always
@@ -40,6 +41,10 @@ services:
     volumes:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
+  port_drayage_webservice:
+    image: usdotfhwaops/port-drayage-webservice:v2xrelease_6.2
+    container_name: port_drayage_webservice
+    network_mode: host
 secrets:
     mysql_password:
         file: ./secrets/mysql_password.txt

configuration/amd64/mysql/port_drayage.sql

@@ -0,0 +1,91 @@
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
+--
+-- Host: 127.0.0.1    Database: PORT_DRAYAGE
+-- ------------------------------------------------------
+-- Server version	5.7.35
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Current Database: `PORT_DRAYAGE`
+--
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `PORT_DRAYAGE`;
+
+--
+-- Table structure for table `first_action`
+--
+
+DROP TABLE IF EXISTS `first_action`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `first_action` (
+  `cmv_id` varchar(20) NOT NULL,
+  `cargo_id` varchar(20) DEFAULT NULL,
+  `destination_lat` decimal(9,7) NOT NULL,
+  `destination_long` decimal(9,7) NOT NULL,
+  `operation` varchar(20) NOT NULL,
+  `action_id` varchar(36) NOT NULL,
+  `next_action` varchar(36) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `first_action`
+--
+
+LOCK TABLES `first_action` WRITE;
+/*!40000 ALTER TABLE `first_action` DISABLE KEYS */;
+INSERT INTO `first_action` VALUES ("123",'SOME_CARGO',38.9548890,-77.1481430,'PICKUP','4bea1c45-e421-11eb-a8cc-000c29ae389d','32320c8a-e422-11eb-a8cc-000c29ae389d');
+/*!40000 ALTER TABLE `first_action` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `freight`
+--
+
+DROP TABLE IF EXISTS `freight`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `freight` (
+  `cmv_id` varchar(20) NOT NULL,
+  `cargo_id` varchar(20) DEFAULT NULL,
+  `destination_lat` decimal(9,7) NOT NULL,
+  `destination_long` decimal(9,7) NOT NULL,
+  `operation` varchar(20) NOT NULL,
+  `action_id` varchar(36) NOT NULL,
+  `next_action` varchar(36) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `freight`
+--
+
+LOCK TABLES `freight` WRITE;
+/*!40000 ALTER TABLE `freight` DISABLE KEYS */;
+INSERT INTO `freight` VALUES ("123",NULL,38.9549780,-77.1475790,'EXIT_STAGING_AREA','32320c8a-e422-11eb-a8cc-000c29ae389d','4ace39e6-ee36-11eb-9a03-0242ac130003'),("123",'SOME_CARGO',38.9548890,-77.1481430,'PICKUP','4bea1c45-e421-11eb-a8cc-000c29ae389d','32320c8a-e422-11eb-a8cc-000c29ae389d');
+/*!40000 ALTER TABLE `freight` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2021-07-21 11:42:55

configuration/amd64/mysql/suntrax/port_area_operations.sql

@@ -0,0 +1,90 @@
+-- MySQL dump 10.13  Distrib 5.7.36, for Linux (x86_64)
+--
+-- Host: 127.0.0.1    Database: PORT_DRAYAGE
+-- ------------------------------------------------------
+-- Server version	5.7.36
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Current Database: `PORT_DRAYAGE`
+--
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `PORT_DRAYAGE` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `PORT_DRAYAGE`;
+
+--
+-- Table structure for table `first_action`
+--
+
+DROP TABLE IF EXISTS `first_action`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `first_action` (
+  `cmv_id` varchar(20) NOT NULL,
+  `cargo_id` varchar(20) DEFAULT NULL,
+  `destination_lat` decimal(9,7) NOT NULL,
+  `destination_long` decimal(9,7) NOT NULL,
+  `operation` varchar(20) NOT NULL,
+  `action_id` varchar(36) NOT NULL,
+  `next_action` varchar(36) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `first_action`
+--
+
+LOCK TABLES `first_action` WRITE;
+/*!40000 ALTER TABLE `first_action` DISABLE KEYS */;
+/*!40000 ALTER TABLE `first_action` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `freight`
+--
+
+DROP TABLE IF EXISTS `freight`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `freight` (
+  `cmv_id` varchar(20) NOT NULL,
+  `cargo_id` varchar(20) DEFAULT NULL,
+  `destination_lat` decimal(9,7) NOT NULL,
+  `destination_long` decimal(9,7) NOT NULL,
+  `operation` varchar(20) NOT NULL,
+  `action_id` varchar(36) NOT NULL,
+  `next_action` varchar(36) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `freight`
+--
+
+LOCK TABLES `freight` WRITE;
+/*!40000 ALTER TABLE `freight` DISABLE KEYS */;
+INSERT INTO `freight` VALUES ('DOT-80550',NULL,28.1128156,-81.8314745,'ENTER_PORT','4ace39e6-ee36-11eb-9a03-0242ac130003','67eadd3a-38b4-11ec-930a-000145098e4f'),('DOT-80550','CARGO_A',28.1119763,-81.8312035,'DROPOFF','67eadd3a-38b4-11ec-930a-000145098e4f','0bf7ebda-38b5-11ec-930a-000145098e4f'),('DOT-80550','CARGO_B',28.1117373,-81.8309654,'PICKUP','0bf7ebda-38b5-11ec-930a-000145098e4f','9230504d-38b5-11ec-930a-000145098e4f'),('DOT-80550','CARGO_B',28.1120500,-81.8306483,'PORT_CHECKPOINT','9230504d-38b5-11ec-930a-000145098e4f','511ad052-38b6-11ec-930a-000145098e4f'),('DOT-80550','CARGO_B',28.1138052,-81.8317502,'EXIT_PORT','511ad052-38b6-11ec-930a-000145098e4f','fc15d52a-3c0c-11ec-b00d-000145098e4f'),('DOT-80550','CARGO_B',28.1232336,-81.8347566,'ENTER_STAGING_AREA','fc15d52a-3c0c-11ec-b00d-000145098e4f','5ceaab82-515c-11ec-9e2c-000145098e47'),('DOT-10004',NULL,28.1128156,-81.8314745,'ENTER_PORT','84f6b797-52c2-11ec-9105-000145098e4f','c9bba171-52c2-11ec-9105-000145098e4f'),('DOT-10004','CARGO_A',28.1119763,-81.8312035,'DROPOFF','c9bba171-52c2-11ec-9105-000145098e4f','8e1d456a-52c3-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1117373,-81.8309654,'PICKUP','8e1d456a-52c3-11ec-9105-000145098e4f','744be658-52c4-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1120500,-81.8306483,'PORT_CHECKPOINT','744be658-52c4-11ec-9105-000145098e4f','a4b419b9-52c5-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1138052,-81.8317502,'EXIT_PORT','a4b419b9-52c5-11ec-9105-000145098e4f','20b546e3-52c6-11ec-9105-000145098e4f'),('DOT-10004','CARGO_B',28.1232336,-81.8347566,'ENTER_STAGING_AREA','20b546e3-52c6-11ec-9105-000145098e4f','53875eba-52c7-11ec-9105-000145098e4f');
+/*!40000 ALTER TABLE `freight` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2021-12-03 11:03:12