From 9b09f8b809d560863b0a570ab22bba940babf33c Mon Sep 17 00:00:00 2001
From: midzer <midzer@gmail.com>
Date: Wed, 6 Nov 2024 09:21:10 +0100
Subject: [PATCH] update content and data

---
 content/cities/airdrie/co-op-main-street-se.md |  5 -----
 .../airdrie/co-op-midtown-boulevard-sw.md      |  5 +++++
 .../{costco-2.md => costco-32-street-ne.md}    |  2 +-
 .../doodle-dogs-parkdale-crescent-nw.md        |  5 -----
 .../calgary/freedom-mobile-64-avenue-ne.md     |  5 +++++
 .../freedom-mobile-beddington-boulevard-nw.md  |  5 -----
 content/cities/calgary/prime-tune-shop.md      |  5 -----
 .../calgary/safeway-beddington-boulevard-nw.md |  5 -----
 .../calgary/safeway-dalhousie-drive-nw.md      |  5 +++++
 content/cities/calgary/salon.md                |  5 -----
 ...-street-nw.md => 7-eleven-153-avenue-nw.md} |  2 +-
 ...et-nw.md => save-on-foods-199-street-nw.md} |  2 +-
 .../cities/edmonton/simons-170-street-nw.md    |  5 +++++
 .../simons-londonderry-mall-northwest.md       |  5 -----
 content/cities/okotoks/_index.md               |  4 ++--
 .../spruce-grove/lucid-cannabis-king-street.md |  5 +++++
 .../lucid-cannabis-mcleod-avenue.md            |  5 -----
 content/cities/tsuutina/_index.md              |  4 ++--
 content/cities/westerose/_index.md             |  2 +-
 data/cities/airdrie/co-op-main-street-se.yml   | 11 -----------
 .../airdrie/co-op-midtown-boulevard-sw.yml     | 11 +++++++++++
 data/cities/airdrie/co-op.yml                  | 14 +++++++-------
 data/cities/calgary/bow-cycle-and-sports.yml   |  4 ++--
 data/cities/calgary/costco-2.yml               | 11 -----------
 data/cities/calgary/costco-32-street-ne.yml    | 11 +++++++++++
 data/cities/calgary/costco.yml                 | 16 ++++++++--------
 .../doodle-dogs-parkdale-crescent-nw.yml       | 11 -----------
 .../calgary/freedom-mobile-64-avenue-ne.yml    | 11 +++++++++++
 .../freedom-mobile-beddington-boulevard-nw.yml | 11 -----------
 data/cities/calgary/freedom-mobile.yml         | 16 ++++++++--------
 .../calgary/north-hill-shopping-centre.yml     |  2 +-
 data/cities/calgary/prime-tune-shop.yml        | 11 -----------
 .../calgary/safeway-aspen-glen-landing-sw.yml  |  4 ++--
 .../safeway-beddington-boulevard-nw.yml        | 11 -----------
 .../calgary/safeway-dalhousie-drive-nw.yml     | 11 +++++++++++
 data/cities/calgary/safeway.yml                | 14 +++++++-------
 data/cities/calgary/salon.yml                  | 11 -----------
 .../cities/calgary/shell-uxbridge-drive-nw.yml |  4 ++--
 data/cities/eckville/fields.yml                |  2 +-
 .../cities/edmonton/7-eleven-103-street-nw.yml | 11 -----------
 .../cities/edmonton/7-eleven-153-avenue-nw.yml | 11 +++++++++++
 data/cities/edmonton/7-eleven.yml              | 18 +++++++++---------
 .../edmonton/save-on-foods-109-street-nw.yml   | 11 -----------
 .../edmonton/save-on-foods-199-street-nw.yml   | 11 +++++++++++
 data/cities/edmonton/save-on-foods.yml         | 18 +++++++++---------
 data/cities/edmonton/simons-170-street-nw.yml  | 11 +++++++++++
 .../simons-londonderry-mall-northwest.yml      | 11 -----------
 data/cities/edmonton/simons.yml                | 18 +++++++++---------
 .../ace-liquor-ray-nelson-drive.yml            | 16 ++++++++--------
 data/cities/lloydminster/ace-liquor.yml        | 16 ++++++++--------
 .../lucid-cannabis-king-street.yml             | 11 +++++++++++
 .../lucid-cannabis-mcleod-avenue.yml           | 11 -----------
 data/cities/spruce-grove/lucid-cannabis.yml    | 12 ++++++------
 53 files changed, 208 insertions(+), 256 deletions(-)
 delete mode 100644 content/cities/airdrie/co-op-main-street-se.md
 create mode 100644 content/cities/airdrie/co-op-midtown-boulevard-sw.md
 rename content/cities/calgary/{costco-2.md => costco-32-street-ne.md} (52%)
 delete mode 100644 content/cities/calgary/doodle-dogs-parkdale-crescent-nw.md
 create mode 100644 content/cities/calgary/freedom-mobile-64-avenue-ne.md
 delete mode 100644 content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
 delete mode 100644 content/cities/calgary/prime-tune-shop.md
 delete mode 100644 content/cities/calgary/safeway-beddington-boulevard-nw.md
 create mode 100644 content/cities/calgary/safeway-dalhousie-drive-nw.md
 delete mode 100644 content/cities/calgary/salon.md
 rename content/cities/edmonton/{7-eleven-103-street-nw.md => 7-eleven-153-avenue-nw.md} (52%)
 rename content/cities/edmonton/{save-on-foods-109-street-nw.md => save-on-foods-199-street-nw.md} (52%)
 create mode 100644 content/cities/edmonton/simons-170-street-nw.md
 delete mode 100644 content/cities/edmonton/simons-londonderry-mall-northwest.md
 create mode 100644 content/cities/spruce-grove/lucid-cannabis-king-street.md
 delete mode 100644 content/cities/spruce-grove/lucid-cannabis-mcleod-avenue.md
 delete mode 100644 data/cities/airdrie/co-op-main-street-se.yml
 create mode 100644 data/cities/airdrie/co-op-midtown-boulevard-sw.yml
 delete mode 100644 data/cities/calgary/costco-2.yml
 create mode 100644 data/cities/calgary/costco-32-street-ne.yml
 delete mode 100644 data/cities/calgary/doodle-dogs-parkdale-crescent-nw.yml
 create mode 100644 data/cities/calgary/freedom-mobile-64-avenue-ne.yml
 delete mode 100644 data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
 delete mode 100644 data/cities/calgary/prime-tune-shop.yml
 delete mode 100644 data/cities/calgary/safeway-beddington-boulevard-nw.yml
 create mode 100644 data/cities/calgary/safeway-dalhousie-drive-nw.yml
 delete mode 100644 data/cities/calgary/salon.yml
 delete mode 100644 data/cities/edmonton/7-eleven-103-street-nw.yml
 create mode 100644 data/cities/edmonton/7-eleven-153-avenue-nw.yml
 delete mode 100644 data/cities/edmonton/save-on-foods-109-street-nw.yml
 create mode 100644 data/cities/edmonton/save-on-foods-199-street-nw.yml
 create mode 100644 data/cities/edmonton/simons-170-street-nw.yml
 delete mode 100644 data/cities/edmonton/simons-londonderry-mall-northwest.yml
 create mode 100644 data/cities/spruce-grove/lucid-cannabis-king-street.yml
 delete mode 100644 data/cities/spruce-grove/lucid-cannabis-mcleod-avenue.yml

diff --git a/content/cities/airdrie/co-op-main-street-se.md b/content/cities/airdrie/co-op-main-street-se.md
deleted file mode 100644
index ff64db5e2..000000000
--- a/content/cities/airdrie/co-op-main-street-se.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Co-op"
-url: /airdrie/co-op-main-street-se/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/airdrie/co-op-midtown-boulevard-sw.md b/content/cities/airdrie/co-op-midtown-boulevard-sw.md
new file mode 100644
index 000000000..183f783f2
--- /dev/null
+++ b/content/cities/airdrie/co-op-midtown-boulevard-sw.md
@@ -0,0 +1,5 @@
+---
+title: "Co-op"
+url: /airdrie/co-op-midtown-boulevard-sw/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/calgary/costco-2.md b/content/cities/calgary/costco-32-street-ne.md
similarity index 52%
rename from content/cities/calgary/costco-2.md
rename to content/cities/calgary/costco-32-street-ne.md
index 4ee809a71..182369034 100644
--- a/content/cities/calgary/costco-2.md
+++ b/content/cities/calgary/costco-32-street-ne.md
@@ -1,5 +1,5 @@
 ---
 title: "Costco"
-url: /calgary/costco-2/
+url: /calgary/costco-32-street-ne/
 shop: wholesale
 ---
\ No newline at end of file
diff --git a/content/cities/calgary/doodle-dogs-parkdale-crescent-nw.md b/content/cities/calgary/doodle-dogs-parkdale-crescent-nw.md
deleted file mode 100644
index 80d4f0fb4..000000000
--- a/content/cities/calgary/doodle-dogs-parkdale-crescent-nw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Doodle Dogs"
-url: /calgary/doodle-dogs-parkdale-crescent-nw/
-shop: pet
----
\ No newline at end of file
diff --git a/content/cities/calgary/freedom-mobile-64-avenue-ne.md b/content/cities/calgary/freedom-mobile-64-avenue-ne.md
new file mode 100644
index 000000000..0150e64a6
--- /dev/null
+++ b/content/cities/calgary/freedom-mobile-64-avenue-ne.md
@@ -0,0 +1,5 @@
+---
+title: "Freedom Mobile"
+url: /calgary/freedom-mobile-64-avenue-ne/
+shop: mobile phone
+---
\ No newline at end of file
diff --git a/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md b/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
deleted file mode 100644
index 20e4b2540..000000000
--- a/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Freedom Mobile"
-url: /calgary/freedom-mobile-beddington-boulevard-nw/
-shop: mobile phone
----
\ No newline at end of file
diff --git a/content/cities/calgary/prime-tune-shop.md b/content/cities/calgary/prime-tune-shop.md
deleted file mode 100644
index d2837d60c..000000000
--- a/content/cities/calgary/prime-tune-shop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Prime Tune Shop"
-url: /calgary/prime-tune-shop/
-shop: bicycle
----
\ No newline at end of file
diff --git a/content/cities/calgary/safeway-beddington-boulevard-nw.md b/content/cities/calgary/safeway-beddington-boulevard-nw.md
deleted file mode 100644
index cbf7e0c30..000000000
--- a/content/cities/calgary/safeway-beddington-boulevard-nw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Safeway"
-url: /calgary/safeway-beddington-boulevard-nw/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/calgary/safeway-dalhousie-drive-nw.md b/content/cities/calgary/safeway-dalhousie-drive-nw.md
new file mode 100644
index 000000000..fa9a1d55d
--- /dev/null
+++ b/content/cities/calgary/safeway-dalhousie-drive-nw.md
@@ -0,0 +1,5 @@
+---
+title: "Safeway"
+url: /calgary/safeway-dalhousie-drive-nw/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/calgary/salon.md b/content/cities/calgary/salon.md
deleted file mode 100644
index 6ad0bc448..000000000
--- a/content/cities/calgary/salon.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Salon"
-url: /calgary/salon/
-shop: hairdresser
----
\ No newline at end of file
diff --git a/content/cities/edmonton/7-eleven-103-street-nw.md b/content/cities/edmonton/7-eleven-153-avenue-nw.md
similarity index 52%
rename from content/cities/edmonton/7-eleven-103-street-nw.md
rename to content/cities/edmonton/7-eleven-153-avenue-nw.md
index b16040798..e9d0e77ab 100644
--- a/content/cities/edmonton/7-eleven-103-street-nw.md
+++ b/content/cities/edmonton/7-eleven-153-avenue-nw.md
@@ -1,5 +1,5 @@
 ---
 title: "7-Eleven"
-url: /edmonton/7-eleven-103-street-nw/
+url: /edmonton/7-eleven-153-avenue-nw/
 shop: convenience
 ---
\ No newline at end of file
diff --git a/content/cities/edmonton/save-on-foods-109-street-nw.md b/content/cities/edmonton/save-on-foods-199-street-nw.md
similarity index 52%
rename from content/cities/edmonton/save-on-foods-109-street-nw.md
rename to content/cities/edmonton/save-on-foods-199-street-nw.md
index 7e7f2817a..f2c682acb 100644
--- a/content/cities/edmonton/save-on-foods-109-street-nw.md
+++ b/content/cities/edmonton/save-on-foods-199-street-nw.md
@@ -1,5 +1,5 @@
 ---
 title: "Save-On-Foods"
-url: /edmonton/save-on-foods-109-street-nw/
+url: /edmonton/save-on-foods-199-street-nw/
 shop: supermarket
 ---
\ No newline at end of file
diff --git a/content/cities/edmonton/simons-170-street-nw.md b/content/cities/edmonton/simons-170-street-nw.md
new file mode 100644
index 000000000..13dcb038f
--- /dev/null
+++ b/content/cities/edmonton/simons-170-street-nw.md
@@ -0,0 +1,5 @@
+---
+title: "Simons"
+url: /edmonton/simons-170-street-nw/
+shop: clothes
+---
\ No newline at end of file
diff --git a/content/cities/edmonton/simons-londonderry-mall-northwest.md b/content/cities/edmonton/simons-londonderry-mall-northwest.md
deleted file mode 100644
index b5f3a6568..000000000
--- a/content/cities/edmonton/simons-londonderry-mall-northwest.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Simons"
-url: /edmonton/simons-londonderry-mall-northwest/
-shop: clothes
----
\ No newline at end of file
diff --git a/content/cities/okotoks/_index.md b/content/cities/okotoks/_index.md
index b9abd1fa7..749f5df21 100644
--- a/content/cities/okotoks/_index.md
+++ b/content/cities/okotoks/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Okotoks
 url: /okotoks/
-latitude: 50.706
-longitude: -113.949
+latitude: 50.729
+longitude: -113.973
 ---
\ No newline at end of file
diff --git a/content/cities/spruce-grove/lucid-cannabis-king-street.md b/content/cities/spruce-grove/lucid-cannabis-king-street.md
new file mode 100644
index 000000000..9546f7eb1
--- /dev/null
+++ b/content/cities/spruce-grove/lucid-cannabis-king-street.md
@@ -0,0 +1,5 @@
+---
+title: "Lucid Cannabis"
+url: /spruce-grove/lucid-cannabis-king-street/
+shop: cannabis
+---
\ No newline at end of file
diff --git a/content/cities/spruce-grove/lucid-cannabis-mcleod-avenue.md b/content/cities/spruce-grove/lucid-cannabis-mcleod-avenue.md
deleted file mode 100644
index 7492fdad8..000000000
--- a/content/cities/spruce-grove/lucid-cannabis-mcleod-avenue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Lucid Cannabis"
-url: /spruce-grove/lucid-cannabis-mcleod-avenue/
-shop: cannabis
----
\ No newline at end of file
diff --git a/content/cities/tsuutina/_index.md b/content/cities/tsuutina/_index.md
index 416fcb5f6..0f2800fb5 100644
--- a/content/cities/tsuutina/_index.md
+++ b/content/cities/tsuutina/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Tsuut'ina
 url: /tsuutina/
-latitude: 50.999
-longitude: -114.163
+latitude: 51
+longitude: -114.162
 ---
\ No newline at end of file
diff --git a/content/cities/westerose/_index.md b/content/cities/westerose/_index.md
index c9004060d..5e7a1fa13 100644
--- a/content/cities/westerose/_index.md
+++ b/content/cities/westerose/_index.md
@@ -2,5 +2,5 @@
 title: Westerose
 url: /westerose/
 latitude: 52.961
-longitude: -114.027
+longitude: -114.028
 ---
\ No newline at end of file
diff --git a/data/cities/airdrie/co-op-main-street-se.yml b/data/cities/airdrie/co-op-main-street-se.yml
deleted file mode 100644
index 3adc3e7cb..000000000
--- a/data/cities/airdrie/co-op-main-street-se.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 757498433
-type: node
-latitude: 51.26962
-longitude: -114.00474
-postcode: T4B 2Y1
-city: Airdrie
-street: Main Street SE
-housenumber: "2700"
-phone: +1-403-912-3711
-opening_hours: ""
-website: ""
diff --git a/data/cities/airdrie/co-op-midtown-boulevard-sw.yml b/data/cities/airdrie/co-op-midtown-boulevard-sw.yml
new file mode 100644
index 000000000..63db52424
--- /dev/null
+++ b/data/cities/airdrie/co-op-midtown-boulevard-sw.yml
@@ -0,0 +1,11 @@
+id: 804508722
+type: node
+latitude: 51.28511
+longitude: -114.0248
+postcode: T4B 4E7
+city: Airdrie
+street: Midtown Boulevard SW
+housenumber: "1"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/airdrie/co-op.yml b/data/cities/airdrie/co-op.yml
index 63db52424..3adc3e7cb 100644
--- a/data/cities/airdrie/co-op.yml
+++ b/data/cities/airdrie/co-op.yml
@@ -1,11 +1,11 @@
-id: 804508722
+id: 757498433
 type: node
-latitude: 51.28511
-longitude: -114.0248
-postcode: T4B 4E7
+latitude: 51.26962
+longitude: -114.00474
+postcode: T4B 2Y1
 city: Airdrie
-street: Midtown Boulevard SW
-housenumber: "1"
-phone: ""
+street: Main Street SE
+housenumber: "2700"
+phone: +1-403-912-3711
 opening_hours: ""
 website: ""
diff --git a/data/cities/calgary/bow-cycle-and-sports.yml b/data/cities/calgary/bow-cycle-and-sports.yml
index b34c8852e..b55891309 100644
--- a/data/cities/calgary/bow-cycle-and-sports.yml
+++ b/data/cities/calgary/bow-cycle-and-sports.yml
@@ -1,7 +1,7 @@
 id: 271945019
 type: node
-latitude: 51.08664
-longitude: -114.18242
+latitude: 51.08663
+longitude: -114.18243
 postcode: T3B 0E8
 city: Calgary
 street: Bowness Road NW
diff --git a/data/cities/calgary/costco-2.yml b/data/cities/calgary/costco-2.yml
deleted file mode 100644
index a4b102673..000000000
--- a/data/cities/calgary/costco-2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 123813629
-type: node
-latitude: 50.99033
-longitude: -114.04704
-postcode: ""
-city: Calgary
-street: ""
-housenumber: "99"
-phone: ""
-opening_hours: Mo-Fr 10:00-20:30, Sa 09:30-18:00, Su 10:00-17:00
-website: https://www.costco.ca/warehouse-locations/s-calgary-calgary-ab-251.html
diff --git a/data/cities/calgary/costco-32-street-ne.yml b/data/cities/calgary/costco-32-street-ne.yml
new file mode 100644
index 000000000..875cc1399
--- /dev/null
+++ b/data/cities/calgary/costco-32-street-ne.yml
@@ -0,0 +1,11 @@
+id: 111016948
+type: node
+latitude: 51.07994
+longitude: -113.9914
+postcode: T1Y 6T7
+city: Calgary
+street: 32 Street NE
+housenumber: "2853"
+phone: ""
+opening_hours: ""
+website: https://www.costco.ca/warehouse-locations/n-calgary-calgary-ab-56.html
diff --git a/data/cities/calgary/costco.yml b/data/cities/calgary/costco.yml
index 875cc1399..a4b102673 100644
--- a/data/cities/calgary/costco.yml
+++ b/data/cities/calgary/costco.yml
@@ -1,11 +1,11 @@
-id: 111016948
+id: 123813629
 type: node
-latitude: 51.07994
-longitude: -113.9914
-postcode: T1Y 6T7
+latitude: 50.99033
+longitude: -114.04704
+postcode: ""
 city: Calgary
-street: 32 Street NE
-housenumber: "2853"
+street: ""
+housenumber: "99"
 phone: ""
-opening_hours: ""
-website: https://www.costco.ca/warehouse-locations/n-calgary-calgary-ab-56.html
+opening_hours: Mo-Fr 10:00-20:30, Sa 09:30-18:00, Su 10:00-17:00
+website: https://www.costco.ca/warehouse-locations/s-calgary-calgary-ab-251.html
diff --git a/data/cities/calgary/doodle-dogs-parkdale-crescent-nw.yml b/data/cities/calgary/doodle-dogs-parkdale-crescent-nw.yml
deleted file mode 100644
index 0118f291d..000000000
--- a/data/cities/calgary/doodle-dogs-parkdale-crescent-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 540869212
-type: node
-latitude: 51.05839
-longitude: -114.13634
-postcode: T2N 3T8
-city: Calgary
-street: Parkdale Crescent NW
-housenumber: 3b
-phone: ""
-opening_hours: ""
-website: http://www.doodledogsyyc.com/
diff --git a/data/cities/calgary/freedom-mobile-64-avenue-ne.yml b/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
new file mode 100644
index 000000000..773cbe116
--- /dev/null
+++ b/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
@@ -0,0 +1,11 @@
+id: 8796945780
+type: node
+latitude: 51.10932
+longitude: -114.04099
+postcode: T2E 7P4
+city: Calgary
+street: 64 Avenue NE
+housenumber: "901"
+phone: "+14039037799"
+opening_hours: ""
+website: "+14039037799"
diff --git a/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml b/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
deleted file mode 100644
index 5208466c1..000000000
--- a/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8793422147
-type: node
-latitude: 51.12697
-longitude: -114.07355
-postcode: T3K 2A8
-city: Calgary
-street: Beddington Boulevard NW
-housenumber: "8120"
-phone: +1 403-402-5555
-opening_hours: ""
-website: https://www.freedommobile.ca
diff --git a/data/cities/calgary/freedom-mobile.yml b/data/cities/calgary/freedom-mobile.yml
index 773cbe116..5208466c1 100644
--- a/data/cities/calgary/freedom-mobile.yml
+++ b/data/cities/calgary/freedom-mobile.yml
@@ -1,11 +1,11 @@
-id: 8796945780
+id: 8793422147
 type: node
-latitude: 51.10932
-longitude: -114.04099
-postcode: T2E 7P4
+latitude: 51.12697
+longitude: -114.07355
+postcode: T3K 2A8
 city: Calgary
-street: 64 Avenue NE
-housenumber: "901"
-phone: "+14039037799"
+street: Beddington Boulevard NW
+housenumber: "8120"
+phone: +1 403-402-5555
 opening_hours: ""
-website: "+14039037799"
+website: https://www.freedommobile.ca
diff --git a/data/cities/calgary/north-hill-shopping-centre.yml b/data/cities/calgary/north-hill-shopping-centre.yml
index 9423d23df..4df0dd04d 100644
--- a/data/cities/calgary/north-hill-shopping-centre.yml
+++ b/data/cities/calgary/north-hill-shopping-centre.yml
@@ -1,7 +1,7 @@
 id: 19000868
 type: node
 latitude: 51.06597
-longitude: -114.10261
+longitude: -114.10263
 postcode: T2N 1M7
 city: Calgary
 street: 14 Avenue NW
diff --git a/data/cities/calgary/prime-tune-shop.yml b/data/cities/calgary/prime-tune-shop.yml
deleted file mode 100644
index 37ad3f792..000000000
--- a/data/cities/calgary/prime-tune-shop.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 539334442
-type: node
-latitude: 51.05818
-longitude: -114.13558
-postcode: T2N 3T8
-city: Calgary
-street: Parkdale Crescent NW
-housenumber: "7"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/calgary/safeway-aspen-glen-landing-sw.yml b/data/cities/calgary/safeway-aspen-glen-landing-sw.yml
index 6d15fbbdf..93055b9f6 100644
--- a/data/cities/calgary/safeway-aspen-glen-landing-sw.yml
+++ b/data/cities/calgary/safeway-aspen-glen-landing-sw.yml
@@ -6,6 +6,6 @@ postcode: T3H 0N5
 city: Calgary
 street: Aspen Glen Landing SW
 housenumber: "375"
-phone: ""
-opening_hours: Mo-Su 08:00-23:00
+phone: +1 403-217-5521
+opening_hours: Mo-Su 07:00-22:00
 website: ""
diff --git a/data/cities/calgary/safeway-beddington-boulevard-nw.yml b/data/cities/calgary/safeway-beddington-boulevard-nw.yml
deleted file mode 100644
index 23ea8ed40..000000000
--- a/data/cities/calgary/safeway-beddington-boulevard-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 252763320
-type: node
-latitude: 51.12709
-longitude: -114.07239
-postcode: T3K 2A8
-city: Calgary
-street: Beddington Boulevard NW
-housenumber: "8120"
-phone: ""
-opening_hours: Mo-Su 07:00-22:00
-website: ""
diff --git a/data/cities/calgary/safeway-dalhousie-drive-nw.yml b/data/cities/calgary/safeway-dalhousie-drive-nw.yml
new file mode 100644
index 000000000..0fd87886e
--- /dev/null
+++ b/data/cities/calgary/safeway-dalhousie-drive-nw.yml
@@ -0,0 +1,11 @@
+id: 196695436
+type: node
+latitude: 51.10637
+longitude: -114.16197
+postcode: T3A 5R8
+city: Calgary
+street: Dalhousie Drive NW
+housenumber: "5005"
+phone: ""
+opening_hours: 08:00-23:00
+website: ""
diff --git a/data/cities/calgary/safeway.yml b/data/cities/calgary/safeway.yml
index 0fd87886e..23ea8ed40 100644
--- a/data/cities/calgary/safeway.yml
+++ b/data/cities/calgary/safeway.yml
@@ -1,11 +1,11 @@
-id: 196695436
+id: 252763320
 type: node
-latitude: 51.10637
-longitude: -114.16197
-postcode: T3A 5R8
+latitude: 51.12709
+longitude: -114.07239
+postcode: T3K 2A8
 city: Calgary
-street: Dalhousie Drive NW
-housenumber: "5005"
+street: Beddington Boulevard NW
+housenumber: "8120"
 phone: ""
-opening_hours: 08:00-23:00
+opening_hours: Mo-Su 07:00-22:00
 website: ""
diff --git a/data/cities/calgary/salon.yml b/data/cities/calgary/salon.yml
deleted file mode 100644
index 2903750ff..000000000
--- a/data/cities/calgary/salon.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 539334450
-type: node
-latitude: 51.05829
-longitude: -114.13543
-postcode: T2N 3T8
-city: Calgary
-street: Parkdale Crescent NW
-housenumber: "7"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/calgary/shell-uxbridge-drive-nw.yml b/data/cities/calgary/shell-uxbridge-drive-nw.yml
index 0eb79eed1..8436750a2 100644
--- a/data/cities/calgary/shell-uxbridge-drive-nw.yml
+++ b/data/cities/calgary/shell-uxbridge-drive-nw.yml
@@ -6,6 +6,6 @@ postcode: T2N 3Z1
 city: Calgary
 street: Uxbridge Drive NW
 housenumber: "1820"
-phone: ""
+phone: +1 403-289-7091
 opening_hours: 24/7
-website: ""
+website: http://shell.ca
diff --git a/data/cities/eckville/fields.yml b/data/cities/eckville/fields.yml
index 6a99982e0..9b610ea7d 100644
--- a/data/cities/eckville/fields.yml
+++ b/data/cities/eckville/fields.yml
@@ -4,7 +4,7 @@ latitude: 52.36
 longitude: -114.36817
 postcode: T0M 0X0
 city: Eckville
-street: ""
+street: 50 Street
 housenumber: ""
 phone: +1-403-746-5093
 opening_hours: ""
diff --git a/data/cities/edmonton/7-eleven-103-street-nw.yml b/data/cities/edmonton/7-eleven-103-street-nw.yml
deleted file mode 100644
index 034eeae44..000000000
--- a/data/cities/edmonton/7-eleven-103-street-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 9678241207
-type: node
-latitude: 53.54414
-longitude: -113.49764
-postcode: t5j0y8
-city: Edmonton
-street: 103 Street NW
-housenumber: "10238"
-phone: +1 5879308318
-opening_hours: 24/7
-website: ""
diff --git a/data/cities/edmonton/7-eleven-153-avenue-nw.yml b/data/cities/edmonton/7-eleven-153-avenue-nw.yml
new file mode 100644
index 000000000..fbcb26907
--- /dev/null
+++ b/data/cities/edmonton/7-eleven-153-avenue-nw.yml
@@ -0,0 +1,11 @@
+id: 9731034770
+type: node
+latitude: 53.61456
+longitude: -113.49087
+postcode: T5Z 0B1
+city: Edmonton
+street: 153 Avenue NW
+housenumber: "9628"
+phone: ""
+opening_hours: ""
+website: https://stores.7-eleven.ca/store/37831
diff --git a/data/cities/edmonton/7-eleven.yml b/data/cities/edmonton/7-eleven.yml
index fbcb26907..034eeae44 100644
--- a/data/cities/edmonton/7-eleven.yml
+++ b/data/cities/edmonton/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 9731034770
+id: 9678241207
 type: node
-latitude: 53.61456
-longitude: -113.49087
-postcode: T5Z 0B1
+latitude: 53.54414
+longitude: -113.49764
+postcode: t5j0y8
 city: Edmonton
-street: 153 Avenue NW
-housenumber: "9628"
-phone: ""
-opening_hours: ""
-website: https://stores.7-eleven.ca/store/37831
+street: 103 Street NW
+housenumber: "10238"
+phone: +1 5879308318
+opening_hours: 24/7
+website: ""
diff --git a/data/cities/edmonton/save-on-foods-109-street-nw.yml b/data/cities/edmonton/save-on-foods-109-street-nw.yml
deleted file mode 100644
index 49e544127..000000000
--- a/data/cities/edmonton/save-on-foods-109-street-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 233032229
-type: node
-latitude: 53.54288
-longitude: -113.5097
-postcode: T5J 5B4
-city: Edmonton
-street: 109 Street NW
-housenumber: "10180"
-phone: "+17804235678"
-opening_hours: Mo-Su 07:00-22:00
-website: https://www.saveonfoods.com/store/9th-jasper/
diff --git a/data/cities/edmonton/save-on-foods-199-street-nw.yml b/data/cities/edmonton/save-on-foods-199-street-nw.yml
new file mode 100644
index 000000000..b66c34fd9
--- /dev/null
+++ b/data/cities/edmonton/save-on-foods-199-street-nw.yml
@@ -0,0 +1,11 @@
+id: 259682609
+type: node
+latitude: 53.49522
+longitude: -113.66831
+postcode: T5T 2K4
+city: Edmonton
+street: 199 Street NW
+housenumber: "6260"
+phone: +1-780-483-3259
+opening_hours: 08:00-23:00
+website: https://www.saveonfoods.com/store/hampton/
diff --git a/data/cities/edmonton/save-on-foods.yml b/data/cities/edmonton/save-on-foods.yml
index b66c34fd9..49e544127 100644
--- a/data/cities/edmonton/save-on-foods.yml
+++ b/data/cities/edmonton/save-on-foods.yml
@@ -1,11 +1,11 @@
-id: 259682609
+id: 233032229
 type: node
-latitude: 53.49522
-longitude: -113.66831
-postcode: T5T 2K4
+latitude: 53.54288
+longitude: -113.5097
+postcode: T5J 5B4
 city: Edmonton
-street: 199 Street NW
-housenumber: "6260"
-phone: +1-780-483-3259
-opening_hours: 08:00-23:00
-website: https://www.saveonfoods.com/store/hampton/
+street: 109 Street NW
+housenumber: "10180"
+phone: "+17804235678"
+opening_hours: Mo-Su 07:00-22:00
+website: https://www.saveonfoods.com/store/9th-jasper/
diff --git a/data/cities/edmonton/simons-170-street-nw.yml b/data/cities/edmonton/simons-170-street-nw.yml
new file mode 100644
index 000000000..304044a25
--- /dev/null
+++ b/data/cities/edmonton/simons-170-street-nw.yml
@@ -0,0 +1,11 @@
+id: 6997404289
+type: node
+latitude: 53.52351
+longitude: -113.62802
+postcode: T5T 4M2
+city: Edmonton
+street: 170 Street NW
+housenumber: "8882"
+phone: +1-780-487-3630
+opening_hours: Mo-Sa 10:00-21:00; Su 11:00-18:00
+website: https://simons.ca/en/stores/alberta/west-edmonton-mall--a13091
diff --git a/data/cities/edmonton/simons-londonderry-mall-northwest.yml b/data/cities/edmonton/simons-londonderry-mall-northwest.yml
deleted file mode 100644
index c7c55fd9a..000000000
--- a/data/cities/edmonton/simons-londonderry-mall-northwest.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6991288686
-type: node
-latitude: 53.60366
-longitude: -113.44499
-postcode: T5C 3C8
-city: Edmonton
-street: Londonderry Mall NorthWest
-housenumber: "1"
-phone: +1-780-633-9880
-opening_hours: Mo-Fr 10:00-21:00; Sa 09:30-17:30; Su 11:00-17:00
-website: https://simons.ca/en/stores/alberta/londonderry-mall--a26897
diff --git a/data/cities/edmonton/simons.yml b/data/cities/edmonton/simons.yml
index 304044a25..c7c55fd9a 100644
--- a/data/cities/edmonton/simons.yml
+++ b/data/cities/edmonton/simons.yml
@@ -1,11 +1,11 @@
-id: 6997404289
+id: 6991288686
 type: node
-latitude: 53.52351
-longitude: -113.62802
-postcode: T5T 4M2
+latitude: 53.60366
+longitude: -113.44499
+postcode: T5C 3C8
 city: Edmonton
-street: 170 Street NW
-housenumber: "8882"
-phone: +1-780-487-3630
-opening_hours: Mo-Sa 10:00-21:00; Su 11:00-18:00
-website: https://simons.ca/en/stores/alberta/west-edmonton-mall--a13091
+street: Londonderry Mall NorthWest
+housenumber: "1"
+phone: +1-780-633-9880
+opening_hours: Mo-Fr 10:00-21:00; Sa 09:30-17:30; Su 11:00-17:00
+website: https://simons.ca/en/stores/alberta/londonderry-mall--a26897
diff --git a/data/cities/lloydminster/ace-liquor-ray-nelson-drive.yml b/data/cities/lloydminster/ace-liquor-ray-nelson-drive.yml
index c9731f325..0ff941d2f 100644
--- a/data/cities/lloydminster/ace-liquor-ray-nelson-drive.yml
+++ b/data/cities/lloydminster/ace-liquor-ray-nelson-drive.yml
@@ -1,11 +1,11 @@
-id: 5835133486
+id: 5762826639
 type: node
-latitude: 53.27751
-longitude: -110.03326
-postcode: T9V 1V6
+latitude: 53.27712
+longitude: -110.01296
+postcode: T9V 0A7
 city: Lloydminster
 street: Ray Nelson Drive
-housenumber: "5911"
-phone: +1-780-875-5944
-opening_hours: Mo-Th 10:00-22:00; Fr-Sa 10:00-00:00; Su 10:00-22:00
-website: https://aceliquor.ca/
+housenumber: "5211"
+phone: +1 780-875-8570
+opening_hours: Mo-Su 10:00-22:00
+website: https://aceliquor.ca
diff --git a/data/cities/lloydminster/ace-liquor.yml b/data/cities/lloydminster/ace-liquor.yml
index 0ff941d2f..c9731f325 100644
--- a/data/cities/lloydminster/ace-liquor.yml
+++ b/data/cities/lloydminster/ace-liquor.yml
@@ -1,11 +1,11 @@
-id: 5762826639
+id: 5835133486
 type: node
-latitude: 53.27712
-longitude: -110.01296
-postcode: T9V 0A7
+latitude: 53.27751
+longitude: -110.03326
+postcode: T9V 1V6
 city: Lloydminster
 street: Ray Nelson Drive
-housenumber: "5211"
-phone: +1 780-875-8570
-opening_hours: Mo-Su 10:00-22:00
-website: https://aceliquor.ca
+housenumber: "5911"
+phone: +1-780-875-5944
+opening_hours: Mo-Th 10:00-22:00; Fr-Sa 10:00-00:00; Su 10:00-22:00
+website: https://aceliquor.ca/
diff --git a/data/cities/spruce-grove/lucid-cannabis-king-street.yml b/data/cities/spruce-grove/lucid-cannabis-king-street.yml
new file mode 100644
index 000000000..03a01836b
--- /dev/null
+++ b/data/cities/spruce-grove/lucid-cannabis-king-street.yml
@@ -0,0 +1,11 @@
+id: 6914219807
+type: node
+latitude: 53.54179
+longitude: -113.8987
+postcode: T7X 3A2
+city: Spruce Grove
+street: King Street
+housenumber: "100"
+phone: ""
+opening_hours: ""
+website: ""
diff --git a/data/cities/spruce-grove/lucid-cannabis-mcleod-avenue.yml b/data/cities/spruce-grove/lucid-cannabis-mcleod-avenue.yml
deleted file mode 100644
index 9aea087d3..000000000
--- a/data/cities/spruce-grove/lucid-cannabis-mcleod-avenue.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 6983510394
-type: node
-latitude: 53.54266
-longitude: -113.92711
-postcode: T7X 3X3
-city: Spruce Grove
-street: McLeod Avenue
-housenumber: "8"
-phone: ""
-opening_hours: ""
-website: ""
diff --git a/data/cities/spruce-grove/lucid-cannabis.yml b/data/cities/spruce-grove/lucid-cannabis.yml
index 03a01836b..9aea087d3 100644
--- a/data/cities/spruce-grove/lucid-cannabis.yml
+++ b/data/cities/spruce-grove/lucid-cannabis.yml
@@ -1,11 +1,11 @@
-id: 6914219807
+id: 6983510394
 type: node
-latitude: 53.54179
-longitude: -113.8987
-postcode: T7X 3A2
+latitude: 53.54266
+longitude: -113.92711
+postcode: T7X 3X3
 city: Spruce Grove
-street: King Street
-housenumber: "100"
+street: McLeod Avenue
+housenumber: "8"
 phone: ""
 opening_hours: ""
 website: ""