Merge pull request #99 from usdot-jpo-ode/geo-map-lookup

Added Endpoint for getting map based upon long lat
usdot-jpo-ode · Jun 20, 2024 · db28d70 · db28d70
2 parents f417877 + a68b909
commit db28d70
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 2 deletions.
diff --git a/...alizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepository.java b/...alizer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepository.java
@@ -22,4 +22,6 @@ public interface ProcessedMapRepository extends DataLoader<ProcessedMap<LineStri
     List<IDCount> getMapBroadcastRates(int intersectionID, Long startTime, Long endTime);
 
     List<IDCount> getMapBroadcastRateDistribution(int intersectionID, Long startTime, Long endTime);
+
+    List<IntersectionReferenceData> getIntersectionsContainingPoint(double longitude, double latitude);
 }
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
@@ -2,12 +2,14 @@
 
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
+import org.locationtech.jts.geom.CoordinateXY;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,8 @@
 import us.dot.its.jpo.ode.api.ConflictMonitorApiProperties;
 import us.dot.its.jpo.ode.api.models.IDCount;
 import us.dot.its.jpo.ode.api.models.IntersectionReferenceData;
+import us.dot.its.jpo.conflictmonitor.monitor.models.map.MapBoundingBox;
+import us.dot.its.jpo.conflictmonitor.monitor.models.map.MapIndex;
 import us.dot.its.jpo.geojsonconverter.DateJsonMapper;
 import us.dot.its.jpo.geojsonconverter.pojos.geojson.LineString;
 
@@ -165,6 +169,54 @@ public List<IntersectionReferenceData> getIntersectionIDs() {
         return referenceDataList;
     }
 
+    public List<IntersectionReferenceData> getIntersectionsContainingPoint(double longitude, double latitude){
+        MongoCollection<Document> collection = mongoTemplate.getCollection(collectionName);
+        DistinctIterable<Integer> docs = collection.distinct("properties.intersectionId", Integer.class);
+        MongoCursor<Integer> results = docs.iterator();
+        MapIndex index = new MapIndex();
+        Map<Integer, ProcessedMap<LineString>> mapLookup = new HashMap<>();
+        while (results.hasNext()) {
+            Integer intersectionId = results.next();
+            if (intersectionId != null){
+
+
+                Query query = getQuery(intersectionId,  null,  null,  true,  true);
+
+                List<ProcessedMap<LineString>> maps = findProcessedMaps(query);
+
+                if(maps.size() > 0){
+                    MapBoundingBox box = new MapBoundingBox(maps.getFirst());
+                    index.insert(box);
+                    mapLookup.put(intersectionId, maps.getFirst());
+                }
+            }
+        }
+
+        List<MapBoundingBox> mapsContainingPoints = index.mapsContainingPoint(new CoordinateXY(longitude, latitude));
+
+        List<IntersectionReferenceData> result = new ArrayList<>();
+        for(MapBoundingBox box: mapsContainingPoints){
+            ProcessedMap<LineString> map = mapLookup.get(box.getIntersectionId());
+            IntersectionReferenceData data = new IntersectionReferenceData();
+            data.setIntersectionID(map.getProperties().getIntersectionId());
+            data.setRoadRegulatorID("-1");
+            data.setRsuIP(map.getProperties().getOriginIp());
+
+            if(map.getProperties().getIntersectionName() != null && map.getProperties().getIntersectionName().isEmpty()){
+                data.setIntersectionName(map.getProperties().getIntersectionName());
+            }
+
+            if (map.getProperties().getRefPoint() != null) {
+                data.setLatitude(map.getProperties().getRefPoint().getLatitude().doubleValue());
+                data.setLongitude(map.getProperties().getRefPoint().getLongitude().doubleValue());
+            }
+            result.add(data);
+        }
+
+        return result;
+
+    }
+
     public List<IDCount> getMapBroadcastRates(int intersectionID, Long startTime, Long endTime) {
 
         String startTimeString = Instant.ofEpochMilli(0).toString();
@@ -238,6 +290,8 @@ public List<IDCount> getMapBroadcastRateDistribution(int intersectionID, Long st
         return results;
     }
 
+
+
     @Override
     public void add(ProcessedMap<LineString> item) {
         mongoTemplate.save(item, collectionName);

diff --git a/...sualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/IntersectionController.java b/...sualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/IntersectionController.java
@@ -43,4 +43,27 @@ public ResponseEntity<List<IntersectionReferenceData>> getIntersections(
 
         }
     }
+
+    @CrossOrigin(origins = "http://localhost:3000")
+    @RequestMapping(value = "/intersection/list/location", method = RequestMethod.GET, produces = "application/json")
+    @PreAuthorize("hasRole('USER') || hasRole('ADMIN')")
+    public ResponseEntity<List<IntersectionReferenceData>> getIntersectionsByLocation(
+            @RequestParam(name = "longitude", required = true, defaultValue = "false") Double longitude,
+            @RequestParam(name = "latitude", required = true, defaultValue = "false") Double latitude,
+            @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) {
+
+        if (testData) {
+            IntersectionReferenceData ref = new IntersectionReferenceData();
+            ref.setRsuIP("10.11.81.12");
+            ref.setIntersectionID(12109);
+            ref.setRoadRegulatorID("0");
+
+            List<IntersectionReferenceData> refList = new ArrayList<>();
+            refList.add(ref);
+
+            return ResponseEntity.ok(refList);
+        } else {
+            return ResponseEntity.ok(processedMapRepo.getIntersectionsContainingPoint(longitude, latitude));
+        }
+    }
 }
diff --git a/...onflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java b/...onflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java
@@ -82,6 +82,4 @@ public ResponseEntity<Long> countMaps(
 
         }
     }
-
-
 }