feat: grid의 마커 위치 정확도 수정

[#819]
woowacourse-teams · Oct 19, 2023 · a57f511 · a57f511
1 parent 3b77a70
commit a57f511
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/backend/src/main/java/com/carffeine/carffeine/station/domain/station/Grid.java b/backend/src/main/java/com/carffeine/carffeine/station/domain/station/Grid.java
@@ -52,6 +52,12 @@ public BigDecimal calculateCenterLongitude() {
         return topLongitude.add(bottomLongitude).divide(BigDecimal.valueOf(2), 4, RoundingMode.CEILING);
     }
 
+    public Point randomPoint() {
+        int size = points.size();
+        int randomIndex = (int) (Math.random() * size);
+        return points.get(randomIndex);
+    }
+
     public void addPoint(Point point) {
         points.add(point);
     }

diff --git a/...c/main/java/com/carffeine/carffeine/station/service/station/StationGridFacadeService.java b/...c/main/java/com/carffeine/carffeine/station/service/station/StationGridFacadeService.java
@@ -30,19 +30,12 @@ public class StationGridFacadeService {
     private final StationGridCacheService stationGridCacheService;
     private final ExecutorService executor = Executors.newFixedThreadPool(5);
 
-    private static List<GridWithCount> createCenterPointWhereHasStation(List<Grid> grids) {
-        return grids.stream()
-                .filter(Grid::hasStation)
-                .map(it -> GridWithCount.createCenterPoint(it, it.stationSize()))
-                .toList();
-    }
-
     public List<GridWithCount> createGridWithCounts() {
         GridGenerator gridGenerator = new GridGenerator();
         List<Grid> grids = gridGenerator.createKorea();
         List<CompletableFuture<Void>> futures = new ArrayList<>();
 
-        int loopSize = stationQueryService.findStationCount().intValue() / BATCH_SIZE;
+        long loopSize = stationQueryService.findStationCount() / BATCH_SIZE + 1;
 
         int page = 0;
         for (int i = 0; i < loopSize; i++) {
@@ -58,17 +51,24 @@ public List<GridWithCount> createGridWithCounts() {
         futures.forEach(CompletableFuture::join);
         executor.shutdown();
 
-        List<GridWithCount> list = createCenterPointWhereHasStation(grids);
+        List<GridWithCount> list = createRandomPointWhereHasStation(grids);
         return new ArrayList<>(list);
     }
 
+    private List<GridWithCount> createRandomPointWhereHasStation(List<Grid> grids) {
+        return grids.stream()
+                .filter(Grid::hasStation)
+                .map(it -> GridWithCount.createRandom(it, it.stationSize(), it.randomPoint()))
+                .toList();
+    }
+
     public List<GridWithCount> counts(ClusterRequest request) {
         List<GridWithCount> gridWithCounts = stationGridCacheService.findGrids(request);
         List<Grid> displayGrid = createDisplayGrid(request);
         List<Grid> grids = stationGridService.assignStationGridsWithCount(displayGrid, gridWithCounts);
         List<GridWithCount> list = grids.stream()
                 .filter(Grid::existsCount)
-                .map(it -> GridWithCount.createCenterPoint(it, it.getCount()))
+                .map(it -> GridWithCount.createRandom(it, it.getCount(), it.randomPoint()))
                 .toList();
         return new ArrayList<>(list);
     }

diff --git a/backend/src/main/java/com/carffeine/carffeine/station/service/station/dto/GridWithCount.java b/backend/src/main/java/com/carffeine/carffeine/station/service/station/dto/GridWithCount.java
@@ -1,6 +1,7 @@
 package com.carffeine.carffeine.station.service.station.dto;
 
 import com.carffeine.carffeine.station.domain.station.Grid;
+import com.carffeine.carffeine.station.domain.station.Point;
 
 import java.math.BigDecimal;
 
@@ -16,4 +17,8 @@ public static GridWithCount createCenterPoint(Grid grid, int count) {
         BigDecimal centerLongitude = grid.calculateCenterLongitude();
         return new GridWithCount(grid.getId(), centerLatitude, centerLongitude, count);
     }
+
+    public static GridWithCount createRandom(Grid grid, int count, Point point) {
+        return new GridWithCount(grid.getId(), point.getLatitude().getValue(), point.getLongitude().getValue(), count);
+    }
 }