|
|
@ -1,33 +1,203 @@
|
|
|
|
import { useState } from 'react';
|
|
|
|
import 'leaflet/dist/leaflet.css';
|
|
|
|
import reactLogo from './assets/react.svg';
|
|
|
|
import 'bootstrap/dist/css/bootstrap.css';
|
|
|
|
import './App.css';
|
|
|
|
|
|
|
|
|
|
|
|
import { MapContainer, TileLayer, LayersControl, Circle, LayerGroup, Popup, Marker } from 'react-leaflet';
|
|
|
|
|
|
|
|
import { Button, Modal, Table } from 'react-bootstrap';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import { useEffect, useState } from 'react';
|
|
|
|
|
|
|
|
import wxService from './services/wx.service';
|
|
|
|
|
|
|
|
import { WxRegion } from '@shared/types/config.types';
|
|
|
|
|
|
|
|
import { WxData } from '../../shared/src/types/wx.types';
|
|
|
|
|
|
|
|
import { DivIcon } from 'leaflet';
|
|
|
|
|
|
|
|
|
|
|
|
function App() {
|
|
|
|
function App() {
|
|
|
|
const [count, setCount] = useState(0);
|
|
|
|
const [showModal, setShowModal] = useState(false);
|
|
|
|
|
|
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const [regions, setRegions] = useState<WxRegion[]>([]);
|
|
|
|
|
|
|
|
const [selectedRegion, setSelectedRegion] = useState<string>('');
|
|
|
|
|
|
|
|
const [wxData, setWxData] = useState<WxData | null>(null);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function getSetShowModal(val: boolean) {
|
|
|
|
|
|
|
|
return () => setShowModal(val);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
|
|
|
if (selectedRegion) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setLoading(true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wxService.getRegions()
|
|
|
|
|
|
|
|
.then(regionsResponse => {
|
|
|
|
|
|
|
|
setRegions(regionsResponse);
|
|
|
|
|
|
|
|
setShowModal(true);
|
|
|
|
|
|
|
|
setLoading(false);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}, []);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
|
|
|
setLoading(true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wxService.getWxData(selectedRegion).then(wxResponse => {
|
|
|
|
|
|
|
|
setWxData(wxResponse);
|
|
|
|
|
|
|
|
setShowModal(false);
|
|
|
|
|
|
|
|
setLoading(false);
|
|
|
|
|
|
|
|
console.log(wxResponse);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}, [selectedRegion]);
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<div className="App">
|
|
|
|
<>
|
|
|
|
<div>
|
|
|
|
<Modal
|
|
|
|
<a href="https://vitejs.dev" target="_blank">
|
|
|
|
show={showModal}
|
|
|
|
<img src="/vite.svg" className="logo" alt="Vite logo" />
|
|
|
|
backdrop="static"
|
|
|
|
</a>
|
|
|
|
keyboard={false}
|
|
|
|
<a href="https://reactjs.org" target="_blank">
|
|
|
|
>
|
|
|
|
<img src={reactLogo} className="logo react" alt="React logo" />
|
|
|
|
<Modal.Header closeButton>
|
|
|
|
</a>
|
|
|
|
<Modal.Title>Regions</Modal.Title>
|
|
|
|
</div>
|
|
|
|
</Modal.Header>
|
|
|
|
<h1>Vite + React</h1>
|
|
|
|
<Modal.Body>
|
|
|
|
<div className="card">
|
|
|
|
<Table striped>
|
|
|
|
<button onClick={() => setCount(count + 1)}>
|
|
|
|
<thead>
|
|
|
|
count is {count}
|
|
|
|
<tr>
|
|
|
|
</button>
|
|
|
|
<th>#</th>
|
|
|
|
<p>
|
|
|
|
</tr>
|
|
|
|
Edit <code>src/App.tsx</code> and save to test HMR
|
|
|
|
</thead>
|
|
|
|
</p>
|
|
|
|
<tbody>
|
|
|
|
|
|
|
|
{regions.length ? regions.map((region, idx) => <tr key={idx}>
|
|
|
|
|
|
|
|
<td>{idx + 1}</td>
|
|
|
|
|
|
|
|
<td>{region.identifier}</td>
|
|
|
|
|
|
|
|
<td>{region.fixes.length} Fixes</td>
|
|
|
|
|
|
|
|
<td><Button variant='primary' type='button' onClick={() => setSelectedRegion(region.identifier)}>Select</Button></td>
|
|
|
|
|
|
|
|
</tr>) : <>
|
|
|
|
|
|
|
|
<tr><td className='p-2 text-center' colSpan={5}>- no regions defined -</td></tr>
|
|
|
|
|
|
|
|
</>}
|
|
|
|
|
|
|
|
</tbody>
|
|
|
|
|
|
|
|
</Table>
|
|
|
|
|
|
|
|
</Modal.Body>
|
|
|
|
|
|
|
|
</Modal>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div className='position-absolute bottom-0 p-2' style={{ zIndex: 999 }}>
|
|
|
|
|
|
|
|
<Button variant='outline-secondary' type='button' onClick={getSetShowModal(true)}>↗ {selectedRegion && `(Selected: ${selectedRegion})`}</Button>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<p className="read-the-docs">
|
|
|
|
|
|
|
|
Click on the Vite and React logos to learn more
|
|
|
|
<MapContainer style={{ height: '100vh', width: '100vw' }} center={[50.033306, 8.570456]} zoom={7} scrollWheelZoom={true}>
|
|
|
|
</p>
|
|
|
|
<TileLayer
|
|
|
|
</div>
|
|
|
|
url='https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png'
|
|
|
|
|
|
|
|
attribution={[
|
|
|
|
|
|
|
|
'<a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>',
|
|
|
|
|
|
|
|
'<a href="https://carto.com/attributions" target="_blank">CARTO</a>',
|
|
|
|
|
|
|
|
'Weather data by Open-Meteo.com (<a href="https://open-meteo.com" target="_blank">open-meteo.com</a>)',
|
|
|
|
|
|
|
|
'IASsure-WX: <a href="https://fsperath.de" target="_blank">Fionn Sperath</a> and <a href="https://github.com/dotFionn/iassure-wx/graphs/contributors" target="_blank">contributors</a>',
|
|
|
|
|
|
|
|
].map(str => `© ${str}`).join(' | ')}
|
|
|
|
|
|
|
|
subdomains={'abc'}
|
|
|
|
|
|
|
|
maxZoom={20}
|
|
|
|
|
|
|
|
minZoom={0}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<LayersControl position='topright'>
|
|
|
|
|
|
|
|
<LayersControl.Overlay checked name='Enable labels'>
|
|
|
|
|
|
|
|
<TileLayer
|
|
|
|
|
|
|
|
url='https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png'
|
|
|
|
|
|
|
|
subdomains={'abc'}
|
|
|
|
|
|
|
|
maxZoom={20}
|
|
|
|
|
|
|
|
minZoom={0}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</LayersControl.Overlay>
|
|
|
|
|
|
|
|
<LayersControl.Overlay checked name="Points">
|
|
|
|
|
|
|
|
<LayerGroup>
|
|
|
|
|
|
|
|
{/* {dots.map((dot, index) => <Circle key={index} center={dot.pos} radius={400} pathOptions={{ fillColor: dot.color, color: dot.color }}>
|
|
|
|
|
|
|
|
<Popup>{dot.label}</Popup>
|
|
|
|
|
|
|
|
</Circle>)} */}
|
|
|
|
|
|
|
|
{Object.entries(wxData?.data || {}).map(([fix, data], idx) => (
|
|
|
|
|
|
|
|
<>
|
|
|
|
|
|
|
|
{/* <Circle key={idx} center={[Number(data.coords.lat), Number(data.coords.long)]} radius={5000} pathOptions={{ fillColor: 'green', color: 'green', fillOpacity: 1 }}>
|
|
|
|
|
|
|
|
<Popup>
|
|
|
|
|
|
|
|
<Table>
|
|
|
|
|
|
|
|
<thead>
|
|
|
|
|
|
|
|
<tr><th colSpan={3} className='text-center'>{fix}</th></tr>
|
|
|
|
|
|
|
|
<tr><th>Lvl</th><th>Temp/K</th><th>Wind</th></tr>
|
|
|
|
|
|
|
|
</thead>
|
|
|
|
|
|
|
|
<tbody>
|
|
|
|
|
|
|
|
{Object.entries(data.levels).map(([lvl, lvlData], lvlIdx) => (
|
|
|
|
|
|
|
|
<tr key={lvlIdx}>
|
|
|
|
|
|
|
|
<td>{lvl}</td>
|
|
|
|
|
|
|
|
<td>{Math.round(Number(lvlData['T(K)']))}</td>
|
|
|
|
|
|
|
|
<td>{lvlData.windhdg}° / {lvlData.windspeed}kts</td>
|
|
|
|
|
|
|
|
</tr>
|
|
|
|
|
|
|
|
))}
|
|
|
|
|
|
|
|
</tbody>
|
|
|
|
|
|
|
|
</Table>
|
|
|
|
|
|
|
|
</Popup>
|
|
|
|
|
|
|
|
</Circle> */}
|
|
|
|
|
|
|
|
<Marker
|
|
|
|
|
|
|
|
position={[Number(data.coords.lat), Number(data.coords.long)]}
|
|
|
|
|
|
|
|
key={fix}
|
|
|
|
|
|
|
|
title={fix}
|
|
|
|
|
|
|
|
icon={new DivIcon({ html: `⨀ <span class="fw-bold">${fix}</span>`, className: 'bg-none text-warning' })}
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<Popup>
|
|
|
|
|
|
|
|
<Table>
|
|
|
|
|
|
|
|
<thead>
|
|
|
|
|
|
|
|
<tr><th colSpan={3} className='text-center'>{fix}</th></tr>
|
|
|
|
|
|
|
|
<tr><th>Lvl</th><th>Temp/K</th><th>Wind</th></tr>
|
|
|
|
|
|
|
|
</thead>
|
|
|
|
|
|
|
|
<tbody>
|
|
|
|
|
|
|
|
{Object.entries(data.levels).map(([lvl, lvlData], lvlIdx) => (
|
|
|
|
|
|
|
|
<tr key={lvlIdx}>
|
|
|
|
|
|
|
|
<td>{lvl}</td>
|
|
|
|
|
|
|
|
<td>{Math.round(Number(lvlData['T(K)']))}</td>
|
|
|
|
|
|
|
|
<td>{lvlData.windhdg}° / {lvlData.windspeed}kts</td>
|
|
|
|
|
|
|
|
</tr>
|
|
|
|
|
|
|
|
))}
|
|
|
|
|
|
|
|
</tbody>
|
|
|
|
|
|
|
|
</Table>
|
|
|
|
|
|
|
|
</Popup>
|
|
|
|
|
|
|
|
</Marker>
|
|
|
|
|
|
|
|
</>
|
|
|
|
|
|
|
|
))}
|
|
|
|
|
|
|
|
</LayerGroup>
|
|
|
|
|
|
|
|
</LayersControl.Overlay>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{/* {populatedRoutes.filter(r => !!r).map((populatedRoute, idx) => {
|
|
|
|
|
|
|
|
if (!populatedRoute) {
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const line: [number, number][] = [];
|
|
|
|
|
|
|
|
const dots: { pos: [number, number], color: string, label: string }[] = [];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (populatedRoute.adep) {
|
|
|
|
|
|
|
|
line.push([populatedRoute.adep.lat, populatedRoute.adep.lon]);
|
|
|
|
|
|
|
|
dots.push({ pos: [populatedRoute.adep.lat, populatedRoute.adep.lon], color: 'red', label: `${populatedRoute.adep.icao} / ${populatedRoute.adep.name}` });
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (const point of populatedRoute.points) {
|
|
|
|
|
|
|
|
line.push([point.lat, point.lon]);
|
|
|
|
|
|
|
|
dots.push({ pos: [point.lat, point.lon], color: 'blue', label: point.identifier });
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (populatedRoute.ades) {
|
|
|
|
|
|
|
|
line.push([populatedRoute.ades.lat, populatedRoute.ades.lon]);
|
|
|
|
|
|
|
|
dots.push({ pos: [populatedRoute.ades.lat, populatedRoute.ades.lon], color: 'green', label: [populatedRoute.ades.icao, populatedRoute.ades.name].join(' ') });
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return <LayersControl.Overlay checked name={`${populatedRoute.adep?.icao}${populatedRoute.ades?.icao}`} key={idx}>
|
|
|
|
|
|
|
|
<LayerGroup>
|
|
|
|
|
|
|
|
<Polyline pathOptions={{ color: 'yellow' }} positions={line} />
|
|
|
|
|
|
|
|
{dots.map((dot, index) => <Circle key={index} center={dot.pos} radius={400} pathOptions={{ fillColor: dot.color, color: dot.color }}>
|
|
|
|
|
|
|
|
<Popup>{dot.label}</Popup>
|
|
|
|
|
|
|
|
</Circle>)}
|
|
|
|
|
|
|
|
</LayerGroup>
|
|
|
|
|
|
|
|
</LayersControl.Overlay>;
|
|
|
|
|
|
|
|
})} */}
|
|
|
|
|
|
|
|
</LayersControl>
|
|
|
|
|
|
|
|
</MapContainer>
|
|
|
|
|
|
|
|
</>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|