diff options
| author | Adam Soltys <[email protected]> | 2023-04-21 20:50:19 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-04-21 20:50:19 -0700 |
| commit | 46a68609068ff360d32852c42ead77a273027c57 (patch) | |
| tree | 115362b713df62578ec9e35b6bc7fbae27bd3d21 /src/components | |
| parent | a71f89b972ef05fcda406afa4e346ee54624a958 (diff) | |
| parent | 92c70d8350dab3de8e786bdad1c0a8f991cd8dbc (diff) | |
| download | coinos-ui-46a68609068ff360d32852c42ead77a273027c57.tar.gz coinos-ui-46a68609068ff360d32852c42ead77a273027c57.zip | |
Merge branch 'master' into hashme
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/LocationsMap.svelte | 44 | ||||
| -rw-r--r-- | src/components/Numpad.svelte | 2 |
2 files changed, 6 insertions, 40 deletions
diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte index 37454731..fcc672e8 100644 --- a/src/components/LocationsMap.svelte +++ b/src/components/LocationsMap.svelte @@ -38,43 +38,12 @@ locations = locations.filter( (location) => - location['osm_json'].tags && location['osm_json'].tags['payment:hashme'] === 'yes' + location['osm_json'].tags && + location['osm_json'].tags['payment:hashme'] === 'yes' && + location['osm_json'].lat && + location['osm_json'].lon ); - /* const locations = [ - { - lat: 49.27034, - lng: -123.141373, - info: 'Rolf Vancouver <br> 1628 W 1st Ave #231, Vancouver <br> <a href="https://www.rolfbodywork.com" target="_blank" rel="noreferrer">www.rolfbodywork.com</a>' - }, - { lat: 49.26419, lng: -123.15702, info: 'Tacos Jorge <br> 2287 W Broadway, Vancouver' }, - { - lat: 49.28273, - lng: -123.120735, - info: 'Engage Strategies <br> <a href="https://www.linkedin.com/in/shauna-collister-32905214" target="_blank" rel="noreferrer">LinkedIn</a>' - }, - { - lat: 49.28134, - lng: -123.02373, - info: 'Lumota Collection <br> Clothing Design/Upcycling - Appointment Only <br> <a href="tel:778-726-3776">778-726-3776</a> <br> 369 Boundary Rd, Vancouver, BC V5K 2B1 <br> <a href="https://www.instagram.com/lumotacollection/" target="_blank" rel="noreferrer">IG: Lumotacollection</a> <br> <a href="https://www.facebook.com/LumotaCollection/posts" target="_blank" rel="noreferrer">FB: Lumotacollection</a>' - }, - { - lat: 49.22643, - lng: -122.93085, - info: 'Goodwin Contracting <br> Project Management/Consulting - Appointment Only <br> <a href="tel:403-812-1085">403-812-1085</a> <br> 8017 17th Ave, Burnaby, BC V3N 1M5' - }, - { - lat: 51.04813, - lng: -114.07999, - info: 'Goodwin Contracting <br> Project Management/Consulting - Appointment Only <br> <a href="tel:403-812-1085">403-812-1085</a> <br> 8017 17th Ave, Burnaby, BC V3N 1M5' - }, - { - lat: 49.2677, - lng: -123.10124, - info: 'General Strike Coffee <br> Artisan coffee shop <br> 1965 Main St, Vancouver, BC V5T 2K6 <br> <a href="https://www.instagram.com/generalstrikecoffee/" target="_blank" rel="noreferrer">IG: generalstrikecoffee</a>' - } - ];*/ - L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/toner/{z}/{x}/{y}.png', { maxZoom: 18, subdomains: ['a', 'b', 'c', 'd'] @@ -100,12 +69,9 @@ let markers = new MarkerClusterGroup(); locations.forEach((location) => { - if (location['deleted_at']) { - return; - } + if (location['deleted_at']) return; location = location['osm_json']; - let marker = L.marker([location.lat, location.lon]); marker.bindPopup( diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte index 82512678..5ea1418c 100644 --- a/src/components/Numpad.svelte +++ b/src/components/Numpad.svelte @@ -31,7 +31,7 @@ AUD: '$', NZD: '$', MXN: '$', - BRL: '$', + BRL: 'R$', HKD: '$', TWD: '$', JPY: '¥', |