diff --git a/apps/wr/.env.production b/apps/wr/.env.production index 295ba7ea9..aef204e50 100644 --- a/apps/wr/.env.production +++ b/apps/wr/.env.production @@ -1,19 +1,23 @@ NEXT_PUBLIC_SITE_ID = WR NEXT_PUBLIC_PORT = 3000 NEXT_PUBLIC_PROXY_HOST = http://wr.hasuon.or.kr -NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/api/v1 -NEXT_PUBLIC_FO_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/operation-service/api/v1 +NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000 +NEXT_PUBLIC_FO_SERVER_API_URL = https://wr.hasuon.or.kr/operation-service/api/v1 NEXT_PUBLIC_CS_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000 NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload -NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver -# NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id NEXT_PUBLIC_ACCESS_TOKEN = access-token NEXT_PUBLIC_REFRESH_TOKEN = refresh-token +NEXT_PUBLIC_WR_SERVER_API_URL = https://wr.hasuon.or.kr/reuse-service/api/v1 +NEXT_PUBLIC_SEWERAGE_API_URL = https://wr.hasuon.or.kr/sewerage-service/api NEXT_PUBLIC_NGII_URL = http://10.98.25.94:18080/openapi/Gettile.do?apiKey=BDE2BEF39DAFEC293AB6730150F222AC -NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/sewerage-service/api +#NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/api/v1 +#NEXT_PUBLIC_FO_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/operation-service/api/v1 +#NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver +#NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/sewerage-service/api NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do @@ -23,21 +27,3 @@ NEXT_PUBLIC_WR_ADDRESS_KEY = U01TXOFVVEgyMDI1MDgyODE0MTAxNzExNjEyMjA= - - -# NEXT_PUBLIC_SITE_ID = WR -# NEXT_PUBLIC_PORT = 11301 -# NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11301 -# # NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 -# NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1 -# NEXT_PUBLIC_FO_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1 -# NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000 -# NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload -# NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver -# NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver -# NEXT_PUBLIC_CLAIM_NAME = Authorization -# NEXT_PUBLIC_AUTH_USER_ID = token-id -# NEXT_PUBLIC_ACCESS_TOKEN = access-token -# NEXT_PUBLIC_REFRESH_TOKEN = refresh-token - -# NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API diff --git a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx index 9c558851c..e20ce9f36 100644 --- a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx +++ b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/drgtLegend.tsx @@ -4,67 +4,50 @@ import React from "react"; import { Label } from "@common/components/ui/label"; export const DRGT_LAYER_TYPES: string[] = [ - // 수정 필요 - 'drought1', - 'drought2', - 'drought3', - 'drought4', - 'drought5', - 'drought6', -]; -// 지정된 순서에 따른 lyr_sn 배열 -export const EXPRS_ORDERED_LAYERS: string[] = [ - // 수정 필요 - '106', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 30년 빈도 - '107', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 50년 빈도 - '108', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 80년 빈도 - '109', // 침수위험지도(tb_ms_sbmrg_dngr_map) - 100년 빈도 - '110', // 도시침수지도(tb_ms_flood_dngr_map) - 30년 빈도 - '111', // 도시침수지도(tb_ms_flood_dngr_map) - 50년 빈도 + 'drought1', 'drought2', 'drought3', + 'drought4', 'drought5', 'drought6', ]; export function DrgtLegend() { + function LegendItem({ color, label }: { color: string; label: string }) { + return ( +
+ + {label} +
+ ); + } + return ( - <> -
-
- -
-
-
-
-
-
-
-
가 뭄 정 보
-
- - {/* 관심 - 1회 미만 */} - {/* 관심 - 1회 이상 */} - - {/* 주의 - 1회 미만 */} - {/* 주의 - 1회 이상 */} - - {/* 관심+주의 - 1회 미만 */} - {/* 관심+주의 - 1회 이상 */} -
-
+
+
+ +
+
+
+
- - ); -} - -function LegendItem({ color, label }: { color: string; label: string }) { - return ( -
- - {label} +
+
가 뭄 정 보
+
+ + {/* 관심 - 1회 미만 */} + {/* 관심 - 1회 이상 */} + + {/* 주의 - 1회 미만 */} + {/* 주의 - 1회 이상 */} + + {/* 관심+주의 - 1회 미만 */} + {/* 관심+주의 - 1회 이상 */} +
+
+
); } \ No newline at end of file diff --git a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx index e9315a4c9..8d17abd94 100644 --- a/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx +++ b/apps/wr/app/(popUp-layout)/mapDrgtPopUp/page.tsx @@ -4,7 +4,7 @@ import Gis from "@common/business_components/ui/map/Gis"; import { useEffect, useRef, useState, useCallback } from "react"; import { useSearchParams } from "next/navigation"; import { mapService } from "../../(map-layout)/service"; -import { DrgtLegend, DRGT_LAYER_TYPES, EXPRS_ORDERED_LAYERS } from "./drgtLegend"; +import { DrgtLegend, DRGT_LAYER_TYPES } from "./drgtLegend"; import { SearchBar } from "./searchBar"; @@ -78,7 +78,6 @@ export default function MapDrgtPopUp() { isPlaying={isPlaying} setIsPlaying={setIsPlaying as any} targetLayerTypes={DRGT_LAYER_TYPES as any} - orderedLayers={EXPRS_ORDERED_LAYERS as any} checkInterval={2500} height={`h-[100vh]`} droughtDates={{ startYmd: fromDate, endYmd: toDate }} diff --git a/apps/wr/src/shared/config/env.ts b/apps/wr/src/shared/config/env.ts index acd0e25e2..89dd8addd 100644 --- a/apps/wr/src/shared/config/env.ts +++ b/apps/wr/src/shared/config/env.ts @@ -1,7 +1,7 @@ export const SITE_ID = process.env.NEXT_PUBLIC_SITE_ID || "WR"; export const PORT = process.env.NEXT_PUBLIC_PORT || "3001"; export const PROXY_HOST = process.env.NEXT_PUBLIC_PROXY_HOST || `http://localhost:${PORT}`; -export const SERVER_API_WR_URL = process.env.NEXT_PUBLIC_WR_SERVER_API_URL ||'http://con.mind-one.co.kr:11080/api/v1'; +export const SERVER_API_WR_URL = process.env.NEXT_PUBLIC_WR_SERVER_API_URL ||'http://apigateway.iipbs-dev.svc.cluster.local:8000/api/v1'; export const SERVER_API_FO_URL = process.env.NEXT_PUBLIC_FO_SERVER_API_URL||' http://con.mind-one.co.kr:11082/api/v1'; export const SERVER_API_CS_URL = process.env.NEXT_PUBLIC_CS_SERVER_API_URL||'http://dev.onasys.co.kr:8000'; export const SERVER_API_CS_TUS_URL = process.env.NEXT_PUBLIC_CS_TUS_UPLOAD ||'/attach-service/api/v1/tus/upload'