gis 설정 추가

This commit is contained in:
yschoi
2025-08-06 17:06:24 +09:00
parent 4a1cb73c50
commit 9908bac1ca
14 changed files with 1610 additions and 388 deletions
+4 -6
View File
@@ -6,8 +6,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
import GisApp from "@common/business_components/ui/map/lib/gis.core";
import SearchModal from "./searchModal/searchModal";
import FeatureClickEventPopup from "./components/popupComponent/featureClickEventPopup";
import { SearchBar } from "./searchBar/searchBar";
import { WaterDepth } from "./waterDepth/waterDepth";
import { ProcSearchBar } from "@common/business_components/ui/map/searchBar";
// 타입 정의 추가
export type LyrStngProps = {
@@ -39,8 +38,7 @@ const Map = () => {
const gisMaps = useRef<any | null>(null);
const [isOpen, setIsOpen] = useState(false); // 팝업 열기/닫기 상태
const [isSearchModalOpen, setIsSearchModalOpen] = useState(false); // SearchModal 열림 상태
const [featureData, setFeatureData] = useState(null); // 선택된 피쳐 데이터
const [featureData, setFeatureData] = useState<any>(null); // 선택된 피쳐 데이터
useEffect(() => {
fetchData();
@@ -118,6 +116,7 @@ const Map = () => {
setIsSearchModalOpen(false);
};
const facilityTypes = [{ text: "하수처리시설", val: "tb_il_swage_prcs_fclt" }];
return (
<div className="bg-container">
@@ -136,8 +135,7 @@ const Map = () => {
isOpen={isOpen}
isSearchModalOpen={isSearchModalOpen}
onCheckedLayersChange={undefined}
searchBar={SearchBar}
// waterDepth={WaterDepth}
searchBar={<ProcSearchBar gisMaps={gisMaps} facilityTypes={facilityTypes} />}
waterDepth={undefined}
/>
</div>
+7 -37
View File
@@ -6,6 +6,7 @@ import { mapService } from "../service";
import NewWindowPopup from "../components/newWindowPopup";
import GisApp from "@common/business_components/ui/map/lib/gis.core";
import { SearchBar } from "../searchBar/searchBar";
import { UndoIcon } from "lucide-react";
const Map = () => {
const [treeData, setTreeData] = useState([]); // 초기값을 객체 또는 null로 설정
@@ -46,7 +47,8 @@ const Map = () => {
};
// SearchModal, GisContent 등에서 호출
const onFeatureSelect = (data: any) => {
const onFeatureFocus = (data: any) => {
console.log("page:onFeatureFocus");
const map = gisMaps.current;
if (!map) {
console.warn("지도가 초기화되지 않았습니다.");
@@ -64,26 +66,6 @@ const Map = () => {
let foundFeature: any = null;
let featureId = data.fid;
const layerName = data.layerNm;
console.log("선택된 레이어 이름:", data, layerName);
if (layerName === "하수재이용시설") {
// 재이용시설
featureId = `${layerName}.${data.searchPk}`;
} else if (
//빗물이용시설, 중수도시설
layerName === "빗물이용시설" ||
layerName == "중수도시설"
) {
featureId = `${layerName}.${data.bdstInfoSn}`;
} else if (layerName === "하수처리시설") { //하수처리시설
featureId = `${layerName}.${data.bscFctCd}`;
} else if (layerName === "온배수시설") { //온배수시설
featureId = `${layerName}.${data.bdstRuseFcltSn}`;
} else if (layerName == "수요처") { //수요처
featureId = `${layerName}.${data.dmdInfoId.replaceAll("-", "")}`;
} else {
console.warn("해당 레이어에 대한 featureId 매핑 없음", layerName);
featureId = `${layerName}.${data.fid || data.id || data.ftrIdn}`;
}
map
.getLayers()
.getArray()
@@ -109,28 +91,15 @@ const Map = () => {
nearest: true,
});
}
select.selectFeature(foundFeature, true);
// select.selectFeature(foundFeature, true);
} else {
console.warn("OpenLayers Feature를 찾을 수 없습니다:", data);
}
const currentId = data?.fid || data?.id || data?.ftrIdn;
const lastId = featureData?.fid || featureData?.id || featureData?.ftrIdn;
if (featureData && currentId === lastId) return; // 이전과 같으면 무시
setFeatureData(data);
setIsOpen(true);
setIsSearchModalOpen(false);
};
// MapSearchBar 래퍼 컴포넌트
// const CustomMapSearchBar = (props: any) => {
// return (
// <MapSearchBar
// {...props}
// searchType="공급처 후보지 조회"
// showApplyButton={false}
// />
// );
// };
const renderDetailView = useCallback(
(props: any) => (
<NewWindowPopup
@@ -152,7 +121,7 @@ const Map = () => {
isMiniMap={false}
searchView={undefined}
detailView={renderDetailView}
onFeatureSelect={onFeatureSelect}
onFeatureSelect={onFeatureFocus}
setIsOpen={setIsOpen}
setFeatureData={setFeatureData}
featureData={featureData}
@@ -173,8 +142,9 @@ const Map = () => {
];
return (
<SearchBar
onFeatureSelect={onFeatureSelect}
gisMaps={gisMaps}
facilityTypes={facilityTypes}
onFeatureFocus={onFeatureFocus}
/>
);
}}
@@ -6,8 +6,8 @@ import { useEffect, useRef, useState } from "react";
interface SearchInputTextProps {
initValue?: string;
setValue: (val: string) => void;
setRtnData: (val: { bscFctNm: string; bscFctCd: string }) => void;
searchList: { bscFctNm: string; bscFctCd: string }[];
setRtnData: (val: { fnm: string; fid: string }) => void;
searchList: { fnm: string; fid: string }[];
onEnter?: () => void;
className?: string;
}
@@ -59,9 +59,9 @@ export default function SearchInputText({
setHighlightIndex(-1);
};
const handleSelect = (item: { bscFctNm: string; bscFctCd: string }) => {
setText(item.bscFctNm);
setValue(item.bscFctNm);
const handleSelect = (item: { fnm: string; fid: string }) => {
setText(item.fnm);
setValue(item.fnm);
setRtnData(item);
setShowResults(false);
};
@@ -107,7 +107,7 @@ export default function SearchInputText({
}`}
onClick={() => handleSelect(item)}
>
{item.bscFctNm}
{item.fnm}
</div>
))
) : (
+62 -17
View File
@@ -1,4 +1,3 @@
// SearchBar.tsx
"use client";
import { SelectBox, type SelectDataType } from "@common/business_components/ui";
import { Button } from "@common/components/ui";
@@ -23,15 +22,15 @@ const FACILITY_TYPE_URL_MAP: Record<string, string> = {
};
interface SearchBarProps {
onFeatureSelect: (feature: any) => void;
// gisMaps: React.RefObject<any>;
gisMaps: React.RefObject<any>;
facilityTypes: { text: string; val: string }[];
onFeatureFocus: any;
}
export function SearchBar({
onFeatureSelect,
// gisMaps,
gisMaps,
facilityTypes,
onFeatureFocus,
}: SearchBarProps) {
const [sidoValue, setSidoValue] = useState("0");
const [sigunValue, setSigunValue] = useState("0");
@@ -39,9 +38,9 @@ export function SearchBar({
facilityTypes?.length === 1 && facilityTypes[0] ? facilityTypes[0].val : "0"
);
const [fcltyNm, setFcltyNm] = useState("");
const [searchList, setSearchList] = useState<
{ bscFctNm: string; bscFctCd: string }[]
>([]);
const [searchList, setSearchList] = useState<{ fnm: string; fid: string }[]>(
[]
);
const [sidoData, setSidoData] = useState<SelectDataType[]>([
{ text: "시도", val: "0" },
@@ -163,9 +162,7 @@ export function SearchBar({
body: JSON.stringify(procResult),
});
const procJson2 = await procRes2.json();
const procResult2 = (procJson2.data || []).map(
(item: any) => item.bscFctCd
);
const procResult2 = (procJson2.data || []).map((item: any) => item.fid);
//최종 처리시설코드로 재이용시설조회
const res = await fetch(url, {
@@ -220,11 +217,62 @@ export function SearchBar({
const newList = list.map((item: any) => {
const code = item.val;
const name = item.text;
return { bscFctNm: name, bscFctCd: code };
return { fnm: name, fid: code };
});
setSearchList(newList);
};
const moveFocus = (feature: any) => {
// console.log('searchbar:moveFocus')
// const map = gisMaps.current;
// if (!map) {
// console.warn("지도가 초기화되지 않았습니다.");
// return;
// }
// // 항상 같은 select 객체 사용
// const select = GisApp.Module.select as any;
// if (!select) return;
// // 1. 기존 선택 초기화
// select.resetSelectedFeature();
// // 2. data가 OpenLayers Feature 인스턴스인지 확인
// let foundFeature: any = null;
// let featureId = data.fid;
// const layerName = data.layerNm;
// map
// .getLayers()
// .getArray()
// .forEach((layer: any) => {
// const source = layer.getSource?.();
// if (source?.getFeatureById) {
// const feature = source.getFeatureById(String(featureId).trim());
// if (feature) foundFeature = feature;
// }
// });
// // 3. 피처 선택
// if (foundFeature) {
// const geometry = foundFeature.getGeometry();
// if (geometry) {
// const extent = geometry.getExtent();
// map.getView().fit(extent, {
// duration: 300,
// padding: [50, 50, 50, 50],
// maxZoom: 16,
// constrainResolution: true,
// nearest: true,
// });
// }
// // select.selectFeature(foundFeature, true);
// } else {
// console.warn("OpenLayers Feature를 찾을 수 없습니다:", data);
// }
};
return (
<div className="grid grid-cols-4 gap-4">
<div className="col-span-4">
@@ -269,13 +317,10 @@ export function SearchBar({
setValue={(val: string = "") => {
setFcltyNm(val);
}}
setRtnData={(selected: {
bscFctNm: string;
bscFctCd: string;
}) => {
setRtnData={(selected: { fnm: string; fid: string }) => {
// 선택된 항목이 있을 경우 onFeatureSelect 실행
const type = facilityType;
onFeatureSelect({
moveFocus({
layerNm: type,
...selected,
});