Merge branch 'main' of https://github.com/jannisborn/PennyMe

jannisborn · Nov 20, 2023 · 909fb10 · 909fb10
2 parents 6dbb016 + 26ec2cf
commit 909fb10
Show file tree

Hide file tree

Showing 3 changed files with 152 additions and 33 deletions.
diff --git a/backend/pennyme/slack.py b/backend/pennyme/slack.py
@@ -27,7 +27,8 @@
 MACHINE_NAMES = {
     elem["properties"][
         "id"
-    ]: f"{elem['properties']['name']} ({elem['properties']['area']}) Status={elem['properties']['status']}"
+    ]: f"{elem['properties']['name']} ({elem['properties']['area']}) "
+    + f"Status={elem['properties']['status']} at: {elem['properties']['external_url']}"
     for elem in d["features"]
 }
 
@@ -44,9 +45,10 @@ def reload_server_data() -> Dict[str, str]:
     with open(PATH_SERVER_LOCATION, "r", encoding="latin-1") as infile:
         d = json.load(infile)
     for elem in d["features"]:
-        MACHINE_NAMES[
-            elem["properties"]["id"]
-        ] = f"{elem['properties']['name']} ({elem['properties']['area']})"
+        MACHINE_NAMES[elem["properties"]["id"]] = (
+            f"{elem['properties']['name']} ({elem['properties']['area']})"
+            + f"Status={elem['properties']['status']} at: {elem['properties']['external_url']}"
+        )
     return MACHINE_NAMES
 
 

diff --git a/data/all_locations.json b/data/all_locations.json
@@ -27992,29 +27992,6 @@
                 "last_updated": "2021-04-05"
             }
         },
-        {
-            "type": "Feature",
-            "geometry": {
-                "type": "Point",
-                "coordinates": [
-                    -82.05697289999999,
-                    29.2164505
-                ]
-            },
-            "properties": {
-                "name": "Silver Springs Nature's Theme Park",
-                "active": false,
-                "area": "Florida",
-                "address": "5656 E. Silver Springs Blvd, Silver Springs (near Ocala)",
-                "status": "retired",
-                "external_url": "http://209.221.138.252/Details.aspx?location=1539",
-                "internal_url": "null",
-                "latitude": "29.2164505",
-                "longitude": "-82.05697289999999",
-                "id": 3443,
-                "last_updated": "2022-10-22"
-            }
-        },
         {
             "type": "Feature",
             "geometry": {

diff --git a/data/server_locations.json b/data/server_locations.json
@@ -1507,16 +1507,16 @@
             },
             "properties": {
                 "name": "Golden Tours Waterloo Branch ",
-                "active": false,
+                "active": true,
                 "area": "England",
                 "address": "York Rd, Elizabeth House, Unit 31 Visitor Centre, London",
-                "status": "retired",
+                "status": "unvisited",
                 "external_url": "http://209.221.138.252/Details.aspx?location=325503",
                 "internal_url": "null",
                 "latitude": "51.5032484",
                 "longitude": "-0.1153282",
                 "id": 1490,
-                "last_updated": "2023-07-16"
+                "last_updated": "2023-11-19"
             }
         },
         {
@@ -10453,7 +10453,7 @@
                 "type": "Point",
                 "coordinates": [
                     -82.0532488,
-                    29.21620029999999
+                    29.2162
                 ]
             },
             "properties": {
@@ -10464,10 +10464,10 @@
                 "status": "unvisited",
                 "external_url": "http://209.221.138.252/Details.aspx?location=1539",
                 "internal_url": "null",
-                "latitude": "29.21620029999999",
+                "latitude": "29.216200",
                 "longitude": "-82.0532488",
                 "id": 6181,
-                "last_updated": "2023-10-14"
+                "last_updated": "2023-11-18"
             }
         },
         {
@@ -39141,6 +39141,146 @@
                 "id": 6964,
                 "last_updated": "2023-11-18"
             }
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -80.65244675242843,
+                    35.17827654153432
+                ]
+            },
+            "properties": {
+                "name": "The Barn in the Village",
+                "active": true,
+                "area": "North Carolina",
+                "address": "3027 Lisburn St, Mint Hill, NC 28227, USA",
+                "status": "unvisited",
+                "external_url": "http://209.221.138.252/Details.aspx?location=417951",
+                "internal_url": "null",
+                "latitude": 35.17827654153432,
+                "longitude": -80.65244675242843,
+                "id": 6965,
+                "last_updated": "2023-11-19"
+            }
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -121.8902357,
+                    37.3314903
+                ]
+            },
+            "properties": {
+                "name": "The Tech Museum of Innovation",
+                "active": true,
+                "area": "California",
+                "address": "201 South Market Street, San Jose",
+                "status": "unvisited",
+                "external_url": "http://209.221.138.252/Details.aspx?location=29121",
+                "internal_url": "null",
+                "latitude": "37.3314903",
+                "longitude": "-121.8902357",
+                "id": 4826,
+                "multimachine": 2,
+                "last_updated": "2023-11-18"
+            }
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -83.6762443,
+                    41.9644132
+                ]
+            },
+            "properties": {
+                "name": "Cabela's in Dundee, Michigan",
+                "active": true,
+                "area": "Michigan",
+                "address": "110 Cabela Blvd. East, Dundee",
+                "status": "unvisited",
+                "external_url": "http://209.221.138.252/Details.aspx?location=3037",
+                "internal_url": "null",
+                "latitude": "41.9644132",
+                "longitude": "-83.6762443",
+                "id": 2511,
+                "multimachine": 2,
+                "last_updated": "2023-11-18"
+            }
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5537028,
+                    50.9481718
+                ]
+            },
+            "properties": {
+                "name": "Paultons Family Theme Park",
+                "active": true,
+                "area": "England",
+                "address": "Romsey, Hampshire - Southampton, England, United Kingdom",
+                "status": "unvisited",
+                "external_url": "http://209.221.138.252/Details.aspx?location=107480",
+                "internal_url": "null",
+                "latitude": "50.9481718",
+                "longitude": "-1.5537028",
+                "id": 1419,
+                "last_updated": "2023-11-19"
+            }
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -155.0727822,
+                    19.6542357
+                ]
+            },
+            "properties": {
+                "name": "Pana'ewa Rainforest Zoo & Gardens",
+                "active": true,
+                "area": "Hawaii",
+                "address": "800 Stainback Hwy, Hawaii ( Big Island ) - Hilo",
+                "status": "unvisited",
+                "external_url": "http://209.221.138.252/Details.aspx?location=417949",
+                "internal_url": "null",
+                "latitude": "19.6542357",
+                "longitude": "-155.0727822",
+                "id": 6966,
+                "last_updated": "2023-11-19"
+            }
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.708537,
+                    52.19415430000001
+                ]
+            },
+            "properties": {
+                "name": "Shakespeares Birthplace",
+                "active": false,
+                "area": "England",
+                "address": "Henley Street, WARWICKSHIRE - Stratford Upon Avon",
+                "status": "retired",
+                "external_url": "http://209.221.138.252/Details.aspx?location=39563",
+                "internal_url": "null",
+                "latitude": "52.19415430000001",
+                "longitude": "-1.708537",
+                "id": 1579,
+                "last_updated": "2023-11-19"
+            }
         }
     ]
 }