diff --git a/scl.py b/scl.py index 5faf0d8..f2c31a3 100644 --- a/scl.py +++ b/scl.py @@ -99,22 +99,8 @@ def classify_event_size(num_people: int) -> dict[str, str | bool]: def get_hashtag_string(event) -> str: - city = str() - try: - city = event["geoloc_city"] - except KeyError: - city = event["city"] - - neighborhood_text = str() - try: - neighborhood = event["neighborhood"] - if neighborhood != city: - neighborhood_text = " #{}".format(neighborhood).title().replace(" ", "") - except KeyError: - pass - - hashtag_string = "#SeattleCityLightOutage #SCLOutage{} #{}".format( - neighborhood_text, city.title().replace(" ", "") + hashtag_string = "#SeattleCityLightOutage #SCLOutage #SCLOutage{}".format( + event["identifier"] ) return hashtag_string @@ -205,27 +191,22 @@ def do_initial_post( city_not_seattle_text, ) area_text = "the {} area{}".format(locality, city_not_seattle_text) - event["neighborhood"] = locality elif "district" in geocode["features"][0]["properties"]["geocoding"]: - district = geocode["features"][0]["properties"]["geocoding"]["district"] alt_text = "A map showing the location of the outage, centered around {} in the {} area{}.".format( street, - district, + geocode["features"][0]["properties"]["geocoding"]["district"], city_not_seattle_text, ) area_text = "the {} area{}".format( - district, + geocode["features"][0]["properties"]["geocoding"]["district"], city_not_seattle_text, ) - event["neighborhood"] = district else: - city = geocode["features"][0]["properties"]["geocoding"]["city"] alt_text = "A map showing the location of the outage, centered around {} in {}.".format( street, - city, + geocode["features"][0]["properties"]["geocoding"]["city"], ) - area_text = city - event["geoloc_city"] = city + area_text = geocode["features"][0]["properties"]["geocoding"]["city"] except Exception: alt_text = "A map showing the location of the outage."