pav
/
pav-fe-tp-pal
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

laanc 비행구역 선택좌표 표출

pull/2/head
junh_eee(이준희) 11 months ago
parent
4fcd3faaee
commit
43dc3a8359
2 changed files with 60 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/components/map/mapbox/draw/LaancDrawControl.js
  2. 174
      src/views/laanc/LaancAreaMap.js

6
src/components/map/mapbox/draw/LaancDrawControl.js
Unescape View File

@ -47,10 +47,6 @@ export const LaancDrawControl = props => {
// if (areaType !== drawType) drawInit(); // if (areaType !== drawType) drawInit();
}, [mapControl.drawType]); }, [mapControl.drawType]);
// useEffect(() => {
// console.log(props.areaCoordList[0], '-----------');
// }, [props.areaCoordList]);
useEffect(() => { useEffect(() => {
if (mapObject) { if (mapObject) {
mapObject.on('draw.update', handlerUpdateSetting); mapObject.on('draw.update', handlerUpdateSetting);
@ -331,6 +327,7 @@ export const LaancDrawControl = props => {
const obj = drawObj const obj = drawObj
.getAll() .getAll()
.features.filter(obj => obj.properties.id !== 'BUFFER'); .features.filter(obj => obj.properties.id !== 'BUFFER');
props.setViewCoordObj(obj);
if (obj.length > 1) { if (obj.length > 1) {
props.handlerAddChange('overAdd', true); props.handlerAddChange('overAdd', true);
} else { } else {
@ -473,6 +470,7 @@ export const LaancDrawControl = props => {
props.handlerAddChange('isAddable', false); props.handlerAddChange('isAddable', false);
props.handlerAddChange('isViewAdd', false); props.handlerAddChange('isViewAdd', false);
props.handlerAddChange('overAdd', false); props.handlerAddChange('overAdd', false);
props.setViewCoordObj([]);
drawObj.deleteAll(); drawObj.deleteAll();
handlerRemoveAllMarker(); handlerRemoveAllMarker();
return; return;

174
src/views/laanc/LaancAreaMap.js
Unescape View File

@ -319,156 +319,88 @@ export default function LaancAreaMap({
<div style={{ position: 'relative' }}> <div style={{ position: 'relative' }}>
<LaancMapSearch mapObject={mapObject} /> <LaancMapSearch mapObject={mapObject} />
<div className='d-flex coords-wrap'> <div className='d-flex coords-wrap'>
{mapObject ? ( {mapObject && viewCoordObj.length > 0 ? (
<div className='coords-box'> <div className='coords-box'>
{drawObj.getAll().features.length > 1 {viewCoordObj?.map((obj, i) => {
? drawObj
.getAll()
.features.filter(obj => obj.properties.id !== 'BUFFER')
.map((obj, i) => {
const coord = const coord =
obj.properties.id === 'LINE' obj.properties.id === 'LINE'
? obj.geometry.coordinates ? obj.geometry.coordinates
: obj.geometry.coordinates[0]; : obj.geometry.coordinates[0];
// console.log(coord, '>>>>>>>>>.');
return ( return (
<div> <div>
<h6 className='ti'>비행구역 {i + 1}</h6> <h6 className='ti'>비행구역 {i + 1}</h6>
<div className='coords-box-scroll'> <div className='coords-box-scroll'>
{coord?.map((co, idx) => {
if (idx + 1 < coord.length) {
const fCoord = FormattingCoord(co);
const current = fCoord.join(', ');
const next = FormattingCoord(
coord[idx + 1].join(', ')
);
// console.log(coord[idx + 1], '---next');
return (
<div className='coords-box-list'> <div className='coords-box-list'>
<span> <span key={idx}>
<span>12,55557778</span>,<span> 34,55557778</span> <span>{current}</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span> <span className='etc'>/</span>
<span> <span>{next}</span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span> </span>
</div> </div>
<div className='coords-box-list'> );
<span> }
<span>12,55557778</span>,<span> 34,55557778</span> })}
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div> </div>
<div className='coords-box-list'>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div> </div>
<div className='coords-box-list'> );
<span> })}
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
<span className='etc'>/</span>
<span>
<span>12,55557778</span>,<span> 34,55557778</span>
</span>
</div> </div>
) : null}
{/* {mapObject ? (
<div className='coords-box'>
{drawObj.getAll().features.length > 1
? drawObj
.getAll()
.features.filter(obj => obj.properties.id !== 'BUFFER')
.map((obj, i) => {
const coord =
obj.properties.id === 'LINE'
? obj.geometry.coordinates
: obj.geometry.coordinates[0];
return (
<div>
<h6 className='ti'>비행구역 {i + 1}</h6>
<div className='coords-box-scroll'>
{coord?.map((co, idx) => {
if (idx + 1 < coord.length) {
const fCoord = FormattingCoord(co);
const current = fCoord.join(', ');
const next = FormattingCoord(
coord[idx + 1]
).join(', ');
return (
<div className='coords-box-list'> <div className='coords-box-list'>
<span> <span key={idx}>
<span>12,55557778</span>,<span> 34,55557778</span> <span>{current}</span>
</span>
<span className='etc'>/</span> <span className='etc'>/</span>
<span> <span>{next}</span>
<span>12,55557778</span>,{''}<span> 34,55557778</span>
</span> </span>
</div> </div>
{/* {coord?.map(co => {
const fCoord = FormattingCoord(co);
if (fCoord) {
return (
<span>
<span>{fCoord[0]}, {fCoord[1]}</span>
</span>
); );
} }
})} */} return null;
})}
</div> </div>
</div> </div>
); );
}) })
: null} : null}
</div> </div>
) : null} ) : null} */}
</div> </div>
<div <div
id='detail' id='detail'

Write Preview
Loading…
Cancel
Save