From 8bb8825c5ee503fcd284701c6ddf6360af618fa5 Mon Sep 17 00:00:00 2001 From: yschoi Date: Mon, 30 Jun 2025 18:00:56 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A1=9C=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/sn/.env.local | 2 +- apps/sn/app/(map-layout)/map/page.tsx | 2 +- .../ii/{rdii_result => rdiiResult}/page.tsx | 0 apps/sn/middleware.ts | 23 +++++++++--------- .../map/layericon/SWL_MANH_PS_ORANGE.png | Bin 0 -> 455 bytes .../map/layericon/WTL_RSRV_PS_BLACK.png | Bin 0 -> 167 bytes .../map/layericon/WTL_RSRV_PS_GREEN.png | Bin 0 -> 167 bytes .../map/layericon/WTL_RSRV_PS_ORANGE.png | Bin 0 -> 164 bytes .../map/layericon/WTL_RSRV_PS_PURPLE.png | Bin 0 -> 165 bytes .../images/map/layericon/WTL_RSRV_PS_RED.png | Bin 0 -> 165 bytes .../map/layericon/WTL_RSRV_PS_YELLOW.png | Bin 0 -> 163 bytes 11 files changed, 13 insertions(+), 14 deletions(-) rename apps/sn/app/(with-base-layout)/ii/{rdii_result => rdiiResult}/page.tsx (100%) create mode 100644 apps/sn/public/images/map/layericon/SWL_MANH_PS_ORANGE.png create mode 100644 apps/sn/public/images/map/layericon/WTL_RSRV_PS_BLACK.png create mode 100644 apps/sn/public/images/map/layericon/WTL_RSRV_PS_GREEN.png create mode 100644 apps/sn/public/images/map/layericon/WTL_RSRV_PS_ORANGE.png create mode 100644 apps/sn/public/images/map/layericon/WTL_RSRV_PS_PURPLE.png create mode 100644 apps/sn/public/images/map/layericon/WTL_RSRV_PS_RED.png create mode 100644 apps/sn/public/images/map/layericon/WTL_RSRV_PS_YELLOW.png 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 0000000000000000000000000000000000000000..288d1afa833075756c7e627c0f46e9e21e8264ca GIT binary patch literal 455 zcmV;&0XY7NP)d z@}D!-eR}bDLGhFmt{4VP+4Em5_a)<@HqMvNZlBxtx0O|s!Dnv^0|NsCgWrJ;xZ+*` zOXnUzi(UVhGWC*?wP#>pU|=Zyc>49< ze}8!T1T8sH{2$H02=~I<=l7Ukn#;dkcr7fc2v_*^%R5nI&3*?uzhbxmTfh+lC@vrt z;aSx=YQQxkM|pr&`7@A@fwxdhFfBBGsfq{WxqkRR# xG#L+u`&W;0!{ivFA>qe}u8Ej50ny|C$dvqrq6gX- z6QtJH@E`ijww8BZ&fEvB({qpSk@Ic%8g5>(O8x^Y1LK~5YMv?Y&C9|yo=2;{@ny4; Q1lr8t>FVdQ&MBb@03aDW=l}o! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..33933b9e04b38435d3d4ff138a135e6dfd1f6c27 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`d7dtgAr*6y|NQ@N&#c0q O%;4$j=d#Wzp$P!6M?0AS literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7a78c34664d8f302243822cf89403706bd4d5e2a GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`*`6+rAr*6y|NQ@N&#cF)Xe&|Ks&gUVSRASg_~c;?M}H{&OgoVN%r@0|mhzDFX?fgg^VIH2%3G@^${iiI?tpY!qks)vRtZf#L5gptTI1 Lu6{1-oD!M?# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ef25607cf502431098e70d5f01ad934c70dd4252 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ii4<#Ar*6y|NQ@N&#c^R-<&>@EDyf+v&mCx9a zd2MgxL4~r7T+10xyfQr05Mq#ZAi`e7 zdD+VU|BaJ^Pqlb|UL^frLhSC3_WJ=m%o9wE4Gav9WG