mirror of
https://github.com/dcs-retribution/dcs-retribution.git
synced 2025-11-10 15:41:24 +00:00
Clean up leaflet polygon API surface.
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
import { Flight } from "../../api/flight";
|
||||
import { useGetCommitBoundaryForFlightQuery } from "../../api/liberationApi";
|
||||
import WaypointMarker from "../waypointmarker";
|
||||
import { LatLng } from "leaflet";
|
||||
import { ReactElement } from "react";
|
||||
import { Polyline } from "react-leaflet";
|
||||
|
||||
@@ -83,15 +82,8 @@ function CommitBoundary(props: CommitBoundaryProps) {
|
||||
);
|
||||
return <></>;
|
||||
}
|
||||
// TODO: Fix the response model and clean up.
|
||||
const positions = data.map(([lat, lng]) => new LatLng(lat, lng));
|
||||
return (
|
||||
<Polyline
|
||||
positions={positions}
|
||||
color="#ffff00"
|
||||
weight={1}
|
||||
interactive={false}
|
||||
/>
|
||||
<Polyline positions={data} color="#ffff00" weight={1} interactive={false} />
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { selectNavMeshes } from "../../api/navMeshSlice";
|
||||
import { useAppSelector } from "../../app/hooks";
|
||||
import { LatLng } from "leaflet";
|
||||
import { LayerGroup, Polygon } from "react-leaflet";
|
||||
|
||||
interface NavMeshLayerProps {
|
||||
@@ -13,11 +12,10 @@ export default function NavMeshLayer(props: NavMeshLayerProps) {
|
||||
return (
|
||||
<LayerGroup>
|
||||
{mesh.map((zone, idx) => {
|
||||
const positions = zone.poly.map(([lat, lng]) => new LatLng(lat, lng));
|
||||
return (
|
||||
<Polygon
|
||||
key={idx}
|
||||
positions={positions}
|
||||
positions={zone.poly}
|
||||
color="#000000"
|
||||
weight={1}
|
||||
fill
|
||||
|
||||
@@ -1,18 +1,16 @@
|
||||
import { LatLng } from "leaflet";
|
||||
import { LatLng } from "../../api/liberationApi";
|
||||
import { Polygon } from "react-leaflet";
|
||||
|
||||
interface ThreatZoneProps {
|
||||
poly: number[][];
|
||||
poly: LatLng[];
|
||||
blue: boolean;
|
||||
}
|
||||
|
||||
export default function ThreatZone(props: ThreatZoneProps) {
|
||||
const color = props.blue ? "#0084ff" : "#c85050";
|
||||
// TODO: Fix response model so the type can be used directly.
|
||||
const positions = props.poly.map(([lat, lng]) => new LatLng(lat, lng));
|
||||
return (
|
||||
<Polygon
|
||||
positions={positions}
|
||||
positions={props.poly}
|
||||
color={color}
|
||||
weight={1}
|
||||
fill
|
||||
|
||||
Reference in New Issue
Block a user