From 8d9bbc5b880ee82a4dcc476f18d6aea36ea58132 Mon Sep 17 00:00:00 2001 From: "Kalle (Sendou)" <38327916+Sendouc@users.noreply.github.com> Date: Mon, 10 May 2021 02:20:08 +0300 Subject: [PATCH] Add blank canvas option for Map Planner Closes #483 --- components/plans/StageSelector.tsx | 4 +++- pages/plans.tsx | 21 +++++++++++++++------ public/images/plannerMaps/Blank.png | Bin 0 -> 55470 bytes 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 public/images/plannerMaps/Blank.png diff --git a/components/plans/StageSelector.tsx b/components/plans/StageSelector.tsx index 98c6a75d1..6b4ef41da 100644 --- a/components/plans/StageSelector.tsx +++ b/components/plans/StageSelector.tsx @@ -43,13 +43,15 @@ const StageSelector: React.FC = ({ {salmonRunStages .concat(stages) .sort((a, b) => a.localeCompare(b)) + .concat(["Blank"]) .map((stage) => ( ))} - {currentBackground.tide ? ( + {!currentBackground.tide && + !currentBackground.mode ? null : currentBackground.tide ? ( <> diff --git a/pages/plans.tsx b/pages/plans.tsx index 6d87c5a15..cd27cac1b 100644 --- a/pages/plans.tsx +++ b/pages/plans.tsx @@ -54,6 +54,9 @@ const stageToCode = new Map([ ]); const plannerMapBgToImage = (bg: PlannerMapBg) => { + if (!bg.tide && !bg.mode) { + return `images/plannerMaps/${bg.stage}.png`; + } if (!bg.tide) return `images/plannerMaps/${bg.view} ${stageToCode.get(bg.stage)} ${ bg.mode @@ -339,24 +342,30 @@ const MapPlannerPage = () => { { - const newStage = e.target.value; - if (newStage === "") { + const stage = e.target.value; + if (stage === "") { return; } - const newIsSalmonRunStage = !stages.includes(newStage as any); + + if (stage === "Blank") { + setBg({ stage }); + return; + } + + const newIsSalmonRunStage = !stages.includes(stage as any); const oldIsSalmonRunStage = !stages.includes(bg.stage as any); if (newIsSalmonRunStage === oldIsSalmonRunStage) { - setBg({ ...bg, stage: e.target.value }); + setBg({ ...bg, stage }); return; } if (newIsSalmonRunStage) { - setBg({ stage: e.target.value, tide: "mid" }); + setBg({ stage, tide: "mid" }); return; } - setBg({ stage: e.target.value, mode: "SZ", view: "M" }); + setBg({ stage, mode: "SZ", view: "M" }); }} currentBackground={bg} changeMode={(mode) => setBg({ ...bg, mode })} diff --git a/public/images/plannerMaps/Blank.png b/public/images/plannerMaps/Blank.png new file mode 100644 index 0000000000000000000000000000000000000000..1441d78d2300e71f68242adf22965d9e3bcdcf71 GIT binary patch literal 55470 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 literal 0 HcmV?d00001