Skip to content

Commit

Permalink
Adjust the color-by controls and remove the now-empty top-right panel
Browse files Browse the repository at this point in the history
  • Loading branch information
dabreegster committed Oct 2, 2024
1 parent f3ad5e8 commit 12dbe11
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 49 deletions.
60 changes: 28 additions & 32 deletions src/lib/browse/schemes/SchemesLayer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,23 @@
</span>
</Checkbox>

<div style="display: flex; justify-content: space-between;">
<Filters
source="ATF"
bind:schemesGj={$atfSchemesGj}
bind:schemes={$atfSchemes}
bind:filterSchemeText={$filterAtfSchemeText}
bind:filterInterventionText={$filterAtfInterventionText}
/>
<Filters
source="ATF"
bind:schemesGj={$atfSchemesGj}
bind:schemes={$atfSchemes}
bind:filterSchemeText={$filterAtfSchemeText}
bind:filterInterventionText={$filterAtfInterventionText}
/>

<Select
label="Colour interventions"
choices={[
["fundingProgramme", "By funding programme"],
["interventionType", "By intervention type"],
["currentMilestone", "By current milestone"],
]}
bind:value={atfStyle}
/>
</div>
<Select
label="Colour interventions"
choices={[
["fundingProgramme", "By funding programme"],
["interventionType", "By intervention type"],
["currentMilestone", "By current milestone"],
]}
bind:value={atfStyle}
/>
<Legend rows={atfLegend} />
{/if}

Expand All @@ -133,21 +131,19 @@
</span>
</Checkbox>

<div style="display: flex; justify-content: space-between;">
<Filters
source="LCWIP"
bind:schemesGj={$lcwipSchemesGj}
bind:schemes={$lcwipSchemes}
bind:filterSchemeText={$filterLcwipSchemeText}
bind:filterInterventionText={$filterLcwipInterventionText}
/>
<Filters
source="LCWIP"
bind:schemesGj={$lcwipSchemesGj}
bind:schemes={$lcwipSchemes}
bind:filterSchemeText={$filterLcwipSchemeText}
bind:filterInterventionText={$filterLcwipInterventionText}
/>

<Select
label="Colour interventions"
choices={[["interventionType", "By intervention type"]]}
bind:value={lcwipStyle}
/>
</div>
<Select
label="Colour interventions"
choices={[["interventionType", "By intervention type"]]}
bind:value={lcwipStyle}
/>
<Legend rows={lcwipLegend} />
{/if}

Expand Down
18 changes: 1 addition & 17 deletions src/pages/BrowseSchemes.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,8 @@
<MapLibreMap style={$mapStyle} startBounds={[-5.96, 49.89, 2.31, 55.94]}>
<Geocoder />
{#if $sketchMapStore}
<div class="top-right">
<LayerControls />
</div>
<LayerControls />
{/if}
</MapLibreMap>
</div>
</Layout>

<style>
.top-right {
position: absolute;
right: 10px;
top: 10px;
background-color: white;
padding: 16px;
/* Leave room at the bottom for some of the map controls */
max-height: calc(100vh - 200px);
overflow: auto;
max-width: 450px;
}
</style>

0 comments on commit 12dbe11

Please sign in to comment.