From e0e7002a9dbe381e3875359313d8c1ff59c7b9b8 Mon Sep 17 00:00:00 2001
From: midzer <midzer@gmail.com>
Date: Thu, 12 Dec 2024 10:11:22 +0100
Subject: [PATCH] update content and data

---
 content/cities/airdrie/canadian-tire.md        |  2 +-
 content/cities/airdrie/marks-work-wearhouse.md |  5 -----
 content/cities/airdrie/marks.md                |  5 +++++
 .../airdrie/real-canadian-liquorstore.md       |  5 -----
 ...anadian-superstore-veterans-boulevard-ne.md |  5 +++++
 content/cities/calgary/_index.md               |  4 ++--
 .../cities/calgary/access-auto-sales-ltd.md    |  5 -----
 .../{costco-2.md => costco-32-street-ne.md}    |  2 +-
 .../calgary/freedom-mobile-64-avenue-ne.md     |  5 -----
 .../freedom-mobile-beddington-boulevard-nw.md  |  5 +++++
 .../cities/calgary/partsource-32-street-ne.md  |  5 +++++
 .../cities/calgary/partsource-52-street-se.md  |  5 +++++
 .../calgary/partsource-goddard-avenue-ne.md    |  5 +++++
 .../calgary/pwf-floors-and-decors-calgary.md   |  5 +++++
 ...-street-nw.md => 7-eleven-153-avenue-nw.md} |  2 +-
 .../edmonton/shell-select-50-street-nw.md      |  5 -----
 .../shell-select-mill-woods-road-west-nw.md    |  5 +++++
 content/cities/hay-lakes/_index.md             |  2 +-
 .../7-eleven-columbia-boulevard-w.md           |  5 +++++
 .../7-eleven-mayor-magrath-drive-s.md          |  5 -----
 content/cities/lloydminster/_index.md          |  4 ++--
 .../lloydminster/sobeys-liquor-51-avenue.md    |  5 -----
 .../sobeys-liquor-ray-nelson-drive.md          |  5 +++++
 content/cities/okotoks/_index.md               |  4 ++--
 .../ace-liquor-discounter-1st-avenue.md        |  5 -----
 .../deep-discount-liquor-discounter.md         |  5 +++++
 content/cities/tsuutina/_index.md              |  4 ++--
 content/cities/wabasca-desmarais/_index.md     |  4 ++--
 data/cities/airdrie/canadian-tire.yml          |  2 +-
 data/cities/airdrie/kingsview-barber-shop.yml  |  4 ++--
 .../{marks-work-wearhouse.yml => marks.yml}    |  2 +-
 data/cities/airdrie/mobil-mart.yml             |  2 +-
 ...adian-superstore-veterans-boulevard-ne.yml} |  0
 data/cities/calgary/abom-ski-and-board.yml     |  6 +++---
 data/cities/calgary/access-auto-sales-ltd.yml  | 11 -----------
 data/cities/calgary/costco-2.yml               | 11 -----------
 data/cities/calgary/costco-32-street-ne.yml    | 11 +++++++++++
 data/cities/calgary/costco.yml                 | 16 ++++++++--------
 .../calgary/freedom-mobile-64-avenue-ne.yml    | 11 -----------
 .../freedom-mobile-beddington-boulevard-nw.yml | 11 +++++++++++
 data/cities/calgary/freedom-mobile.yml         | 16 ++++++++--------
 .../cities/calgary/partsource-32-street-ne.yml | 11 +++++++++++
 .../cities/calgary/partsource-52-street-se.yml | 11 +++++++++++
 .../calgary/partsource-goddard-avenue-ne.yml   | 11 +++++++++++
 data/cities/calgary/partsource.yml             | 18 +++++++++---------
 data/cities/calgary/power-recycling.yml        |  4 ++--
 .../calgary/pwf-floors-and-decors-calgary.yml  | 11 +++++++++++
 .../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/shell-select-50-street-nw.yml     | 11 -----------
 .../shell-select-mill-woods-road-west-nw.yml   | 11 +++++++++++
 data/cities/edmonton/shell-select.yml          | 18 +++++++++---------
 .../7-eleven-columbia-boulevard-w.yml          | 11 +++++++++++
 .../7-eleven-mayor-magrath-drive-s.yml         | 11 -----------
 data/cities/lethbridge/7-eleven.yml            | 16 ++++++++--------
 .../ace-liquor-ray-nelson-drive.yml            | 16 ++++++++--------
 data/cities/lloydminster/ace-liquor.yml        | 16 ++++++++--------
 .../lloydminster/sobeys-liquor-51-avenue.yml   | 11 -----------
 .../sobeys-liquor-ray-nelson-drive.yml         | 11 +++++++++++
 data/cities/lloydminster/sobeys-liquor.yml     | 18 +++++++++---------
 data/cities/medicine-hat/daffys-automotive.yml |  2 +-
 ...yml => deep-discount-liquor-discounter.yml} |  0
 data/cities/spruce-grove/telus.yml             |  4 ++--
 64 files changed, 268 insertions(+), 220 deletions(-)
 delete mode 100644 content/cities/airdrie/marks-work-wearhouse.md
 create mode 100644 content/cities/airdrie/marks.md
 delete mode 100644 content/cities/airdrie/real-canadian-liquorstore.md
 create mode 100644 content/cities/airdrie/real-canadian-superstore-veterans-boulevard-ne.md
 delete mode 100644 content/cities/calgary/access-auto-sales-ltd.md
 rename content/cities/calgary/{costco-2.md => costco-32-street-ne.md} (52%)
 delete mode 100644 content/cities/calgary/freedom-mobile-64-avenue-ne.md
 create mode 100644 content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
 create mode 100644 content/cities/calgary/partsource-32-street-ne.md
 create mode 100644 content/cities/calgary/partsource-52-street-se.md
 create mode 100644 content/cities/calgary/partsource-goddard-avenue-ne.md
 create mode 100644 content/cities/calgary/pwf-floors-and-decors-calgary.md
 rename content/cities/edmonton/{7-eleven-103-street-nw.md => 7-eleven-153-avenue-nw.md} (52%)
 delete mode 100644 content/cities/edmonton/shell-select-50-street-nw.md
 create mode 100644 content/cities/edmonton/shell-select-mill-woods-road-west-nw.md
 create mode 100644 content/cities/lethbridge/7-eleven-columbia-boulevard-w.md
 delete mode 100644 content/cities/lethbridge/7-eleven-mayor-magrath-drive-s.md
 delete mode 100644 content/cities/lloydminster/sobeys-liquor-51-avenue.md
 create mode 100644 content/cities/lloydminster/sobeys-liquor-ray-nelson-drive.md
 delete mode 100644 content/cities/spruce-grove/ace-liquor-discounter-1st-avenue.md
 create mode 100644 content/cities/spruce-grove/deep-discount-liquor-discounter.md
 rename data/cities/airdrie/{marks-work-wearhouse.yml => marks.yml} (88%)
 rename data/cities/airdrie/{real-canadian-liquorstore.yml => real-canadian-superstore-veterans-boulevard-ne.yml} (100%)
 delete mode 100644 data/cities/calgary/access-auto-sales-ltd.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/freedom-mobile-64-avenue-ne.yml
 create mode 100644 data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
 create mode 100644 data/cities/calgary/partsource-32-street-ne.yml
 create mode 100644 data/cities/calgary/partsource-52-street-se.yml
 create mode 100644 data/cities/calgary/partsource-goddard-avenue-ne.yml
 create mode 100644 data/cities/calgary/pwf-floors-and-decors-calgary.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/shell-select-50-street-nw.yml
 create mode 100644 data/cities/edmonton/shell-select-mill-woods-road-west-nw.yml
 create mode 100644 data/cities/lethbridge/7-eleven-columbia-boulevard-w.yml
 delete mode 100644 data/cities/lethbridge/7-eleven-mayor-magrath-drive-s.yml
 delete mode 100644 data/cities/lloydminster/sobeys-liquor-51-avenue.yml
 create mode 100644 data/cities/lloydminster/sobeys-liquor-ray-nelson-drive.yml
 rename data/cities/spruce-grove/{ace-liquor-discounter-1st-avenue.yml => deep-discount-liquor-discounter.yml} (100%)

diff --git a/content/cities/airdrie/canadian-tire.md b/content/cities/airdrie/canadian-tire.md
index ba3768156..82096e5af 100644
--- a/content/cities/airdrie/canadian-tire.md
+++ b/content/cities/airdrie/canadian-tire.md
@@ -1,5 +1,5 @@
 ---
 title: "Canadian Tire"
 url: /airdrie/canadian-tire/
-shop: car repair
+shop: department store
 ---
\ No newline at end of file
diff --git a/content/cities/airdrie/marks-work-wearhouse.md b/content/cities/airdrie/marks-work-wearhouse.md
deleted file mode 100644
index f13630329..000000000
--- a/content/cities/airdrie/marks-work-wearhouse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Marks Work Wearhouse"
-url: /airdrie/marks-work-wearhouse/
-shop: clothes
----
\ No newline at end of file
diff --git a/content/cities/airdrie/marks.md b/content/cities/airdrie/marks.md
new file mode 100644
index 000000000..53bd61716
--- /dev/null
+++ b/content/cities/airdrie/marks.md
@@ -0,0 +1,5 @@
+---
+title: "Mark's"
+url: /airdrie/marks/
+shop: clothes
+---
\ No newline at end of file
diff --git a/content/cities/airdrie/real-canadian-liquorstore.md b/content/cities/airdrie/real-canadian-liquorstore.md
deleted file mode 100644
index b921a5365..000000000
--- a/content/cities/airdrie/real-canadian-liquorstore.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Real Canadian Liquorstore"
-url: /airdrie/real-canadian-liquorstore/
-shop: alcohol
----
\ No newline at end of file
diff --git a/content/cities/airdrie/real-canadian-superstore-veterans-boulevard-ne.md b/content/cities/airdrie/real-canadian-superstore-veterans-boulevard-ne.md
new file mode 100644
index 000000000..ab36ed90e
--- /dev/null
+++ b/content/cities/airdrie/real-canadian-superstore-veterans-boulevard-ne.md
@@ -0,0 +1,5 @@
+---
+title: "Real Canadian Superstore"
+url: /airdrie/real-canadian-superstore-veterans-boulevard-ne/
+shop: alcohol
+---
\ No newline at end of file
diff --git a/content/cities/calgary/_index.md b/content/cities/calgary/_index.md
index c5a62d00e..8f417a7a4 100644
--- a/content/cities/calgary/_index.md
+++ b/content/cities/calgary/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Calgary
 url: /calgary/
-latitude: 51.148
-longitude: -114.072
+latitude: 51.104
+longitude: -114.188
 ---
\ No newline at end of file
diff --git a/content/cities/calgary/access-auto-sales-ltd.md b/content/cities/calgary/access-auto-sales-ltd.md
deleted file mode 100644
index 92f95fdf8..000000000
--- a/content/cities/calgary/access-auto-sales-ltd.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Access Auto Sales Ltd."
-url: /calgary/access-auto-sales-ltd/
-shop: car
----
\ 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/freedom-mobile-64-avenue-ne.md b/content/cities/calgary/freedom-mobile-64-avenue-ne.md
deleted file mode 100644
index 0150e64a6..000000000
--- a/content/cities/calgary/freedom-mobile-64-avenue-ne.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-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
new file mode 100644
index 000000000..20e4b2540
--- /dev/null
+++ b/content/cities/calgary/freedom-mobile-beddington-boulevard-nw.md
@@ -0,0 +1,5 @@
+---
+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/partsource-32-street-ne.md b/content/cities/calgary/partsource-32-street-ne.md
new file mode 100644
index 000000000..f70a51497
--- /dev/null
+++ b/content/cities/calgary/partsource-32-street-ne.md
@@ -0,0 +1,5 @@
+---
+title: "PartSource"
+url: /calgary/partsource-32-street-ne/
+shop: car parts
+---
\ No newline at end of file
diff --git a/content/cities/calgary/partsource-52-street-se.md b/content/cities/calgary/partsource-52-street-se.md
new file mode 100644
index 000000000..0cde394d0
--- /dev/null
+++ b/content/cities/calgary/partsource-52-street-se.md
@@ -0,0 +1,5 @@
+---
+title: "PartSource"
+url: /calgary/partsource-52-street-se/
+shop: car parts
+---
\ No newline at end of file
diff --git a/content/cities/calgary/partsource-goddard-avenue-ne.md b/content/cities/calgary/partsource-goddard-avenue-ne.md
new file mode 100644
index 000000000..d5e99c6e5
--- /dev/null
+++ b/content/cities/calgary/partsource-goddard-avenue-ne.md
@@ -0,0 +1,5 @@
+---
+title: "PartSource"
+url: /calgary/partsource-goddard-avenue-ne/
+shop: car parts
+---
\ No newline at end of file
diff --git a/content/cities/calgary/pwf-floors-and-decors-calgary.md b/content/cities/calgary/pwf-floors-and-decors-calgary.md
new file mode 100644
index 000000000..daa90f264
--- /dev/null
+++ b/content/cities/calgary/pwf-floors-and-decors-calgary.md
@@ -0,0 +1,5 @@
+---
+title: "PWF Floors & Decors - Calgary"
+url: /calgary/pwf-floors-and-decors-calgary/
+shop: flooring
+---
\ 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/shell-select-50-street-nw.md b/content/cities/edmonton/shell-select-50-street-nw.md
deleted file mode 100644
index 6c79f973c..000000000
--- a/content/cities/edmonton/shell-select-50-street-nw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Shell Select"
-url: /edmonton/shell-select-50-street-nw/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/edmonton/shell-select-mill-woods-road-west-nw.md b/content/cities/edmonton/shell-select-mill-woods-road-west-nw.md
new file mode 100644
index 000000000..c1fc2d2ca
--- /dev/null
+++ b/content/cities/edmonton/shell-select-mill-woods-road-west-nw.md
@@ -0,0 +1,5 @@
+---
+title: "Shell Select"
+url: /edmonton/shell-select-mill-woods-road-west-nw/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/hay-lakes/_index.md b/content/cities/hay-lakes/_index.md
index 6781f9823..4873dc8c2 100644
--- a/content/cities/hay-lakes/_index.md
+++ b/content/cities/hay-lakes/_index.md
@@ -2,5 +2,5 @@
 title: Hay Lakes
 url: /hay-lakes/
 latitude: 53.197
-longitude: -113.058
+longitude: -113.06
 ---
\ No newline at end of file
diff --git a/content/cities/lethbridge/7-eleven-columbia-boulevard-w.md b/content/cities/lethbridge/7-eleven-columbia-boulevard-w.md
new file mode 100644
index 000000000..0ef3c9e28
--- /dev/null
+++ b/content/cities/lethbridge/7-eleven-columbia-boulevard-w.md
@@ -0,0 +1,5 @@
+---
+title: "7-Eleven"
+url: /lethbridge/7-eleven-columbia-boulevard-w/
+shop: convenience
+---
\ No newline at end of file
diff --git a/content/cities/lethbridge/7-eleven-mayor-magrath-drive-s.md b/content/cities/lethbridge/7-eleven-mayor-magrath-drive-s.md
deleted file mode 100644
index f1bf088db..000000000
--- a/content/cities/lethbridge/7-eleven-mayor-magrath-drive-s.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "7-Eleven"
-url: /lethbridge/7-eleven-mayor-magrath-drive-s/
-shop: convenience
----
\ No newline at end of file
diff --git a/content/cities/lloydminster/_index.md b/content/cities/lloydminster/_index.md
index ad1b9309d..b0d3ef555 100644
--- a/content/cities/lloydminster/_index.md
+++ b/content/cities/lloydminster/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Lloydminster
 url: /lloydminster/
-latitude: 53.278
-longitude: -110.023
+latitude: 53.276
+longitude: -110.052
 ---
\ No newline at end of file
diff --git a/content/cities/lloydminster/sobeys-liquor-51-avenue.md b/content/cities/lloydminster/sobeys-liquor-51-avenue.md
deleted file mode 100644
index fc5d388ec..000000000
--- a/content/cities/lloydminster/sobeys-liquor-51-avenue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Sobeys Liquor"
-url: /lloydminster/sobeys-liquor-51-avenue/
-shop: alcohol
----
\ No newline at end of file
diff --git a/content/cities/lloydminster/sobeys-liquor-ray-nelson-drive.md b/content/cities/lloydminster/sobeys-liquor-ray-nelson-drive.md
new file mode 100644
index 000000000..753a3e1c0
--- /dev/null
+++ b/content/cities/lloydminster/sobeys-liquor-ray-nelson-drive.md
@@ -0,0 +1,5 @@
+---
+title: "Sobeys Liquor"
+url: /lloydminster/sobeys-liquor-ray-nelson-drive/
+shop: alcohol
+---
\ No newline at end of file
diff --git a/content/cities/okotoks/_index.md b/content/cities/okotoks/_index.md
index 256a91111..4ecb93295 100644
--- a/content/cities/okotoks/_index.md
+++ b/content/cities/okotoks/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Okotoks
 url: /okotoks/
-latitude: 50.725
-longitude: -113.983
+latitude: 50.726
+longitude: -113.982
 ---
\ No newline at end of file
diff --git a/content/cities/spruce-grove/ace-liquor-discounter-1st-avenue.md b/content/cities/spruce-grove/ace-liquor-discounter-1st-avenue.md
deleted file mode 100644
index e063d4a8f..000000000
--- a/content/cities/spruce-grove/ace-liquor-discounter-1st-avenue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Ace Liquor Discounter"
-url: /spruce-grove/ace-liquor-discounter-1st-avenue/
-shop: alcohol
----
\ No newline at end of file
diff --git a/content/cities/spruce-grove/deep-discount-liquor-discounter.md b/content/cities/spruce-grove/deep-discount-liquor-discounter.md
new file mode 100644
index 000000000..2675d959d
--- /dev/null
+++ b/content/cities/spruce-grove/deep-discount-liquor-discounter.md
@@ -0,0 +1,5 @@
+---
+title: "Deep Discount Liquor Discounter"
+url: /spruce-grove/deep-discount-liquor-discounter/
+shop: alcohol
+---
\ No newline at end of file
diff --git a/content/cities/tsuutina/_index.md b/content/cities/tsuutina/_index.md
index 0f2800fb5..416fcb5f6 100644
--- a/content/cities/tsuutina/_index.md
+++ b/content/cities/tsuutina/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Tsuut'ina
 url: /tsuutina/
-latitude: 51
-longitude: -114.162
+latitude: 50.999
+longitude: -114.163
 ---
\ No newline at end of file
diff --git a/content/cities/wabasca-desmarais/_index.md b/content/cities/wabasca-desmarais/_index.md
index 302635ce5..1a6b61225 100644
--- a/content/cities/wabasca-desmarais/_index.md
+++ b/content/cities/wabasca-desmarais/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Wabasca-Desmarais
 url: /wabasca-desmarais/
-latitude: 55.972
-longitude: -113.847
+latitude: 55.949
+longitude: -113.82
 ---
\ No newline at end of file
diff --git a/data/cities/airdrie/canadian-tire.yml b/data/cities/airdrie/canadian-tire.yml
index 2bbbec88e..591d22de4 100644
--- a/data/cities/airdrie/canadian-tire.yml
+++ b/data/cities/airdrie/canadian-tire.yml
@@ -1,7 +1,7 @@
 id: 115940311
 type: node
 latitude: 51.30276
-longitude: -114.00506
+longitude: -114.00511
 postcode: T4B 3P2
 city: Airdrie
 street: Veterans Boulevard NE
diff --git a/data/cities/airdrie/kingsview-barber-shop.yml b/data/cities/airdrie/kingsview-barber-shop.yml
index 6128100e6..05947fb7d 100644
--- a/data/cities/airdrie/kingsview-barber-shop.yml
+++ b/data/cities/airdrie/kingsview-barber-shop.yml
@@ -1,7 +1,7 @@
 id: 817405150
 type: node
-latitude: 51.26947
-longitude: -113.99462
+latitude: 51.26949
+longitude: -113.99465
 postcode: T4A 0R8
 city: Airdrie
 street: Market Street SE
diff --git a/data/cities/airdrie/marks-work-wearhouse.yml b/data/cities/airdrie/marks.yml
similarity index 88%
rename from data/cities/airdrie/marks-work-wearhouse.yml
rename to data/cities/airdrie/marks.yml
index 2883d7b26..2a9ca96e4 100644
--- a/data/cities/airdrie/marks-work-wearhouse.yml
+++ b/data/cities/airdrie/marks.yml
@@ -1,7 +1,7 @@
 id: 115940315
 type: node
 latitude: 51.3014
-longitude: -114.00581
+longitude: -114.00585
 postcode: T4B 3P2
 city: Airdrie
 street: Veterans Boulevard NE
diff --git a/data/cities/airdrie/mobil-mart.yml b/data/cities/airdrie/mobil-mart.yml
index 77337321b..f7975791d 100644
--- a/data/cities/airdrie/mobil-mart.yml
+++ b/data/cities/airdrie/mobil-mart.yml
@@ -1,7 +1,7 @@
 id: 168056488
 type: node
 latitude: 51.30065
-longitude: -114.0093
+longitude: -114.00933
 postcode: T4B 3P2
 city: Airdrie
 street: Veterans Boulevard NE
diff --git a/data/cities/airdrie/real-canadian-liquorstore.yml b/data/cities/airdrie/real-canadian-superstore-veterans-boulevard-ne.yml
similarity index 100%
rename from data/cities/airdrie/real-canadian-liquorstore.yml
rename to data/cities/airdrie/real-canadian-superstore-veterans-boulevard-ne.yml
diff --git a/data/cities/calgary/abom-ski-and-board.yml b/data/cities/calgary/abom-ski-and-board.yml
index e96bdc866..5bb4eb9c8 100644
--- a/data/cities/calgary/abom-ski-and-board.yml
+++ b/data/cities/calgary/abom-ski-and-board.yml
@@ -1,7 +1,7 @@
-id: 7961158373
+id: 1341686208
 type: node
-latitude: 51.05562
-longitude: -114.11736
+latitude: 51.05571
+longitude: -114.11744
 postcode: T2N 4J6
 city: Calgary
 street: Crowchild Trail NW
diff --git a/data/cities/calgary/access-auto-sales-ltd.yml b/data/cities/calgary/access-auto-sales-ltd.yml
deleted file mode 100644
index 2060c0fbe..000000000
--- a/data/cities/calgary/access-auto-sales-ltd.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5907406191
-type: node
-latitude: 51.02902
-longitude: -114.03005
-postcode: T2G 4N4
-city: Calgary
-street: Bonnybrook Road SE
-housenumber: "2815"
-phone: +1 403 813 5965
-opening_hours: Mo-Su 10:00-20:00
-website: https://accessautocalgary.ca/
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/freedom-mobile-64-avenue-ne.yml b/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
deleted file mode 100644
index 773cbe116..000000000
--- a/data/cities/calgary/freedom-mobile-64-avenue-ne.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-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
new file mode 100644
index 000000000..5208466c1
--- /dev/null
+++ b/data/cities/calgary/freedom-mobile-beddington-boulevard-nw.yml
@@ -0,0 +1,11 @@
+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 5208466c1..773cbe116 100644
--- a/data/cities/calgary/freedom-mobile.yml
+++ b/data/cities/calgary/freedom-mobile.yml
@@ -1,11 +1,11 @@
-id: 8793422147
+id: 8796945780
 type: node
-latitude: 51.12697
-longitude: -114.07355
-postcode: T3K 2A8
+latitude: 51.10932
+longitude: -114.04099
+postcode: T2E 7P4
 city: Calgary
-street: Beddington Boulevard NW
-housenumber: "8120"
-phone: +1 403-402-5555
+street: 64 Avenue NE
+housenumber: "901"
+phone: "+14039037799"
 opening_hours: ""
-website: https://www.freedommobile.ca
+website: "+14039037799"
diff --git a/data/cities/calgary/partsource-32-street-ne.yml b/data/cities/calgary/partsource-32-street-ne.yml
new file mode 100644
index 000000000..97907e17e
--- /dev/null
+++ b/data/cities/calgary/partsource-32-street-ne.yml
@@ -0,0 +1,11 @@
+id: 279022171
+type: node
+latitude: 51.08051
+longitude: -113.98794
+postcode: T1Y 6J7
+city: Calgary
+street: 32 Street NE
+housenumber: "3182"
+phone: +1-403-717-4220
+opening_hours: Mo-Fr 08:00-20:00,Sa 0800-17:00,Su 0900:17:00
+website: https://partsource.ca/pages/calgary-store-3182-32nd-street-north-east
diff --git a/data/cities/calgary/partsource-52-street-se.yml b/data/cities/calgary/partsource-52-street-se.yml
new file mode 100644
index 000000000..a6309f415
--- /dev/null
+++ b/data/cities/calgary/partsource-52-street-se.yml
@@ -0,0 +1,11 @@
+id: 261468512
+type: node
+latitude: 51.03734
+longitude: -113.95906
+postcode: T2B 2Y5
+city: Calgary
+street: 52 Street SE
+housenumber: "1817"
+phone: +1-403-204-7854
+opening_hours: Mo-Fr 08:00-20:00,Sa 0800-17:00,Su 0900:17:00
+website: https://partsource.ca/pages/calgary-store-1817-52nd-street-south-east
diff --git a/data/cities/calgary/partsource-goddard-avenue-ne.yml b/data/cities/calgary/partsource-goddard-avenue-ne.yml
new file mode 100644
index 000000000..f469e92ce
--- /dev/null
+++ b/data/cities/calgary/partsource-goddard-avenue-ne.yml
@@ -0,0 +1,11 @@
+id: 569419117
+type: node
+latitude: 51.09642
+longitude: -114.05088
+postcode: T2K 6K1
+city: Calgary
+street: Goddard Avenue NE
+housenumber: "637"
+phone: +1-403-274-5901
+opening_hours: Mo-Fr 08:00-20:00, Sa 08:00-17:00, Su 09:00-17:00
+website: https://partsource.ca/pages/calgary-store-637-goddard-avenue-north-east
diff --git a/data/cities/calgary/partsource.yml b/data/cities/calgary/partsource.yml
index 3a372099a..3d6c7cd04 100644
--- a/data/cities/calgary/partsource.yml
+++ b/data/cities/calgary/partsource.yml
@@ -1,11 +1,11 @@
-id: 569419117
+id: 12403292836
 type: node
-latitude: 51.09642
-longitude: -114.05088
-postcode: T2K 6K1
+latitude: 51.03838
+longitude: -114.14011
+postcode: T3E 0B8
 city: Calgary
-street: Goddard Avenue NE
-housenumber: "637"
-phone: ""
-opening_hours: Mo-Fr 08:00-21:00, Sa 09:00-18:00, Su 09:00-18:00
-website: ""
+street: 17 Avenue SW
+housenumber: "3708"
+phone: +1-403-240-4315
+opening_hours: Mo-Fr 08:00-20:00,Sa 0800-17:00,Su 0900:17:00
+website: https://partsource.ca/pages/calgary-store-3708-17th-avenue-south-west
diff --git a/data/cities/calgary/power-recycling.yml b/data/cities/calgary/power-recycling.yml
index 348ddb475..077fe0546 100644
--- a/data/cities/calgary/power-recycling.yml
+++ b/data/cities/calgary/power-recycling.yml
@@ -1,7 +1,7 @@
 id: 433293529
 type: node
-latitude: 51.02911
-longitude: -114.0314
+latitude: 51.02912
+longitude: -114.03137
 postcode: T2G 4R4
 city: Calgary
 street: Ogden Road SE
diff --git a/data/cities/calgary/pwf-floors-and-decors-calgary.yml b/data/cities/calgary/pwf-floors-and-decors-calgary.yml
new file mode 100644
index 000000000..c08e3f140
--- /dev/null
+++ b/data/cities/calgary/pwf-floors-and-decors-calgary.yml
@@ -0,0 +1,11 @@
+id: 432393387
+type: node
+latitude: 51.01684
+longitude: -114.04021
+postcode: T2G 1Z4
+city: Calgary
+street: 42 Avenue SE
+housenumber: "1010"
+phone: (403) 452-2700
+opening_hours: 'Mo-Su 09:00-21:00 Sat: 10:00 - 20:00'
+website: ""
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/shell-select-50-street-nw.yml b/data/cities/edmonton/shell-select-50-street-nw.yml
deleted file mode 100644
index 12e101d10..000000000
--- a/data/cities/edmonton/shell-select-50-street-nw.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 263743701
-type: node
-latitude: 53.49884
-longitude: -113.4191
-postcode: T6B 2N7
-city: Edmonton
-street: 50 Street NW
-housenumber: "6124"
-phone: +1-780-468-9320
-opening_hours: Mo-Su 05:00-23:00
-website: https://find.shell.com/ca/fuel/10060787-64th-ave-50th-st/en_CA
diff --git a/data/cities/edmonton/shell-select-mill-woods-road-west-nw.yml b/data/cities/edmonton/shell-select-mill-woods-road-west-nw.yml
new file mode 100644
index 000000000..bdaa23a0b
--- /dev/null
+++ b/data/cities/edmonton/shell-select-mill-woods-road-west-nw.yml
@@ -0,0 +1,11 @@
+id: 321200177
+type: node
+latitude: 53.44885
+longitude: -113.45078
+postcode: T6K 4C3
+city: Edmonton
+street: Mill Woods Road West NW
+housenumber: "1968"
+phone: +1-780-461-2683
+opening_hours: Mo-Su 05:30-23:30
+website: https://find.shell.com/ca/fuel/10052964-mill-woods-rd-knottwood
diff --git a/data/cities/edmonton/shell-select.yml b/data/cities/edmonton/shell-select.yml
index bdaa23a0b..12e101d10 100644
--- a/data/cities/edmonton/shell-select.yml
+++ b/data/cities/edmonton/shell-select.yml
@@ -1,11 +1,11 @@
-id: 321200177
+id: 263743701
 type: node
-latitude: 53.44885
-longitude: -113.45078
-postcode: T6K 4C3
+latitude: 53.49884
+longitude: -113.4191
+postcode: T6B 2N7
 city: Edmonton
-street: Mill Woods Road West NW
-housenumber: "1968"
-phone: +1-780-461-2683
-opening_hours: Mo-Su 05:30-23:30
-website: https://find.shell.com/ca/fuel/10052964-mill-woods-rd-knottwood
+street: 50 Street NW
+housenumber: "6124"
+phone: +1-780-468-9320
+opening_hours: Mo-Su 05:00-23:00
+website: https://find.shell.com/ca/fuel/10060787-64th-ave-50th-st/en_CA
diff --git a/data/cities/lethbridge/7-eleven-columbia-boulevard-w.yml b/data/cities/lethbridge/7-eleven-columbia-boulevard-w.yml
new file mode 100644
index 000000000..25e52f3cc
--- /dev/null
+++ b/data/cities/lethbridge/7-eleven-columbia-boulevard-w.yml
@@ -0,0 +1,11 @@
+id: 8702066198
+type: node
+latitude: 49.67043
+longitude: -112.89034
+postcode: T1K 5J9
+city: Lethbridge
+street: Columbia Boulevard W
+housenumber: "680"
+phone: +1-403-360-3772
+opening_hours: 24/7
+website: https://stores.7-eleven.ca/store/38349
diff --git a/data/cities/lethbridge/7-eleven-mayor-magrath-drive-s.yml b/data/cities/lethbridge/7-eleven-mayor-magrath-drive-s.yml
deleted file mode 100644
index a5686a4f3..000000000
--- a/data/cities/lethbridge/7-eleven-mayor-magrath-drive-s.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 8581122605
-type: node
-latitude: 49.67316
-longitude: -112.80103
-postcode: T1K 2R9
-city: Lethbridge
-street: Mayor Magrath Drive S
-housenumber: "2004"
-phone: +1-403-327-4070
-opening_hours: 24/7
-website: https://stores.7-eleven.ca/store/15638
diff --git a/data/cities/lethbridge/7-eleven.yml b/data/cities/lethbridge/7-eleven.yml
index 25e52f3cc..a5686a4f3 100644
--- a/data/cities/lethbridge/7-eleven.yml
+++ b/data/cities/lethbridge/7-eleven.yml
@@ -1,11 +1,11 @@
-id: 8702066198
+id: 8581122605
 type: node
-latitude: 49.67043
-longitude: -112.89034
-postcode: T1K 5J9
+latitude: 49.67316
+longitude: -112.80103
+postcode: T1K 2R9
 city: Lethbridge
-street: Columbia Boulevard W
-housenumber: "680"
-phone: +1-403-360-3772
+street: Mayor Magrath Drive S
+housenumber: "2004"
+phone: +1-403-327-4070
 opening_hours: 24/7
-website: https://stores.7-eleven.ca/store/38349
+website: https://stores.7-eleven.ca/store/15638
diff --git a/data/cities/lloydminster/ace-liquor-ray-nelson-drive.yml b/data/cities/lloydminster/ace-liquor-ray-nelson-drive.yml
index 0ff941d2f..c9731f325 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: 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/lloydminster/ace-liquor.yml b/data/cities/lloydminster/ace-liquor.yml
index c9731f325..0ff941d2f 100644
--- a/data/cities/lloydminster/ace-liquor.yml
+++ b/data/cities/lloydminster/ace-liquor.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/sobeys-liquor-51-avenue.yml b/data/cities/lloydminster/sobeys-liquor-51-avenue.yml
deleted file mode 100644
index 3ad0912e3..000000000
--- a/data/cities/lloydminster/sobeys-liquor-51-avenue.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 5906917352
-type: node
-latitude: 53.27097
-longitude: -110.0077
-postcode: T9V 2C3
-city: Lloydminster
-street: 51 Avenue
-housenumber: "3601"
-phone: +1-780-871-0567
-opening_hours: Mo-Th 10:00-23:00; Fr-Sa 10:00-00:00; Su 10:00-20:00
-website: https://liquor.sobeys.com/stores/lloydminster-36-st/
diff --git a/data/cities/lloydminster/sobeys-liquor-ray-nelson-drive.yml b/data/cities/lloydminster/sobeys-liquor-ray-nelson-drive.yml
new file mode 100644
index 000000000..4cd6a9616
--- /dev/null
+++ b/data/cities/lloydminster/sobeys-liquor-ray-nelson-drive.yml
@@ -0,0 +1,11 @@
+id: 5808072183
+type: node
+latitude: 53.27729
+longitude: -110.05328
+postcode: T9V 2X1
+city: Lloydminster
+street: Ray Nelson Drive
+housenumber: "7415"
+phone: +1-780-875-7117
+opening_hours: Mo-Th 10:00-23:00, Fr-Sa 10:00-00:00, Su 10:00-20:00
+website: https://liquor.sobeys.com/stores/lloydminster/
diff --git a/data/cities/lloydminster/sobeys-liquor.yml b/data/cities/lloydminster/sobeys-liquor.yml
index 4cd6a9616..3ad0912e3 100644
--- a/data/cities/lloydminster/sobeys-liquor.yml
+++ b/data/cities/lloydminster/sobeys-liquor.yml
@@ -1,11 +1,11 @@
-id: 5808072183
+id: 5906917352
 type: node
-latitude: 53.27729
-longitude: -110.05328
-postcode: T9V 2X1
+latitude: 53.27097
+longitude: -110.0077
+postcode: T9V 2C3
 city: Lloydminster
-street: Ray Nelson Drive
-housenumber: "7415"
-phone: +1-780-875-7117
-opening_hours: Mo-Th 10:00-23:00, Fr-Sa 10:00-00:00, Su 10:00-20:00
-website: https://liquor.sobeys.com/stores/lloydminster/
+street: 51 Avenue
+housenumber: "3601"
+phone: +1-780-871-0567
+opening_hours: Mo-Th 10:00-23:00; Fr-Sa 10:00-00:00; Su 10:00-20:00
+website: https://liquor.sobeys.com/stores/lloydminster-36-st/
diff --git a/data/cities/medicine-hat/daffys-automotive.yml b/data/cities/medicine-hat/daffys-automotive.yml
index 28d05e23b..b987b7e0d 100644
--- a/data/cities/medicine-hat/daffys-automotive.yml
+++ b/data/cities/medicine-hat/daffys-automotive.yml
@@ -4,7 +4,7 @@ latitude: 50.0189
 longitude: -110.70992
 postcode: T1A 8B7
 city: Medicine Hat
-street: 10 Ave SW
+street: 10 Avenue Southwest
 housenumber: "2139"
 phone: +1 403-526-8636
 opening_hours: Mo-Th 07:30-17:00, Fr 07:30-12:00
diff --git a/data/cities/spruce-grove/ace-liquor-discounter-1st-avenue.yml b/data/cities/spruce-grove/deep-discount-liquor-discounter.yml
similarity index 100%
rename from data/cities/spruce-grove/ace-liquor-discounter-1st-avenue.yml
rename to data/cities/spruce-grove/deep-discount-liquor-discounter.yml
diff --git a/data/cities/spruce-grove/telus.yml b/data/cities/spruce-grove/telus.yml
index ad02c77c1..5b7bb8310 100644
--- a/data/cities/spruce-grove/telus.yml
+++ b/data/cities/spruce-grove/telus.yml
@@ -1,7 +1,7 @@
 id: 5504321847
 type: node
-latitude: 53.54242
-longitude: -113.88041
+latitude: 53.54241
+longitude: -113.88052
 postcode: T7X 0C8
 city: Spruce Grove
 street: Century Crossing