Browse Source

공역 유효성검사 수정

feature/auth
박재우 2 years ago
parent
commit
12308d063f
  1. 12
      src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanResultMessageRq.java
  2. 6
      src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
  3. 2
      src/main/java/com/palnet/comn/utils/AreaUtils.java

12
src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanResultMessageRq.java

@ -1,12 +0,0 @@
package com.palnet.biz.api.bas.flight.model;
import lombok.Data;
@Data
public class BasFlightPlanResultMessageRq {
private boolean dateCheck;
private boolean areaCheck;
private boolean finalCheck;
}

6
src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@ -432,8 +432,10 @@ public class BasFlightService {
for(BasFlightPlanAreaModel area : rq) { for(BasFlightPlanAreaModel area : rq) {
List<Coordinate> coordinates = areaUtils.convertCoordinates(area.getCoordList()); List<Coordinate> coordinates = areaUtils.convertCoordinates(area.getCoordList());
if("LINE".equals(area.getAreaType())) { if("LINE".equals(area.getAreaType())) {
List<Coordinate> buffer = areaUtils.buffer(coordinates, area.getBufferZone()); List<Coordinate> transCoordList = areaUtils.transform(coordinates, "EPSG:4326", "EPSG:5181");
result = areaUtils.overlaps(buffer); List<Coordinate> buffer = areaUtils.buffer(transCoordList, area.getBufferZone());
List<Coordinate> transBufferList = areaUtils.transform(buffer, "EPSG:5181", "EPSG:4326");
result = areaUtils.overlaps(transBufferList);
} }
if("POLYGON".equals(area.getAreaType())) { if("POLYGON".equals(area.getAreaType())) {

2
src/main/java/com/palnet/comn/utils/AreaUtils.java

@ -81,7 +81,7 @@ public class AreaUtils {
Geometry overlabsGeometry = geometryFactory.createGeometry(polygon); Geometry overlabsGeometry = geometryFactory.createGeometry(polygon);
Geometry targetGeometry = geometryFactory.createGeometry(targetPolygon); Geometry targetGeometry = geometryFactory.createGeometry(targetPolygon);
boolean over = targetGeometry.overlaps(overlabsGeometry); boolean over = targetPolygon.overlaps(polygon);
if(over) { if(over) {
result = true; result = true;

Loading…
Cancel
Save