map improvements

README.md

@@ -4,7 +4,7 @@ Gleiswechsel [ˈɡlaɪsvɛksəl] (german for "platform change") is a selfhostabl
 ![Example Channel](.github/preview_kanal.png)
 
 ## Features
-- [International support](https://transitous.org/sources/) for countries as well as and cities
+- [International support](https://transitous.org/sources/) for countries as well as cities
 - Support for various types of transportations, including but not limited to Subways, Busses, Funiculars, Trams and Trains
 - Multi language support (+ option to easily add more languages)
 - Announcements, including the option to join the voice chat and play an audio file while arriving at a specific station
@@ -179,6 +179,10 @@ To reduce spam, the bot will only send announcements if someone is in the voice
 The bot can join the voice chat, play an audio file, and disconnect from the voice chat, at various points of your trip. You have to have [FFmpeg](https://www.ffmpeg.org/) installed for this to work.
 
 Place the audio file of your desired station in [src/data/announcements](src/data/announcements/) with the EXACT name of the station. The bot will automatically check if an audio file with the stations name exists, and if it does, play it. 
+
+#### `map:`
+The bot can generate a map of your route in the `/info` embed. Set `map` to `true` to enable. 
+
 #### http
 
 - `"user_agent"`: The user agent of the bot for the API. If you don't know what that is, then you shouldn't have to change that. Modify the contact URL (in my case, the github repo) if you change a lot of the code, so that transitous can contact you in case of any issues

config.json.example

@@ -27,7 +27,8 @@
   },
   "announcements": {
     "text_announcements": true,
-    "voice_announcements": false
+    "voice_announcements": false,
+    "map": true
   },
   "http": {
     "user_agent": "Gleiswechsel-Discord-Bot/1.0 (https://github.com/kaaninchen/Gleiswechsel)"

src/config.py

@@ -26,6 +26,7 @@ class ConnectionsConfig:
 class AnnouncementConfig:
     text_announcements: bool
     voice_announcements: bool
+    map: bool
 
 @dataclass
 class HttpConfig:

src/data/operators.py

@@ -165,6 +165,7 @@ OPERATOR_ALIASES = {
     "Bayerische Regiobahn": OPERATORS["db_bayern"],
     "DB Regio AG Bayern": OPERATORS["db_bayern"],
     "DB Fernverkehr AG": OPERATORS["db_allgemein"],
+    "DB Regio AG": OPERATORS["db_allgemein"],
     "DB Regio AG NRW": OPERATORS["db_allgemein"],
     "DB Regio AG Südost": OPERATORS["db_allgemein"],
     "DB Regio AG Nordost": OPERATORS["db_allgemein"],
@@ -177,7 +178,8 @@ OPERATOR_ALIASES = {
     "VR": OPERATORS["Vr"],
     "FlixBus-gb": OPERATORS["Flixbus"],
     "FlixBus-eu": OPERATORS["Flixbus"],
-    "S-Bahn Berlin GmbH": OPERATORS["S-Bahn"]
+    "S-Bahn Berlin GmbH": OPERATORS["S-Bahn"],
+    "DB Regio AG S-Bahn München": OPERATORS["S-Bahn"]
 }
 
 

src/dc/embeds.py

@@ -4,11 +4,12 @@ import random
 from src.utils import get_operator_metadata, get_next_station, format_via_list, format_stop_list
 from src.dc.helpers import format_timestamp_to_dc
 from src.lang.locales import lang
+from src.config import config
 
 lang_embed = lang.embeds
 
 def build_embed_footer(slogans):
-    footer_notice = f"https://transitous.org/sources/ • Maps (C) CARTO (C) OpenStreetMap.org contributors"
+    footer_notice = f"https://transitous.org/sources/"
     icon = "https://api.transitous.org/favicon.png"
 
     if slogans is not None:
@@ -61,6 +62,7 @@ def build_info_embed() -> discord.Embed:
     embed.set_author(name=agency)
     embed.set_thumbnail(url=metadata["logo"])
 
+    if config.announcements.map:
         embed.set_image(url="attachment://ride.png")
     return embed
 

src/dc/handlers.py

@@ -28,6 +28,7 @@ async def rename_vc(bot: discord.Bot, voice_channel, from_scheduler: bool = Fals
         logger(f"Failed to select route after {max_attempt} attempts", "fatal")
         return False
 
+    if config.announcements.map:
         generate_static_map(trip["stops"], trip["mode"], trip["agency"], trip["route_color"])
     
     arrival = trip["arrival"]
@@ -70,7 +71,7 @@ async def announcer(announcement: str, voice_channel: discord.VoiceChannel, dest
                     embed = None
 
             if embed:
-                if image:
+                if image and config.announcements.map:
                     await voice_channel.send(file=image, embed=embed)
                 else:
                     await  voice_channel.send(embed=embed)

src/utils.py

@@ -217,22 +217,12 @@ def generate_static_map(stops: dict, mode: str, operator: str, route_color: str)
     
     context = staticmaps.Context()
 
-    context.set_tile_provider(
+    context.set_tile_provider(staticmaps.tile_provider_OSM)
-        staticmaps.TileProvider(
-            "carto-voyager",
-            url_pattern=(
-                "https://$s.basemaps.cartocdn.com/"
-                "rastertiles/voyager/$z/$x/$y.png"
-            ),
-            shards=["a", "b", "c", "d"],
-            attribution="",
-        )
         # It is against the law (and against your morals...) to not give
-        # OSM and carto credits for their great work
+        # the tileprovider attributions for their great work
         # I only removed the attribution text because I really dislike the
         # ugly white box that py-staticmaps adds. Credits are still visible in the
         # embeds footer
-    )
 
     stop_coords = [
         staticmaps.create_latlng(
@@ -246,7 +236,7 @@ def generate_static_map(stops: dict, mode: str, operator: str, route_color: str)
         staticmaps.Line(
             stop_coords,
             color=white,
-            width=20,
+            width=15,
         )
     )
 
@@ -279,38 +269,6 @@ def generate_static_map(stops: dict, mode: str, operator: str, route_color: str)
                         size=12
                     )
                 )
-
-    lats = [c.lat().degrees for c in stop_coords]
-    lons = [c.lng().degrees for c in stop_coords]
-    lat_span = max(lats) - min(lats)
-    lon_span = max(lons) - min(lons)
-
-    MIN_SPAN = 0.01 
-
-    if lat_span < MIN_SPAN or lon_span < MIN_SPAN:
-        center_lat = (max(lats) + min(lats)) / 2
-        center_lon = (max(lons) + min(lons)) / 2
-        pad = MIN_SPAN / 2
-
-        context.add_object(
-            staticmaps.Circle(
-                staticmaps.create_latlng(center_lat + pad, center_lon + pad),
-                radius_km=0.01,
-                fill_color=staticmaps.TRANSPARENT,
-                color=staticmaps.TRANSPARENT,
-                width=0,
-            )
-        )
-        context.add_object(
-            staticmaps.Circle(
-                staticmaps.create_latlng(center_lat - pad, center_lon - pad),
-                radius_km=0.01,
-                fill_color=staticmaps.TRANSPARENT,
-                color=staticmaps.TRANSPARENT,
-                width=0,
-            )
-        )
-
     try:
         image = context.render_cairo(400, 300)
         image.write_to_png("src/data/assets/current_map.png")