diff --git a/src/main/java/com/kamco/cd/kamcoback/common/enums/LayerType.java b/src/main/java/com/kamco/cd/kamcoback/common/enums/LayerType.java index 99816656..f4fba751 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/enums/LayerType.java +++ b/src/main/java/com/kamco/cd/kamcoback/common/enums/LayerType.java @@ -13,7 +13,10 @@ public enum LayerType implements EnumType { TILE("배경지도"), GEOJSON("객체데이터"), WMTS("타일레이어"), - WMS("지적도"); + WMS("지적도") + , KAMCO_WMS("국유인WMS") + , KAMCO_WMTS("국유인WMTS") + ; private final String desc; diff --git a/src/main/java/com/kamco/cd/kamcoback/layer/service/LayerService.java b/src/main/java/com/kamco/cd/kamcoback/layer/service/LayerService.java index e486b446..3372c7c7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/layer/service/LayerService.java +++ b/src/main/java/com/kamco/cd/kamcoback/layer/service/LayerService.java @@ -58,11 +58,11 @@ public class LayerService { @Transactional public UUID saveLayers(String type, LayerDto.AddReq dto) { LayerType layerType = - LayerType.from(type) - .orElseThrow(() -> new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST)); + LayerType.from(type) + .orElseThrow(() -> new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST)); switch (layerType) { - case TILE -> { + case TILE, KAMCO_WMS, KAMCO_WMTS -> { return mapLayerCoreService.saveTile(dto); } @@ -169,21 +169,21 @@ public class LayerService { public List findLayerMapList(String type) { List layerMapDtoList = mapLayerCoreService.findLayerMapList(type); layerMapDtoList.forEach( - dto -> { - if (dto.getLayerType().equals("WMS")) { - dto.setUrl( - String.format( - "%s/%s/%s", - trimSlash(geoserverUrl), trimSlash(wmsPath), dto.getLayerType().toLowerCase())); - } else if (dto.getLayerType().equals("WMTS")) { - dto.setUrl( - String.format( - "%s/%s/%s", - trimSlash(geoserverUrl), - trimSlash(wmtsPath), - dto.getLayerType().toLowerCase())); - } - }); + dto -> { + if (dto.getLayerType().equals("WMS")) { + dto.setUrl( + String.format( + "%s/%s/%s", + trimSlash(geoserverUrl), trimSlash(wmsPath), dto.getLayerType().toLowerCase())); + } else if (dto.getLayerType().equals("WMTS")) { + dto.setUrl( + String.format( + "%s/%s/%s", + trimSlash(geoserverUrl), + trimSlash(wmtsPath), + dto.getLayerType().toLowerCase())); + } + }); return layerMapDtoList; }