From 0ead8a6c32e55fb2989e932ff0d5a20f88809fd9 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 7 Apr 2024 03:03:16 +0200 Subject: show all stores, and their respective polygons --- src/static/icons/365discount.png | Bin 0 -> 669 bytes src/static/icons/Brugsen.png | Bin 0 -> 354 bytes src/static/icons/Dagli'Brugsen.png | Bin 0 -> 285 bytes "src/static/icons/F\303\270tex Food.png" | Bin 0 -> 559 bytes "src/static/icons/F\303\270tex.png" | Bin 0 -> 556 bytes src/static/icons/Kvickly.png | Bin 0 -> 437 bytes src/static/icons/Lidl.png | Bin 0 -> 756 bytes "src/static/icons/L\303\270vbjerg.png" | Bin 0 -> 356 bytes src/static/icons/Meny.png | Bin 0 -> 505 bytes "src/static/icons/Min K\303\270bmand.png" | Bin 0 -> 260 bytes src/static/icons/Netto.png | Bin 0 -> 754 bytes src/static/icons/Rema 1000.png | Bin 0 -> 814 bytes src/static/icons/Spar.png | Bin 0 -> 803 bytes src/static/icons/SuperBrugsen.png | Bin 0 -> 423 bytes src/static/icons/Unknown.png | Bin 0 -> 296 bytes src/static/images/marker-icon.png | Bin 1466 -> 0 bytes src/static/images/marker-shadow.png | Bin 618 -> 0 bytes src/static/main.js | 50 +++++++++++++++++++++++++++--- 18 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 src/static/icons/365discount.png create mode 100644 src/static/icons/Brugsen.png create mode 100644 src/static/icons/Dagli'Brugsen.png create mode 100644 "src/static/icons/F\303\270tex Food.png" create mode 100644 "src/static/icons/F\303\270tex.png" create mode 100644 src/static/icons/Kvickly.png create mode 100644 src/static/icons/Lidl.png create mode 100644 "src/static/icons/L\303\270vbjerg.png" create mode 100644 src/static/icons/Meny.png create mode 100644 "src/static/icons/Min K\303\270bmand.png" create mode 100644 src/static/icons/Netto.png create mode 100644 src/static/icons/Rema 1000.png create mode 100644 src/static/icons/Spar.png create mode 100644 src/static/icons/SuperBrugsen.png create mode 100644 src/static/icons/Unknown.png delete mode 100644 src/static/images/marker-icon.png delete mode 100644 src/static/images/marker-shadow.png (limited to 'src/static') diff --git a/src/static/icons/365discount.png b/src/static/icons/365discount.png new file mode 100644 index 0000000..afc5c5b Binary files /dev/null and b/src/static/icons/365discount.png differ diff --git a/src/static/icons/Brugsen.png b/src/static/icons/Brugsen.png new file mode 100644 index 0000000..5a36aa1 Binary files /dev/null and b/src/static/icons/Brugsen.png differ diff --git a/src/static/icons/Dagli'Brugsen.png b/src/static/icons/Dagli'Brugsen.png new file mode 100644 index 0000000..854c686 Binary files /dev/null and b/src/static/icons/Dagli'Brugsen.png differ diff --git "a/src/static/icons/F\303\270tex Food.png" "b/src/static/icons/F\303\270tex Food.png" new file mode 100644 index 0000000..6b0711a Binary files /dev/null and "b/src/static/icons/F\303\270tex Food.png" differ diff --git "a/src/static/icons/F\303\270tex.png" "b/src/static/icons/F\303\270tex.png" new file mode 100644 index 0000000..86c3f60 Binary files /dev/null and "b/src/static/icons/F\303\270tex.png" differ diff --git a/src/static/icons/Kvickly.png b/src/static/icons/Kvickly.png new file mode 100644 index 0000000..81e3fee Binary files /dev/null and b/src/static/icons/Kvickly.png differ diff --git a/src/static/icons/Lidl.png b/src/static/icons/Lidl.png new file mode 100644 index 0000000..f80f7f8 Binary files /dev/null and b/src/static/icons/Lidl.png differ diff --git "a/src/static/icons/L\303\270vbjerg.png" "b/src/static/icons/L\303\270vbjerg.png" new file mode 100644 index 0000000..6549a3e Binary files /dev/null and "b/src/static/icons/L\303\270vbjerg.png" differ diff --git a/src/static/icons/Meny.png b/src/static/icons/Meny.png new file mode 100644 index 0000000..5496f23 Binary files /dev/null and b/src/static/icons/Meny.png differ diff --git "a/src/static/icons/Min K\303\270bmand.png" "b/src/static/icons/Min K\303\270bmand.png" new file mode 100644 index 0000000..55bad2a Binary files /dev/null and "b/src/static/icons/Min K\303\270bmand.png" differ diff --git a/src/static/icons/Netto.png b/src/static/icons/Netto.png new file mode 100644 index 0000000..50a8001 Binary files /dev/null and b/src/static/icons/Netto.png differ diff --git a/src/static/icons/Rema 1000.png b/src/static/icons/Rema 1000.png new file mode 100644 index 0000000..e73b99a Binary files /dev/null and b/src/static/icons/Rema 1000.png differ diff --git a/src/static/icons/Spar.png b/src/static/icons/Spar.png new file mode 100644 index 0000000..cc88bb6 Binary files /dev/null and b/src/static/icons/Spar.png differ diff --git a/src/static/icons/SuperBrugsen.png b/src/static/icons/SuperBrugsen.png new file mode 100644 index 0000000..d7e6e88 Binary files /dev/null and b/src/static/icons/SuperBrugsen.png differ diff --git a/src/static/icons/Unknown.png b/src/static/icons/Unknown.png new file mode 100644 index 0000000..4209ecf Binary files /dev/null and b/src/static/icons/Unknown.png differ diff --git a/src/static/images/marker-icon.png b/src/static/images/marker-icon.png deleted file mode 100644 index 950edf2..0000000 Binary files a/src/static/images/marker-icon.png and /dev/null differ diff --git a/src/static/images/marker-shadow.png b/src/static/images/marker-shadow.png deleted file mode 100644 index 9fd2979..0000000 Binary files a/src/static/images/marker-shadow.png and /dev/null differ diff --git a/src/static/main.js b/src/static/main.js index 24d0edf..405f455 100644 --- a/src/static/main.js +++ b/src/static/main.js @@ -4,15 +4,46 @@ L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap' }).addTo(map); +let known_store_chains; +let icons = {}; + +async function fetchChains() { + const response = await fetch("chains"); + known_store_chains = await response.json(); + + icons["Unknown"] = L.icon({ + iconUrl: 'icons/Unknown.png', + iconSize: [10, 16], + iconAnchor: [16, 16], + }); + + for (let known_store_chain of known_store_chains) { + icons[known_store_chain] = L.icon({ + iconUrl: `icons/${known_store_chain}.png`, + iconAnchor: [8, 8], + }); + } + + fetchShops(); +} function addMarker(shop) { - L.marker([shop.lat, shop.long], {title: shop.name, }).addTo(map); + let icon; + + if (known_store_chains.includes(shop.brand)){ + icon = icons[shop.brand]; + } else { + icon = icons["Unknown"]; + } + + L.marker([shop.lat, shop.long], { + title: shop.name, + icon: icon, + }).addTo(map); } function addPolygon(polygon) { L.polygon(polygon, {color: 'red'}).addTo(map); - - console.log(polygon.coordinates) } @@ -22,11 +53,22 @@ async function fetchShops() { shops.forEach((shop) => addMarker(shop)); } -fetchShops() async function fetch_voronoi_polygons() { const response = await fetch("voronoi_polygons.json"); const voronoi_polygons = await response.json(); voronoi_polygons.forEach((polygon) => addPolygon(polygon)); } + +function update(){ + if (map.getZoom() >= 14){ + //console.log('update') + } +} + +map.on('moveend', function() { + update() +}); + +fetchChains() fetch_voronoi_polygons() \ No newline at end of file -- cgit v1.2.3