Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename the layers to layerToggles #297

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Rename the layers to layerToggles #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
931df6e
Rename the layers to layerToggles
Pete-Y-CS Jul 28, 2023
813b0ca
Rebase and rename to layerControl from layerToggle
Pete-Y-CS Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/lib/browse/HospitalsLayer.svelte → src/lib/browse/HospitalsLayerControl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<script lang="ts">
import { ExternalLink } from "../common";
import OptionalLayer from "./OptionalLayer.svelte";
import PolygonAmenityLayerControl from "./PolygonAmenityLayerControl.svelte";
</script>

<OptionalLayer name="hospitals" singularNoun="hospital" pluralNoun="Hospitals">
<PolygonAmenityLayerControl
name="hospitals"
singularNoun="hospital"
pluralNoun="Hospitals"
>
<p>
This shows <ExternalLink
href="https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital"
Expand All @@ -17,4 +21,4 @@
Open Data Commons Open Database License
</ExternalLink>
</p>
</OptionalLayer>
</PolygonAmenityLayerControl>
0 src/lib/browse/MrnLayer.svelte → src/lib/browse/MrnLayerControl.svelte
View file
Open in desktop
File renamed without changes.
0 ...e/ParliamentaryConstituenciesLayer.svelte → ...amentaryConstituenciesLayerControl.svelte
View file
Open in desktop
File renamed without changes.
0 src/lib/browse/OptionalLayer.svelte → .../browse/PolygonAmenityLayerControl.svelte
View file
Open in desktop
File renamed without changes.
10 changes: 7 additions & 3 deletions src/lib/browse/SchoolsLayer.svelte → src/lib/browse/SchoolsLayerControl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<script lang="ts">
import { ExternalLink } from "../common";
import OptionalLayer from "./OptionalLayer.svelte";
import PolygonAmenityLayerControl from "./PolygonAmenityLayerControl.svelte";
</script>

<OptionalLayer name="schools" singularNoun="school" pluralNoun="Schools">
<PolygonAmenityLayerControl
name="schools"
singularNoun="school"
pluralNoun="Schools"
>
<p>
This shows <ExternalLink
href="https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool"
Expand All @@ -17,4 +21,4 @@
Open Data Commons Open Database License
</ExternalLink>
</p>
</OptionalLayer>
</PolygonAmenityLayerControl>
16 changes: 8 additions & 8 deletions src/pages/BrowseSchemes.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import { onDestroy, onMount } from "svelte";
import { processInput, type Scheme } from "../lib/browse/data";
import Filters from "../lib/browse/Filters.svelte";
import HospitalsLayer from "../lib/browse/HospitalsLayer.svelte";
import HospitalsLayerControl from "../lib/browse/HospitalsLayerControl.svelte";
import InterventionColorSelector from "../lib/browse/InterventionColorSelector.svelte";
import MrnLayer from "../lib/browse/MrnLayer.svelte";
import ParliamentaryConstituenciesLayer from "../lib/browse/ParliamentaryConstituenciesLayer.svelte";
import MrnLayerControl from "../lib/browse/MrnLayerControl.svelte";
import ParliamentaryConstituenciesLayerControl from "../lib/browse/ParliamentaryConstituenciesLayerControl.svelte";
import SchemeCard from "../lib/browse/SchemeCard.svelte";
import SchoolsLayer from "../lib/browse/SchoolsLayer.svelte";
import SchoolsLayerControl from "../lib/browse/SchoolsLayerControl.svelte";
import {
BaselayerSwitcher,
CollapsibleCard,
Expand Down Expand Up @@ -138,10 +138,10 @@
<InterventionColorSelector />
<hr />
<CheckboxGroup small>
<SchoolsLayer />
<HospitalsLayer />
<MrnLayer />
<ParliamentaryConstituenciesLayer />
<SchoolsLayerControl />
<HospitalsLayerControl />
<MrnLayerControl />
<ParliamentaryConstituenciesLayerControl />
</CheckboxGroup>
<BaselayerSwitcher {style} />
</CollapsibleCard>
Expand Down
Loading