From 8b8f9942e3fe6a39ddbf867de57f77157024939e Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Tue, 22 Oct 2024 13:36:19 +0100 Subject: [PATCH] Move draw controls into the map toolbox, out of the sidebar --- assets/help.svg | 1 - package-lock.json | 6 +++--- package.json | 2 +- src/lib/common/HelpButton.svelte | 31 --------------------------- src/lib/common/index.ts | 3 +-- src/lib/sketch/EditFeatureForm.svelte | 6 ++++-- src/lib/sketch/config.ts | 4 ++-- src/pages/SketchSchemes.svelte | 19 ++++++++-------- 8 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 assets/help.svg delete mode 100644 src/lib/common/HelpButton.svelte diff --git a/assets/help.svg b/assets/help.svg deleted file mode 100644 index f7ffc5da2..000000000 --- a/assets/help.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2b54b8a8e..baca39008 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "humanize-string": "^3.0.0", "js-cookie": "^3.0.5", "maplibre-gl": "^4.0.2", - "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib", + "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib#move_draw_controls", "svelte": "^4.2.10", "svelte-maplibre": "^0.9.7", "uuid": "^9.0.1" @@ -2526,7 +2526,7 @@ }, "node_modules/govuk-svelte": { "version": "0.0.1", - "resolved": "git+ssh://git@github.com/acteng/govuk-svelte.git#2a9ab3754ed5af6958e999268e2fd1785852fe5a", + "resolved": "git+ssh://git@github.com/acteng/govuk-svelte.git#15e95e077a5ce0cb34c729443407c5436f51bbf0", "dependencies": { "govuk-frontend": "^5.4.1", "sass": "^1.77.8", @@ -3794,7 +3794,7 @@ }, "node_modules/scheme-sketcher-lib": { "version": "0.0.1", - "resolved": "git+ssh://git@github.com/acteng/scheme-sketcher-lib.git#534f48402fc3013e8ec628ed463ae565b90d9aaf", + "resolved": "git+ssh://git@github.com/acteng/scheme-sketcher-lib.git#93ed618be8e5dbbb12298b02b6252f65ac6fe08d", "dependencies": { "@maptiler/geocoding-control": "1.2.3", "@turf/mask": "^7.0.0", diff --git a/package.json b/package.json index b144d448d..75a730d67 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "humanize-string": "^3.0.0", "js-cookie": "^3.0.5", "maplibre-gl": "^4.0.2", - "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib", + "scheme-sketcher-lib": "github:acteng/scheme-sketcher-lib#move_draw_controls", "svelte": "^4.2.10", "svelte-maplibre": "^0.9.7", "uuid": "^9.0.1" diff --git a/src/lib/common/HelpButton.svelte b/src/lib/common/HelpButton.svelte deleted file mode 100644 index a11c0c0d9..000000000 --- a/src/lib/common/HelpButton.svelte +++ /dev/null @@ -1,31 +0,0 @@ - - - - - -
- -
- - - diff --git a/src/lib/common/index.ts b/src/lib/common/index.ts index 6caa271ea..c20502a92 100644 --- a/src/lib/common/index.ts +++ b/src/lib/common/index.ts @@ -7,7 +7,6 @@ export { default as ColorLegend } from "./ColorLegend.svelte"; export { default as ExternalLink } from "./ExternalLink.svelte"; export { default as Geocoder } from "./Geocoder.svelte"; export { default as Header } from "./Header.svelte"; -export { default as HelpButton } from "./HelpButton.svelte"; export { default as Layout } from "./Layout.svelte"; export { default as Legend } from "./Legend.svelte"; export { default as LineMeasureTool } from "./LineMeasureTool.svelte"; @@ -16,7 +15,7 @@ export { default as Popup } from "./Popup.svelte"; export { default as MapLibreMap } from "./MapLibreMap.svelte"; export { default as ZoomOutMap } from "./ZoomOutMap.svelte"; export * from "./storage"; -export { Modal, WarningIcon } from "scheme-sketcher-lib/common"; +export { HelpButton, Modal, WarningIcon } from "scheme-sketcher-lib/common"; export async function getAuthoritiesGeoJson(): Promise { let resp = await fetch(authoritiesUrl); diff --git a/src/lib/sketch/EditFeatureForm.svelte b/src/lib/sketch/EditFeatureForm.svelte index e40efc3cd..ecf6eeec0 100644 --- a/src/lib/sketch/EditFeatureForm.svelte +++ b/src/lib/sketch/EditFeatureForm.svelte @@ -10,14 +10,16 @@ export let cfg: Config; export let gjSchemes: Writable; - export let id: number; + export let id: number | null; export let props: FeatureProps; // Workaround unused var warning cfg; - +{#if id != null} + +{/if} {#if $schema == "v1"} {:else if $schema == "pipeline"} diff --git a/src/lib/sketch/config.ts b/src/lib/sketch/config.ts index b8afb1df3..92d897474 100644 --- a/src/lib/sketch/config.ts +++ b/src/lib/sketch/config.ts @@ -41,12 +41,12 @@ export let cfg: Config = { }, newLineStringFeature: (f) => { f.properties.intervention_type = "route"; - if (f.properties.route_name) { + if (f.properties.route_name && !f.properties.name) { if (get(schemaStore) != "pipeline") { f.properties.name = f.properties.route_name; } - delete f.properties.route_name; } + delete f.properties.route_name; }, updateFeature: (destination, source) => { diff --git a/src/pages/SketchSchemes.svelte b/src/pages/SketchSchemes.svelte index e33885ba1..ec0366f4e 100644 --- a/src/pages/SketchSchemes.svelte +++ b/src/pages/SketchSchemes.svelte @@ -9,8 +9,8 @@ InterventionLayer, PolygonToolLayer, RouteSnapperLayer, - SplitRouteMode, Toolbox, + NewFeatureForm, } from "scheme-sketcher-lib/draw"; import { appVersion, @@ -28,7 +28,7 @@ import About from "lib/sketch/About.svelte"; import FileManagement from "lib/sketch/FileManagement.svelte"; import Instructions from "lib/sketch/Instructions.svelte"; - import { PerModeControls } from "scheme-sketcher-lib/sidebar"; + import { ListMode, EditForm } from "scheme-sketcher-lib/sidebar"; import { map, mapStyle, schema } from "stores"; import { onMount } from "svelte"; import { cfg } from "lib/sketch/config"; @@ -97,7 +97,6 @@ return authorityName; } - // Need this to set up PerModeControls $: if ($map) { sketchMapStore.set($map); } @@ -128,7 +127,13 @@ {/if} - + {#if $mode.mode == "list"} + + {:else if $mode.mode == "edit-form"} + + {:else if $mode.mode == "new-point" || $mode.mode == "new-freehand-polygon" || $mode.mode == "new-snapped-polygon" || $mode.mode == "new-route"} + + {/if} {#if $mode.mode != "list"}
{/if} @@ -141,11 +146,7 @@ - {#if $mode.mode == "list"} - - {:else if $mode.mode == "split-route"} - - {/if} + {/if}