diff --git a/layers/culvers/get_data.py b/layers/chains/culvers/get_data.py similarity index 100% rename from layers/culvers/get_data.py rename to layers/chains/culvers/get_data.py diff --git a/layers/culvers/layer.js b/layers/chains/culvers/layer.js similarity index 88% rename from layers/culvers/layer.js rename to layers/chains/culvers/layer.js index 0ab1993..4e26b2b 100644 --- a/layers/culvers/layer.js +++ b/layers/chains/culvers/layer.js @@ -6,7 +6,7 @@ import {Style} from 'ol/style.js'; import Icon from 'ol/style/Icon.js'; import culversURL from '/data/culvers-data.geojson?url'; // TODO: remove `?url`? -import pinURL from '/layers/culvers/pin.svg?url'; // TODO: remove `?url`? +import pinURL from './pin.svg?url'; // TODO: remove `?url`? const vectorLayer = new VectorLayer({ source: new VectorSource({ diff --git a/layers/culvers/pin.svg b/layers/chains/culvers/pin.svg similarity index 100% rename from layers/culvers/pin.svg rename to layers/chains/culvers/pin.svg diff --git a/layers/chains/index.js b/layers/chains/index.js new file mode 100644 index 0000000..cc44439 --- /dev/null +++ b/layers/chains/index.js @@ -0,0 +1,38 @@ +import culversLayer from './culvers/layer.js'; +import krispyKremeLayer from './krispy-kreme/layer.js'; +import kwikTripLayer from './kwik-trip/layer.js'; +import menardsLayer from './menards/layer.js'; +import milwaukeeBurgerCompanyLayer from './milwaukee-burger-company/layer.js'; +import waffleHouseLayer from './waffle-house/layer.js'; + +const chains = { + name: "Chains", + layers: [ + { + name: "Culver's", + layer: culversLayer, + }, + { + name: "Krispy Kreme", + layer: krispyKremeLayer, + }, + { + name: "Kwik Trip/Kwik Star", + layer: kwikTripLayer, + }, + { + name: "Menards", + layer: menardsLayer, + }, + { + name: "Milwaukee Burger Company", + layer: milwaukeeBurgerCompanyLayer, + }, + { + name: "Waffle House", + layer: waffleHouseLayer, + }, + ], +}; + +export default chains; diff --git a/layers/krispy-kreme/get_data.py b/layers/chains/krispy-kreme/get_data.py similarity index 100% rename from layers/krispy-kreme/get_data.py rename to layers/chains/krispy-kreme/get_data.py diff --git a/layers/krispy-kreme/layer.js b/layers/chains/krispy-kreme/layer.js similarity index 88% rename from layers/krispy-kreme/layer.js rename to layers/chains/krispy-kreme/layer.js index 382dc47..b5ffbaa 100644 --- a/layers/krispy-kreme/layer.js +++ b/layers/chains/krispy-kreme/layer.js @@ -6,7 +6,7 @@ import {Style} from 'ol/style.js'; import Icon from 'ol/style/Icon.js'; import waffleHouseURL from '/data/krispy-kreme-data.geojson?url'; // TODO: remove `?url`? -import pinURL from '/layers/krispy-kreme/pin.svg?url'; // TODO: remove `?url`? +import pinURL from './pin.svg?url'; // TODO: remove `?url`? const vectorLayer = new VectorLayer({ source: new VectorSource({ diff --git a/layers/krispy-kreme/pin.svg b/layers/chains/krispy-kreme/pin.svg similarity index 100% rename from layers/krispy-kreme/pin.svg rename to layers/chains/krispy-kreme/pin.svg diff --git a/layers/kwik-trip/README.md b/layers/chains/kwik-trip/README.md similarity index 100% rename from layers/kwik-trip/README.md rename to layers/chains/kwik-trip/README.md diff --git a/layers/kwik-trip/get_data.py b/layers/chains/kwik-trip/get_data.py similarity index 100% rename from layers/kwik-trip/get_data.py rename to layers/chains/kwik-trip/get_data.py diff --git a/layers/kwik-trip/layer.js b/layers/chains/kwik-trip/layer.js similarity index 88% rename from layers/kwik-trip/layer.js rename to layers/chains/kwik-trip/layer.js index 754205f..e1d1b7c 100644 --- a/layers/kwik-trip/layer.js +++ b/layers/chains/kwik-trip/layer.js @@ -6,7 +6,7 @@ import {Style} from 'ol/style.js'; import Icon from 'ol/style/Icon.js'; import kwikTripURL from '/data/kwik-trip-data.geojson?url'; // TODO: remove `?url`? -import pinURL from '/layers/kwik-trip/pin.svg?url'; // TODO: remove `?url`? +import pinURL from './pin.svg?url'; // TODO: remove `?url`? const vectorLayer = new VectorLayer({ source: new VectorSource({ diff --git a/layers/kwik-trip/pin.svg b/layers/chains/kwik-trip/pin.svg similarity index 100% rename from layers/kwik-trip/pin.svg rename to layers/chains/kwik-trip/pin.svg diff --git a/layers/menards/get_data.py b/layers/chains/menards/get_data.py similarity index 100% rename from layers/menards/get_data.py rename to layers/chains/menards/get_data.py diff --git a/layers/menards/layer.js b/layers/chains/menards/layer.js similarity index 88% rename from layers/menards/layer.js rename to layers/chains/menards/layer.js index 35509f1..41c7e85 100644 --- a/layers/menards/layer.js +++ b/layers/chains/menards/layer.js @@ -6,7 +6,7 @@ import {Style} from 'ol/style.js'; import Icon from 'ol/style/Icon.js'; import menardsURL from '/data/menards-data.geojson?url'; // TODO: remove `?url`? -import pinURL from '/layers/menards/pin.svg?url'; // TODO: remove `?url`? +import pinURL from './pin.svg?url'; // TODO: remove `?url`? const vectorLayer = new VectorLayer({ source: new VectorSource({ diff --git a/layers/menards/pin.svg b/layers/chains/menards/pin.svg similarity index 100% rename from layers/menards/pin.svg rename to layers/chains/menards/pin.svg diff --git a/layers/milwaukee-burger-company/get_data.py b/layers/chains/milwaukee-burger-company/get_data.py similarity index 100% rename from layers/milwaukee-burger-company/get_data.py rename to layers/chains/milwaukee-burger-company/get_data.py diff --git a/layers/milwaukee-burger-company/layer.js b/layers/chains/milwaukee-burger-company/layer.js similarity index 86% rename from layers/milwaukee-burger-company/layer.js rename to layers/chains/milwaukee-burger-company/layer.js index fc3f8e8..23d2ffb 100644 --- a/layers/milwaukee-burger-company/layer.js +++ b/layers/chains/milwaukee-burger-company/layer.js @@ -6,7 +6,7 @@ import {Style} from 'ol/style.js'; import Icon from 'ol/style/Icon.js'; import url from '/data/milwaukee-burger-company-data.geojson?url'; // TODO: remove `?url`? -import pin from '/layers/milwaukee-burger-company/pin.svg?url'; // TODO: remove `?url`? +import pin from './pin.svg?url'; // TODO: remove `?url`? const vectorLayer = new VectorLayer({ source: new VectorSource({ diff --git a/layers/milwaukee-burger-company/pin.svg b/layers/chains/milwaukee-burger-company/pin.svg similarity index 100% rename from layers/milwaukee-burger-company/pin.svg rename to layers/chains/milwaukee-burger-company/pin.svg diff --git a/layers/waffle-house/get_data.py b/layers/chains/waffle-house/get_data.py similarity index 100% rename from layers/waffle-house/get_data.py rename to layers/chains/waffle-house/get_data.py diff --git a/layers/waffle-house/layer.js b/layers/chains/waffle-house/layer.js similarity index 88% rename from layers/waffle-house/layer.js rename to layers/chains/waffle-house/layer.js index 988ffaa..093fadd 100644 --- a/layers/waffle-house/layer.js +++ b/layers/chains/waffle-house/layer.js @@ -6,7 +6,7 @@ import {Style} from 'ol/style.js'; import Icon from 'ol/style/Icon.js'; import waffleHouseURL from '/data/waffle-house-data.geojson?url'; // TODO: remove `?url`? -import pinURL from '/layers/waffle-house/pin.svg?url'; // TODO: remove `?url`? +import pinURL from './pin.svg?url'; // TODO: remove `?url`? const vectorLayer = new VectorLayer({ source: new VectorSource({ diff --git a/layers/waffle-house/pin.svg b/layers/chains/waffle-house/pin.svg similarity index 100% rename from layers/waffle-house/pin.svg rename to layers/chains/waffle-house/pin.svg diff --git a/layers/index.js b/layers/index.js index f98614e..496b86a 100644 --- a/layers/index.js +++ b/layers/index.js @@ -5,16 +5,11 @@ import Stamen from 'ol/source/Stamen.js'; import chandlerLayer from './chandler/layer.js'; import amtrakLayer from './amtrak/layer.js'; import arenasLayer from './nhl-arenas/layer.js'; -import menardsLayer from './menards/layer.js'; -import culversLayer from './culvers/layer.js'; -import kwikTripLayer from './kwik-trip/layer.js'; -import waffleHouseLayer from './waffle-house/layer.js'; -import krispyKremeLayer from './krispy-kreme/layer.js'; -import milwaukeeBurgerCompanyLayer from './milwaukee-burger-company/layer.js'; import bikepackingLayer from './bikepacking/layer.js'; +import chains from './chains/index.js'; const layerCategories = [ - { + { // Base maps name: "Base maps", // TODO: include more? // - [ ] https://mc.bbbike.org/mc/ @@ -53,8 +48,8 @@ const layerCategories = [ }, ], }, - { - name: "Overlays", + { // Misc + name: "Misc", layers: [ { name: "Chandler", @@ -69,36 +64,13 @@ const layerCategories = [ name: "NHL Arenas", layer: arenasLayer, }, - { - name: "Menards", - layer: menardsLayer, - }, - { - name: "Culver's", - layer: culversLayer, - }, - { - name: "Kwik Trip/Kwik Star", - layer: kwikTripLayer, - }, - { - name: "Waffle House", - layer: waffleHouseLayer, - }, - { - name: "Krispy Kreme", - layer: krispyKremeLayer, - }, - { - name: "Milwaukee Burger Company", - layer: milwaukeeBurgerCompanyLayer, - }, { name: "Bikepacking.com Routes", layer: bikepackingLayer, }, ] - } + }, + chains ]; export default layerCategories;