diff --git a/PennyMe/PinViewController.swift b/PennyMe/PinViewController.swift
index 77b9a781..b642c01b 100644
--- a/PennyMe/PinViewController.swift
+++ b/PennyMe/PinViewController.swift
@@ -74,7 +74,7 @@ class PinViewController: UITableViewController {
else{
//open mailto url
let mailtostring = String(
- "mailto:wnina@ethz.ch?subject=[PennyMe] - Picture of machine \(pinData.id)&body=Dear PennyMe developers,\n\n Please find enclosed a picture of the machine at \(pinData.title!) (ID=\(pinData.id)).\nDetails of machine:\n**PLEASE FILL IN ANY IMPORTANT DETAILS HERE**\n\nWith sending this mail, I grant the PennyMe team the unrestricted right to process, alter, share, distribute and publicly expose this image.\n\n With best regards,"
+ "mailto:wnina@ethz.ch?subject=[PennyMe] - Picture of machine \(pinData.id)&body=Dear PennyMe developers,\n\n Please find enclosed a picture of the machine at \(pinData.title!) (ID=\(pinData.id)).\nDetails of machine:\n**PLEASE FILL IN ANY IMPORTANT DETAILS HERE. NOTE: Please send a sharp picture in landscape orientation. The penny motives should be visible, otherwise sent multiple images**\n\nWith sending this mail, I grant the PennyMe team the unrestricted right to process, alter, share, distribute and publicly expose this image.\n\n With best regards,"
).addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? "error"
UIApplication.shared.openURL(URL(string: mailtostring)!)
}
diff --git a/data/all_locations.json b/data/all_locations.json
index 099f3cfd..2c3917fa 100644
--- a/data/all_locations.json
+++ b/data/all_locations.json
@@ -81418,8 +81418,7 @@
"latitude": "43.7744562",
"longitude": "11.2548595",
"id": 919,
- "last_updated": "2021-06-18",
- "has_image": true
+ "last_updated": "2021-06-18"
}
},
{
@@ -90461,8 +90460,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "Requires 2 CHF + 20 Rappen."
- },
- "has_image": true
+ }
}
},
{
@@ -90580,8 +90578,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-04-05": "Requires 2x 100 + 5 Hungarian forint."
- },
- "has_image": true
+ }
}
},
{
@@ -90630,8 +90627,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "Requires 2x 100 + 5 Hungarian forint."
- },
- "has_image": true
+ }
}
},
{
@@ -90798,8 +90794,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-04-05": "Watch out for the other machine nearby."
- },
- "has_image": true
+ }
}
},
{
@@ -90825,8 +90820,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-04-05": "Requires 2x 100 + 5 Hungarian forint. Watch out for the other machine nearby."
- },
- "has_image": true
+ }
}
},
{
@@ -91059,8 +91053,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "Requires 2x 100 + 5 Hungarian forint."
- },
- "has_image": true
+ }
}
},
{
@@ -91106,8 +91099,7 @@
"latitude": "46.891028",
"longitude": "17.8901768",
"id": 864,
- "last_updated": "2021-11-14",
- "has_image": true
+ "last_updated": "2021-11-14"
}
},
{
@@ -91271,8 +91263,7 @@
"latitude": "46.947933",
"longitude": "7.459712",
"id": 714,
- "last_updated": "2021-06-18",
- "has_image": true
+ "last_updated": "2021-06-18"
}
},
{
@@ -91781,9 +91772,9 @@
"latitude": "47.199183",
"longitude": "8.791195",
"id": 725,
- "last_updated": "2021-11-14",
+ "last_updated": "2021-12-18",
"logs": {
- "2021-11-14": "Could not find machine before the entrance anymore. Checked both levels, but it might have been move inside the waterpark (behind paywall)."
+ "2021-11-14": "Could not find machine before the entrance anymore. Checked both levels, but it might have been move inside the waterpark."
}
}
},
@@ -92142,17 +92133,18 @@
]
},
"properties": {
- "name": "Saurier Museum Aartal",
+ "name": "Sauriermuseum Aathal",
"active": true,
"area": "Switzerland",
- "address": "Zuerichstrasse 69",
+ "address": "Zuerichstrasse 69, 8607 Aathal",
"status": "unvisited",
"external_url": "http://209.221.138.252/Details.aspx?location=253736",
"internal_url": "null",
"latitude": "47.338841",
"longitude": "8.761913",
"id": 713,
- "last_updated": "2021-04-05"
+ "last_updated": "2021-12-18",
+ "notes": "paywall"
}
},
{
@@ -92191,15 +92183,14 @@
"name": "Ütliberg Kulm",
"active": true,
"area": "Switzerland",
- "address": "8143 Zurich, Switzerland",
+ "address": "8143 Zurich/Zürich, Switzerland",
"status": "unvisited",
"external_url": "http://209.221.138.252/Details.aspx?location=76235",
"internal_url": "null",
"latitude": "47.349676",
"longitude": "8.491475",
"id": 711,
- "last_updated": "2021-04-05",
- "has_image": true
+ "last_updated": "2021-12-18"
}
},
{
@@ -92230,22 +92221,22 @@
"geometry": {
"type": "Point",
"coordinates": [
- 8.543251,
- 47.369857
+ 8.543325,
+ 47.370296
]
},
"properties": {
"name": "Wasserkirche (Zürich)",
"active": true,
"area": "Switzerland",
- "address": "Limmatquai 31, 8001 Zurich, Switzerland",
+ "address": "Teddy's Souvenir shop, Limmatquai 34, 8001 Zurich, Switzerland",
"status": "unvisited",
"external_url": "http://209.221.138.252/Details.aspx?location=103894",
"internal_url": "null",
- "latitude": "47.369857",
- "longitude": "8.543251",
+ "latitude": "47.370296",
+ "longitude": "8.543325",
"id": 712,
- "last_updated": "2021-04-05"
+ "last_updated": "2021-12-18"
}
},
{
@@ -93352,8 +93343,7 @@
"last_updated": "2021-04-05",
"logs": {
"2021-04-05": "It's unknown at which platform/level of the lift the machine is"
- },
- "has_image": true
+ }
}
},
{
@@ -93606,8 +93596,7 @@
"latitude": "47.650238",
"longitude": "9.482655",
"id": 5048,
- "last_updated": "2021-11-14",
- "has_image": true
+ "last_updated": "2021-11-14"
}
},
{
@@ -93630,8 +93619,7 @@
"latitude": "47.659847",
"longitude": "9.176850",
"id": 5044,
- "last_updated": "2021-11-14",
- "has_image": true
+ "last_updated": "2021-11-14"
}
},
{
@@ -93907,8 +93895,7 @@
"latitude": "47.692142",
"longitude": "9.271528",
"id": 558,
- "last_updated": "2021-11-14",
- "has_image": true
+ "last_updated": "2021-11-14"
}
},
{
@@ -94095,8 +94082,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "Updated machine location."
- },
- "has_image": true
+ }
}
},
{
@@ -94812,8 +94798,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "There is several machines on different levels on the stairs to the tower. Watch out for the entrance hours. Machines should require 1 Euro and 5 Cents. "
- },
- "has_image": true
+ }
}
},
{
@@ -96584,8 +96569,8 @@
"latitude": "49.28468564868198",
"longitude": "-123.11223900873065",
"id": 4971,
- "last_updated": "2021-11-14",
- "has_image": true
+ "last_updated": "2021-12-18",
+ "notes": "paywall"
}
},
{
@@ -98083,8 +98068,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "Machine available at business hours of souvenir shops. Needs 1 Euro and 5 Cents."
- },
- "has_image": true
+ }
}
},
{
@@ -98110,8 +98094,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "Machine available at business hours of souvenir shops. Needs 1 Euro and 5 Cents."
- },
- "has_image": true
+ }
}
},
{
@@ -98137,8 +98120,7 @@
"last_updated": "2021-11-14",
"logs": {
"2021-11-14": "Machine available at business hours of souvenir shops. Needs 1 Euro and 5 Cents."
- },
- "has_image": true
+ }
}
},
{
@@ -100599,8 +100581,7 @@
"latitude": "50.9405739",
"longitude": "6.9564358",
"id": 524,
- "last_updated": "2021-12-01",
- "has_image": true
+ "last_updated": "2021-12-01"
}
},
{
@@ -103820,8 +103801,7 @@
"latitude": "51.543850",
"longitude": "7.110161",
"id": 492,
- "last_updated": "2021-06-18",
- "has_image": true
+ "last_updated": "2021-06-18"
}
},
{
@@ -104764,8 +104744,7 @@
"latitude": "51.945210",
"longitude": "7.591164",
"id": 584,
- "last_updated": "2021-04-05",
- "has_image": true
+ "last_updated": "2021-04-05"
}
},
{
@@ -104811,8 +104790,7 @@
"latitude": "51.947808",
"longitude": "7.58916",
"id": 585,
- "last_updated": "2021-04-05",
- "has_image": true
+ "last_updated": "2021-04-05"
}
},
{
@@ -104835,8 +104813,7 @@
"latitude": "51.947808",
"longitude": "7.588147",
"id": 586,
- "last_updated": "2021-07-28",
- "has_image": true
+ "last_updated": "2021-07-28"
}
},
{
@@ -105319,8 +105296,7 @@
"latitude": "52.130516",
"longitude": "7.692751",
"id": 587,
- "last_updated": "2021-04-05",
- "has_image": true
+ "last_updated": "2021-04-05"
}
},
{
@@ -108103,8 +108079,7 @@
"latitude": "52.79555617978043",
"longitude": "7.204716300128243",
"id": 5045,
- "last_updated": "2021-11-14",
- "has_image": true
+ "last_updated": "2021-11-14"
}
},
{
@@ -108521,8 +108496,7 @@
"last_updated": "2021-04-05",
"logs": {
"2021-04-05": "The exact location of the machine in the park is not known"
- },
- "has_image": true
+ }
}
},
{
@@ -110638,8 +110612,7 @@
"latitude": "53.578475",
"longitude": "8.245868",
"id": 5040,
- "last_updated": "2021-12-18",
- "has_image": true
+ "last_updated": "2021-12-18"
}
},
{
@@ -111444,8 +111417,7 @@
"latitude": "53.992733",
"longitude": "10.815662",
"id": 626,
- "last_updated": "2021-04-05",
- "has_image": true
+ "last_updated": "2021-04-05"
}
},
{