diff --git a/apps/sn/.env.local b/apps/sn/.env.local index 0feaf6f97..b755f2b4b 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -3,7 +3,7 @@ NEXT_PUBLIC_PORT = 3002 NEXT_PUBLIC_PROXY_HOST = http://localhost:3002 NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver -NEXT_PUBLIC_TEMP_GEOSERVER_URL = http://192.168.1.20:8080/geoserver #TODO 운영에서 바꿔야 함 +NEXT_PUBLIC_TEMP_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 NEXT_PUBLIC_CLAIM_NAME = Authorization NEXT_PUBLIC_AUTH_USER_ID = token-id NEXT_PUBLIC_ACCESS_TOKEN = access-token diff --git a/apps/sn/app/(map-layout)/map/page.tsx b/apps/sn/app/(map-layout)/map/page.tsx index 55bd0f123..dd3ce64eb 100644 --- a/apps/sn/app/(map-layout)/map/page.tsx +++ b/apps/sn/app/(map-layout)/map/page.tsx @@ -119,7 +119,7 @@ const Map = () => { treeData={treeData} isSearch={true} gisMaps={gisMaps} - isMiniMap={true} + isMiniMap={false} searchView={SearchModal} detailView={FeatureClickEventPopup} onFeatureSelect={onFeatureSelect} diff --git a/apps/sn/app/(with-base-layout)/ii/rdii_result/page.tsx b/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx similarity index 100% rename from apps/sn/app/(with-base-layout)/ii/rdii_result/page.tsx rename to apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts index 922d9d6dc..c191917a9 100644 --- a/apps/sn/middleware.ts +++ b/apps/sn/middleware.ts @@ -23,14 +23,19 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/geoserver")) { const queryParams = searchParams.toString(); - + //TODO 운영에서 변경 해야함. const typename = searchParams.get("TYPENAME"); let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${ queryParams ? `?${queryParams}` : "" }`; - if(typename == 'hasudo:tb_ms_swage_ppl'){ + if ( + typename == "hasudo:tb_ms_swage_ppl" || + typename == "hasudo:tb_ms_swage_mhl" || + typename == "hasudo:tb_ms_swage_pmstn" || + typename == "hasudo:tb_ms_stofcbr" + ) { newUrl = `${TEMP_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${ queryParams ? `?${queryParams}` : "" }`; @@ -39,15 +44,6 @@ export function middleware(req: NextRequest) { return NextResponse.rewrite(new URL(newUrl)); } - if (pathname.startsWith("/tempgeoserver")) { - const queryParams = searchParams.toString(); - const newUrl = `${TEMP_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${ - queryParams ? `?${queryParams}` : "" - }`; - console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); - return NextResponse.rewrite(new URL(newUrl)); - } - if (pathname.startsWith("/sewerage-service/api/v1/map/geometry")) { const queryParams = searchParams.toString(); const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${ @@ -57,7 +53,10 @@ export function middleware(req: NextRequest) { return NextResponse.rewrite(new URL(newUrl)); } - if (pathname.startsWith("/attach-service") || pathname.startsWith("/cms-service")) { + if ( + pathname.startsWith("/attach-service") || + pathname.startsWith("/cms-service") + ) { const requestHeaders = new Headers(req.headers); const token = req.cookies.get(CLAIM_NAME)?.value; const userId = req.cookies.get(AUTH_USER_ID)?.value; diff --git a/apps/sn/public/images/map/layericon/SWL_MANH_PS_ORANGE.png b/apps/sn/public/images/map/layericon/SWL_MANH_PS_ORANGE.png new file mode 100644 index 000000000..288d1afa8 Binary files /dev/null and b/apps/sn/public/images/map/layericon/SWL_MANH_PS_ORANGE.png differ diff --git a/apps/sn/public/images/map/layericon/WTL_RSRV_PS_BLACK.png b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_BLACK.png new file mode 100644 index 000000000..395abeb78 Binary files /dev/null and b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_BLACK.png differ diff --git a/apps/sn/public/images/map/layericon/WTL_RSRV_PS_GREEN.png b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_GREEN.png new file mode 100644 index 000000000..33933b9e0 Binary files /dev/null and b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_GREEN.png differ diff --git a/apps/sn/public/images/map/layericon/WTL_RSRV_PS_ORANGE.png b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_ORANGE.png new file mode 100644 index 000000000..7a78c3466 Binary files /dev/null and b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_ORANGE.png differ diff --git a/apps/sn/public/images/map/layericon/WTL_RSRV_PS_PURPLE.png b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_PURPLE.png new file mode 100644 index 000000000..ef25607cf Binary files /dev/null and b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_PURPLE.png differ diff --git a/apps/sn/public/images/map/layericon/WTL_RSRV_PS_RED.png b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_RED.png new file mode 100644 index 000000000..26fd5f68e Binary files /dev/null and b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_RED.png differ diff --git a/apps/sn/public/images/map/layericon/WTL_RSRV_PS_YELLOW.png b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_YELLOW.png new file mode 100644 index 000000000..76718e865 Binary files /dev/null and b/apps/sn/public/images/map/layericon/WTL_RSRV_PS_YELLOW.png differ