midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

UI: remove flow

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-12-15 22:48:27 +01:00
parent a55bd55b46
commit 45a30f8ebf
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/UI/ThemeViewGUI.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { Store, UIEventSource } from "../Logic/UIEventSource" import { ImmutableStore, Store, UIEventSource } from "../Logic/UIEventSource"
import { Map as MlMap } from "maplibre-gl" import { Map as MlMap } from "maplibre-gl"
import MaplibreMap from "./Map/MaplibreMap.svelte" import MaplibreMap from "./Map/MaplibreMap.svelte"
import FeatureSwitchState from "../Logic/State/FeatureSwitchState" import FeatureSwitchState from "../Logic/State/FeatureSwitchState"
@ -105,11 +105,11 @@
let canZoomIn = mapproperties.maxzoom.map( let canZoomIn = mapproperties.maxzoom.map(
(mz) => mapproperties.zoom.data < mz, (mz) => mapproperties.zoom.data < mz,
[mapproperties.zoom] [mapproperties.zoom],
) )
let canZoomOut = mapproperties.minzoom.map( let canZoomOut = mapproperties.minzoom.map(
(mz) => mapproperties.zoom.data > mz, (mz) => mapproperties.zoom.data > mz,
[mapproperties.zoom] [mapproperties.zoom],
) )
let rasterLayerName = let rasterLayerName =
@ -118,7 +118,7 @@
onDestroy( onDestroy(
rasterLayer.addCallbackAndRunD((l) => { rasterLayer.addCallbackAndRunD((l) => {
rasterLayerName = l.properties.name rasterLayerName = l.properties.name
}) }),
) )
debug.addCallbackAndRun((dbg) => { debug.addCallbackAndRun((dbg) => {
@ -165,6 +165,8 @@
const animation = mlmap.keyboard?.keydown(e) const animation = mlmap.keyboard?.keydown(e)
animation?.cameraAnimation(mlmap) animation?.cameraAnimation(mlmap)
} }
let apiState = state?.osmConnection?.apiIsOnline ?? new ImmutableStore("online")
</script> </script>
<main> <main>
@ -173,7 +175,7 @@
<MaplibreMap map={maplibremap} mapProperties={mapproperties} autorecovery={true} /> <MaplibreMap map={maplibremap} mapProperties={mapproperties} autorecovery={true} />
</div> </div>
<LoginToggle ignoreLoading={true} {state}> <LoginToggle ignoreLoading={true} silentFail {state}>
{#if ($showCrosshair === "yes" && $currentZoom >= 17) || $showCrosshair === "always" || $visualFeedback} {#if ($showCrosshair === "yes" && $currentZoom >= 17) || $showCrosshair === "always" || $visualFeedback}
<!-- Don't use h-full: h-full does _not_ include the area under the URL-bar, which offsets the crosshair a bit --> <!-- Don't use h-full: h-full does _not_ include the area under the URL-bar, which offsets the crosshair a bit -->
<div <div
@ -216,7 +218,8 @@
{#if $currentZoom < Constants.minZoomLevelToAddNewPoint} {#if $currentZoom < Constants.minZoomLevelToAddNewPoint}
<Tr t={Translations.t.general.add.zoomInFurther} /> <Tr t={Translations.t.general.add.zoomInFurther} />
{:else if state.theme.hasPresets()} {:else if state.theme.hasPresets()}
✨ <Tr t={Translations.t.general.add.title} /> ✨
<Tr t={Translations.t.general.add.title} />
{:else} {:else}
<Tr t={Translations.t.notes.createNote} /> <Tr t={Translations.t.notes.createNote} />
{/if} {/if}
@ -417,6 +420,9 @@
<If condition={state.featureSwitches.featureSwitchFakeUser}> <If condition={state.featureSwitches.featureSwitchFakeUser}>
<div class="alert w-fit">Faking a user (Testmode)</div> <div class="alert w-fit">Faking a user (Testmode)</div>
</If> </If>
{#if $apiState !== "online"}
<div class="alert w-fit">API is {$apiState}</div>
{/if}
</div> </div>
<div class="flex w-full flex-col items-center justify-center"> <div class="flex w-full flex-col items-center justify-center">
@ -427,11 +433,13 @@
</div> </div>
</div> </div>
<DrawerLeft shown={state.guistate.pageStates.menu}> <div class="h-full overflow-hidden">
<div class="h-screen overflow-y-auto"> <DrawerLeft shown={state.guistate.pageStates.menu}>
<MenuDrawer onlyLink={true} {state} /> <div class="h-screen overflow-y-auto">
</div> <MenuDrawer onlyLink={true} {state} />
</DrawerLeft> </div>
</DrawerLeft>
</div>
{#if $selectedElement !== undefined && $selectedLayer !== undefined && !$selectedLayer.popupInFloatover} {#if $selectedElement !== undefined && $selectedLayer !== undefined && !$selectedLayer.popupInFloatover}
<!-- right modal with the selected element view --> <!-- right modal with the selected element view -->