Merge branch 'develop' of github.com:usdot-jpo-ode/jpo-conflictvisual…

…izer into decoder
CDOT-CV · May 30, 2024 · 5285a24 · 5285a24
2 parents fcf7a2c + 941a7f6
commit 5285a24
Show file tree

Hide file tree

Showing 36 changed files with 40 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -163,10 +163,9 @@ FROM amazoncorretto:21-al2023
 
 WORKDIR /home
 
-# Copy java executable
-COPY --from=jbuilder /home/jpo-conflictvisualizer-api/src/main/resources/application.yaml /home
-COPY --from=jbuilder /home/jpo-conflictvisualizer-api/src/main/resources/logback.xml /home
-COPY --from=jbuilder /home/jpo-conflictvisualizer-api/target/jpo-conflictvisualizer-api-0.0.1-SNAPSHOT.jar /home
+COPY --from=builder /home/jpo-conflictvisualizer-api/src/main/resources/application.yaml /home
+COPY --from=builder /home/jpo-conflictvisualizer-api/src/main/resources/logback.xml /home
+COPY --from=builder /home/jpo-conflictvisualizer-api/target/jpo-conflictvisualizer-api-1.3.0-SNAPSHOT.jar /home
 
 # # Copy asn1_codec executable and test files
 USER root

diff --git a/jpo-conflictmonitor b/jpo-conflictmonitor
diff --git a/jpo-conflictvisualizer-api/pom.xml b/jpo-conflictvisualizer-api/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>usdot.jpo.ode</groupId>
 	<artifactId>jpo-conflictvisualizer-api</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<name>jpo-conflictvisualizer-api</name>
 	<description>Conflict Visualizer</description>
 	<properties>
@@ -119,13 +119,13 @@
 		<dependency>
 			<groupId>usdot.jpo.ode</groupId>
 			<artifactId>jpo-geojsonconverter</artifactId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.3.0-SNAPSHOT</version>
 			<classifier>jpo-geojsonconverter</classifier>
 		</dependency>
 		<dependency>
 			<groupId>usdot.jpo.ode</groupId>
 			<artifactId>jpo-conflictmonitor</artifactId>
-			<version>1.2.0-SNAPSHOT</version>
+			<version>1.3.0-SNAPSHOT</version>
 			<classifier>jpo-conflictmonitor</classifier>
 		</dependency>
 		<dependency>

diff --git a/.../assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java b/.../assessments/ConnectionOfTravelAssessment/ConnectionOfTravelAssessmentRepositoryImpl.java
@@ -52,6 +52,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, ConnectionOfTravelAssessment.class, collectionName);
     }
 

diff --git a/...sments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java b/...sments/LaneDirectionOfTravelAssessment/LaneDirectionOfTravelAssessmentRepositoryImpl.java
@@ -55,6 +55,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, LaneDirectionOfTravelAssessment.class, collectionName);
     }
 

diff --git a/...api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java b/...api/accessors/assessments/SignalStateAssessment/StopLineStopAssessmentRepositoryImpl.java
@@ -52,6 +52,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, StopLineStopAssessment.class, collectionName);
     }
 

diff --git a/...sors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java b/...sors/assessments/SignalStateEventAssessment/SignalStateEventAssessmentRepositoryImpl.java
@@ -53,6 +53,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, StopLinePassageAssessment.class, collectionName);
     }
 

diff --git a/...izer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java b/...izer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/bsm/OdeBsmJsonRepositoryImpl.java
@@ -113,9 +113,9 @@ public long countOdeBsmDataGeo(String originIp, String vehicleId, Long startTime
         if(endTime != null){
             endTimeString = Instant.ofEpochMilli(endTime).toString();
         }
-	    query.limit(props.getMaximumResponseSize());
         query.addCriteria(Criteria.where("metadata.odeReceivedAt").gte(startTimeString).lte(endTimeString));
         query.fields().exclude("recordGeneratedAt");
+        query.limit(-1);
 
         if (longitude!=null && latitude!=null && distance!=null){
             Double[] latitudes = calculateLatitudes(latitude, distance);

diff --git a/...rc/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java b/...rc/main/java/us/dot/its/jpo/ode/api/accessors/events/BsmEvent/BsmEventRepositoryImpl.java
@@ -65,6 +65,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, BsmEvent.class, collectionName);
     }
 

diff --git a/...e/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java b/...e/api/accessors/events/ConnectionOfTravelEvent/ConnectionOfTravelEventRepositoryImpl.java
@@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, ConnectionOfTravelEvent.class, collectionName);
     }
 

diff --git a/...ntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java b/...ntersectionReferenceAlignmentEvent/IntersectionReferenceAlignmentEventRepositoryImpl.java
@@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, IntersectionReferenceAlignmentEvent.class,
         collectionName);
     }

diff --git a/...accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java b/...accessors/events/LaneDirectionOfTravelEvent/LaneDirectionOfTravelEventRepositoryImpl.java
@@ -63,6 +63,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, LaneDirectionOfTravelEvent.class, collectionName);
     }
 

diff --git a/.../ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java b/.../ode/api/accessors/events/MapBroadcastRateEvents/MapBroadcastRateEventRepositoryImpl.java
@@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, MapBroadcastRateEvent.class, collectionName);
     }
 

diff --git a/...s/jpo/ode/api/accessors/events/MapMinimumDataEvent/MapMinimumDataEventRepositoryImpl.java b/...s/jpo/ode/api/accessors/events/MapMinimumDataEvent/MapMinimumDataEventRepositoryImpl.java
@@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, MapMinimumDataEvent.class, collectionName);
     }
 

diff --git a/...i/accessors/events/SignalGroupAlignmentEvent/SignalGroupAlignmentEventRepositoryImpl.java b/...i/accessors/events/SignalGroupAlignmentEvent/SignalGroupAlignmentEventRepositoryImpl.java
@@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, SignalGroupAlignmentEvent.class, "CmSignalGroupAlignmentEvents");
     }
 

diff --git a/...api/accessors/events/SignalStateConflictEvent/SignalStateConflictEventRepositoryImpl.java b/...api/accessors/events/SignalStateConflictEvent/SignalStateConflictEventRepositoryImpl.java
@@ -57,6 +57,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, SignalStateConflictEvent.class, collectionName);
     }
 

diff --git a/...dot/its/jpo/ode/api/accessors/events/SignalStateEvent/SignalStateEventRepositoryImpl.java b/...dot/its/jpo/ode/api/accessors/events/SignalStateEvent/SignalStateEventRepositoryImpl.java
@@ -57,6 +57,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, StopLinePassageEvent.class, collectionName);
     }
 

diff --git a/...jpo/ode/api/accessors/events/SignalStateStopEvent/SignalStateStopEventRepositoryImpl.java b/...jpo/ode/api/accessors/events/SignalStateStopEvent/SignalStateStopEventRepositoryImpl.java
@@ -57,6 +57,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, StopLineStopEvent.class, collectionName);
     }
 

diff --git a/...ode/api/accessors/events/SpatBroadcastRateEvent/SpatBroadcastRateEventRepositoryImpl.java b/...ode/api/accessors/events/SpatBroadcastRateEvent/SpatBroadcastRateEventRepositoryImpl.java
@@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, SpatBroadcastRateEvent.class, collectionName);
     }
 

diff --git a/...jpo/ode/api/accessors/events/SpatMinimumDataEvent/SpatMinimumDataEventRepositoryImpl.java b/...jpo/ode/api/accessors/events/SpatMinimumDataEvent/SpatMinimumDataEventRepositoryImpl.java
@@ -59,6 +59,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, SpatMinimumDataEvent.class, collectionName);
     }
 

diff --git a/...ode/api/accessors/events/TimeChangeDetailsEvent/TimeChangeDetailsEventRepositoryImpl.java b/...ode/api/accessors/events/TimeChangeDetailsEvent/TimeChangeDetailsEventRepositoryImpl.java
@@ -58,6 +58,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, TimeChangeDetailsEvent.class, collectionName);
     }
 

diff --git a/...izer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/OdeMapDataRepositoryImpl.java b/...izer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/OdeMapDataRepositoryImpl.java
@@ -53,6 +53,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, OdeMapData.class, collectionName);
     }
 

diff --git a/...er-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java b/...er-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java
@@ -87,6 +87,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, ProcessedMap.class, collectionName);
     }
 

diff --git a/.../ode/api/accessors/notifications/ActiveNotification/ActiveNotificationRepositoryImpl.java b/.../ode/api/accessors/notifications/ActiveNotification/ActiveNotificationRepositoryImpl.java
@@ -51,6 +51,7 @@ public Query getQuery(Integer intersectionID, Integer roadRegulatorID, String no
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, Notification.class, "CmNotification");
     }
 

diff --git a/...ications/ConnectionOfTravelNotification/ConnectionOfTravelNotificationRepositoryImpl.java b/...ications/ConnectionOfTravelNotification/ConnectionOfTravelNotificationRepositoryImpl.java
@@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, ConnectionOfTravelNotification.class, collectionName);
     }
 

diff --git a/...erenceAlignmentNotification/IntersectionReferenceAlignmentNotificationRepositoryImpl.java b/...erenceAlignmentNotification/IntersectionReferenceAlignmentNotificationRepositoryImpl.java
@@ -45,6 +45,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, IntersectionReferenceAlignmentNotification.class, collectionName);
     }
 

diff --git a/...aneDirectionOfTravelNotificationRepo/LaneDirectionOfTravelNotificationRepositoryImpl.java b/...aneDirectionOfTravelNotificationRepo/LaneDirectionOfTravelNotificationRepositoryImpl.java
@@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, LaneDirectionOfTravelNotification.class, collectionName);
     }
 

diff --git a/...otifications/MapBroadcastRateNotification/MapBroadcastRateNotificationRepositoryImpl.java b/...otifications/MapBroadcastRateNotification/MapBroadcastRateNotificationRepositoryImpl.java
@@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, MapBroadcastRateNotification.class, collectionName);
     }
 

diff --git a/.../SignalGroupAlignmentNotificationRepo/SignalGroupAlignmentNotificationRepositoryImpl.java b/.../SignalGroupAlignmentNotificationRepo/SignalGroupAlignmentNotificationRepositoryImpl.java
@@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, SignalGroupAlignmentNotification.class, collectionName);
     }
 

diff --git a/...ations/SignalStateConflictNotification/SignalStateConflictNotificationRepositoryImpl.java b/...ations/SignalStateConflictNotification/SignalStateConflictNotificationRepositoryImpl.java
@@ -49,6 +49,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, SignalStateConflictNotification.class, collectionName);
     }
 

diff --git a/...ifications/SpatBroadcastRateNotification/SpatBroadcastRateNotificationRepositoryImpl.java b/...ifications/SpatBroadcastRateNotification/SpatBroadcastRateNotificationRepositoryImpl.java
@@ -46,6 +46,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, SpatBroadcastRateNotification.class, collectionName);
     }
 

diff --git a/.../notifications/StopLinePassageNotification/StopLinePassageNotificationRepositoryImpl.java b/.../notifications/StopLinePassageNotification/StopLinePassageNotificationRepositoryImpl.java
@@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, StopLinePassageNotification.class, collectionName);
     }
 

diff --git a/...essors/notifications/StopLineStopNotification/StopLineStopNotificationRepositoryImpl.java b/...essors/notifications/StopLineStopNotification/StopLineStopNotificationRepositoryImpl.java
@@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, StopLineStopNotification.class, collectionName);
     }
 

diff --git a/...ifications/TimeChangeDetailsNotification/TimeChangeDetailsNotificationRepositoryImpl.java b/...ifications/TimeChangeDetailsNotification/TimeChangeDetailsNotificationRepositoryImpl.java
@@ -47,6 +47,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query){
+        query.limit(-1);
         return mongoTemplate.count(query, TimeChangeDetailsNotification.class, collectionName);
     }
 

diff --git a/...er-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/OdeSpatDataRepositoryImpl.java b/...er-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/OdeSpatDataRepositoryImpl.java
@@ -53,6 +53,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1);
         return mongoTemplate.count(query, OdeSpatData.class, collectionName);
     }
 

diff --git a/...-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java b/...-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java
@@ -14,11 +14,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import us.dot.its.jpo.geojsonconverter.DateJsonMapper;
-import us.dot.its.jpo.geojsonconverter.pojos.geojson.map.ProcessedMap;
 import us.dot.its.jpo.geojsonconverter.pojos.spat.ProcessedSpat;
 import us.dot.its.jpo.ode.api.ConflictMonitorApiProperties;
 import us.dot.its.jpo.ode.api.models.IDCount;
-import org.springframework.data.domain.Sort;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,9 +27,6 @@
 import org.springframework.data.mongodb.core.aggregation.ConvertOperators;
 import org.springframework.data.mongodb.core.aggregation.DateOperators;
 
-import java.time.format.DateTimeFormatter;
-import java.time.ZonedDateTime;
-
 @Component
 public class ProcessedSpatRepositoryImpl implements ProcessedSpatRepository {
 
@@ -68,6 +63,7 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime) {
     }
 
     public long getQueryResultCount(Query query) {
+        query.limit(-1); // remove any count limits
         return mongoTemplate.count(query, ProcessedSpat.class, collectionName);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         public long getQueryResultCount(Query query) {
+            query.limit(-1);
             return mongoTemplate.count(query, ConnectionOfTravelAssessment.class, collectionName);
         }
@@ Expand Down @@