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 edb3994f..3eac0199 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 @@ -34,8 +34,11 @@ public class LayerService { @Value("${layer.geoserver-url}") private String geoserverUrl; - @Value("${layer.path}") - private String geoserverPath; + @Value("${layer.wms-path}") + private String wmsPath; + + @Value("${layer.wmts-path}") + private String wmtsPath; /** * 지도 레이어 관리 목록 @@ -184,14 +187,22 @@ public class LayerService { List layerMapDtoList = mapLayerCoreService.findLayerMapList(type); layerMapDtoList.forEach( dto -> { - if (dto.getLayerType().equals("WMS") || dto.getLayerType().equals("WMTS")) { + if (dto.getLayerType().equals("WMS")) { dto.setUrl( String.format( "%s/%s/%s", trimSlash(geoserverUrl), - trimSlash(geoserverPath), + 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; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2849248c..a17ca543 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -124,5 +124,6 @@ training-data: layer: geoserver-url: https://kamco.geo-dev.gs.dabeeo.com - path: geoserver/cd/gwc/service + wms-path: geoserver/cd + wmts-path: geoserver/cd/gwc/service workspace: cd diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 62a91044..2c4389f7 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -79,5 +79,6 @@ training-data: layer: geoserver-url: https://kamco.geo-dev.gs.dabeeo.com - path: /geoserver/cd/gwc/service/ + wms-path: geoserver/cd + wmts-path: geoserver/cd/gwc/service workspace: cd