From 3599a034dce069d05cd37f5aec17d54f9c716c06 Mon Sep 17 00:00:00 2001
From: Profitroll <47523801+profitrollgame@users.noreply.github.com>
Date: Wed, 12 Oct 2022 17:08:49 +0200
Subject: [PATCH] Typing improved

---
 pyrmv/classes/Client.py      | 202 +++++++++++++++++------------------
 pyrmv/raw/board_arrival.py   |  24 ++---
 pyrmv/raw/board_departure.py |  24 ++---
 pyrmv/raw/him_search.py      |  60 +++++------
 pyrmv/raw/journey_detail.py  |  12 +--
 pyrmv/raw/stop_by_coords.py  |  10 +-
 pyrmv/raw/stop_by_name.py    |  16 +--
 pyrmv/raw/trip_find.py       | 120 ++++++++++-----------
 pyrmv/raw/trip_recon.py      |  42 ++++----
 9 files changed, 255 insertions(+), 255 deletions(-)

diff --git a/pyrmv/classes/Client.py b/pyrmv/classes/Client.py
index 5b03d19..fce9504 100644
--- a/pyrmv/classes/Client.py
+++ b/pyrmv/classes/Client.py
@@ -70,15 +70,15 @@ class Client():
         self.access_id = access_id
 
     def board_arrival(self,
-            id: str = None, # type: ignore
-            id_ext: str = None, # type: ignore
-            direction: Union[str, Stop, StopTrip] = None, # type: ignore
-            date: Union[str, datetime] = None, # type: ignore
-            time: Union[str, datetime] = None, # type: ignore
+            id: Union[str, None] = None,
+            id_ext: Union[str, None] = None,
+            direction: Union[str, Stop, StopTrip, None] = None,
+            date: Union[str, datetime, None] = None,
+            time: Union[str, datetime, None] = None,
             duration: Union[int, timedelta] = 60,
             journeys_max: int = -1,
-            operators: Union[str, list] = None, # type: ignore
-            lines: Union[str, list] = None, # type: ignore
+            operators: Union[str, list, None] = None,
+            lines: Union[str, list, None] = None,
             passlist: bool = False,
             board_type: Literal[BoardArrivalType.ARR, BoardArrivalType.ARR_EQUIVS, BoardArrivalType.ARR_MAST, BoardArrivalType.ARR_STATION] = BoardArrivalType.ARR,
         ) -> BoardArrival:
@@ -113,7 +113,7 @@ class Client():
             direction=direction, # type: ignore
             date=date,
             time=time,
-            duration=duration, # type: ignore
+            duration=duration,
             maxJourneys=journeys_max,
             operators=operators,
             lines=lines,
@@ -126,15 +126,15 @@ class Client():
         return BoardArrival(board_raw, self)
 
     def board_departure(self,
-            id: str = None, # type: ignore
-            id_ext: str = None, # type: ignore
-            direction: Union[str, Stop, StopTrip] = None, # type: ignore
-            date: Union[str, datetime] = None, # type: ignore
-            time: Union[str, datetime] = None, # type: ignore
+            id: Union[str, None] = None,
+            id_ext: Union[str, None] = None,
+            direction: Union[str, Stop, StopTrip, None] = None,
+            date: Union[str, datetime, None] = None,
+            time: Union[str, datetime, None] = None,
             duration: Union[int, timedelta] = 60,
             journeys_max: int = -1,
-            operators: Union[str, list] = None, # type: ignore
-            lines: Union[str, list] = None, # type: ignore
+            operators: Union[str, list, None] = None,
+            lines: Union[str, list, None] = None,
             passlist: bool = False,
             board_type: Literal[BoardDepartureType.DEP, BoardDepartureType.DEP_EQUIVS, BoardDepartureType.DEP_MAST, BoardDepartureType.DEP_STATION] = BoardDepartureType.DEP,
         ) -> BoardDeparture:
@@ -169,7 +169,7 @@ class Client():
             direction=direction, # type: ignore
             date=date,
             time=time,
-            duration=duration, # type: ignore
+            duration=duration,
             maxJourneys=journeys_max,
             operators=operators,
             lines=lines,
@@ -182,28 +182,28 @@ class Client():
         return BoardDeparture(board_raw, self)
 
     def him_search(self,
-            date_begin: Union[str, datetime] = None, # type: ignore
-            date_end: Union[str, datetime] = None, # type: ignore
-            time_begin: Union[str, datetime] = None, # type: ignore
-            time_end: Union[str, datetime] = None, # type: ignore
-            weekdays: Union[str, OrderedDict[str, bool]] = None, # type: ignore
-            ids: list = None, # type: ignore
-            operators: list = None, # type: ignore
-            categories: list = None, # type: ignore
-            channels: list = None, # type: ignore
-            companies: list = None, # type: ignore
-            lines: list = None, # type: ignore
-            line_ids: list = None, # type: ignore
-            stations: Union[list, List[Stop]] = None, # type: ignore
-            station_from: Union[str, Stop] = None, # type: ignore
-            station_to: Union[str, Stop] = None, # type: ignore
-            both_ways: bool = None, # type: ignore
-            train_names: list = None, # type: ignore
-            search_mode: Literal[SearchMode.MATCH, SearchMode.NOMATCH, SearchMode.TFMATCH] = None, # type: ignore
-            affected_journey_mode: Literal[AffectedJourneyMode.ALL, AffectedJourneyMode.OFF] = None, # type: ignore
-            affected_journey_stop_mode: Literal[AffectedJourneyStopMode.ALL, AffectedJourneyStopMode.IMP, AffectedJourneyStopMode.OFF] = None, # type: ignore
-            priority_min: int = None, # type: ignore
-            priority_max: int = None # type: ignore
+            date_begin: Union[str, datetime, None] = None,
+            date_end: Union[str, datetime, None] = None,
+            time_begin: Union[str, datetime, None] = None,
+            time_end: Union[str, datetime, None] = None,
+            weekdays: Union[str, OrderedDict[str, bool], None] = None,
+            ids: Union[list, None] = None,
+            operators: Union[list, None] = None,
+            categories: Union[list, None] = None,
+            channels: Union[list, None] = None,
+            companies: Union[list, None] = None,
+            lines: Union[list, None] = None,
+            line_ids: Union[list, None] = None,
+            stations: Union[list, List[Stop], None] = None,
+            station_from: Union[str, Stop, None] = None,
+            station_to: Union[str, Stop, None] = None,
+            both_ways: Union[bool, None] = None,
+            train_names: Union[list, None] = None,
+            search_mode: Union[Literal[SearchMode.MATCH, SearchMode.NOMATCH, SearchMode.TFMATCH], None] = None,
+            affected_journey_mode: Union[Literal[AffectedJourneyMode.ALL, AffectedJourneyMode.OFF], None] = None,
+            affected_journey_stop_mode: Union[Literal[AffectedJourneyStopMode.ALL, AffectedJourneyStopMode.IMP, AffectedJourneyStopMode.OFF], None] = None,
+            priority_min: Union[int, None] = None,
+            priority_max: Union[int, None] = None
         ) -> List[Message]:
         """The him_search method will deliver a list of HIM messages if matched by the given criteria as
         well as affected products if any.  
@@ -239,10 +239,10 @@ class Client():
         """        
 
         if isinstance(station_from, Stop):
-            station_from = station_from.ext_id # type: ignore
+            station_from = station_from.ext_id
 
         if isinstance(station_to, Stop):
-            station_to = station_to.ext_id # type: ignore
+            station_to = station_to.ext_id
 
         if stations != None:
             new_stations = []
@@ -254,17 +254,17 @@ class Client():
             stations = new_stations
 
         if search_mode == None:
-            search_mode = None # type: ignore
+            search_mode = None
         else:
             search_mode = search_mode.code
 
         if affected_journey_mode == None:
-            affected_journey_mode = None # type: ignore
+            affected_journey_mode = None
         else:
             affected_journey_mode = affected_journey_mode.code
 
         if affected_journey_stop_mode == None:
-            affected_journey_stop_mode = None # type: ignore
+            affected_journey_stop_mode = None
         else:
             affected_journey_stop_mode = affected_journey_stop_mode.code
 
@@ -304,12 +304,12 @@ class Client():
 
     def journey_detail(self,
             id: str,
-            date: Union[str, datetime] = None, # type: ignore
-            real_time_mode: Literal[RealTimeMode.FULL, RealTimeMode.INFOS, RealTimeMode.OFF, RealTimeMode.REALTIME, RealTimeMode.SERVER_DEFAULT] = None, # type: ignore
-            from_id: str = None, # type: ignore
-            from_index: int = None, # type: ignore
-            to_id: str = None, # type: ignore
-            to_index: int = None # type: ignore
+            date: Union[str, datetime, None] = None,
+            real_time_mode: Union[Literal[RealTimeMode.FULL, RealTimeMode.INFOS, RealTimeMode.OFF, RealTimeMode.REALTIME, RealTimeMode.SERVER_DEFAULT], None] = None,
+            from_id: Union[str, None] = None,
+            from_index: Union[int, None] = None,
+            to_id: Union[str, None] = None,
+            to_index: Union[int, None] = None
         ) -> Journey:
         """The journey_detail method will deliver information about the complete route of a vehicle. The journey
         identifier is part of a trip or `board_departure()` response. It contains a list of all stops/stations of this journey
@@ -332,7 +332,7 @@ class Client():
         """    
 
         if real_time_mode == None:
-            real_time_mode = None # type: ignore
+            real_time_mode = None
         else:
             real_time_mode = real_time_mode.code
 
@@ -342,9 +342,9 @@ class Client():
             date=date,
             rtMode=real_time_mode, # type: ignore
             fromId=from_id,
-            fromIdx=from_index, # type: ignore
+            fromIdx=from_index,
             toId=to_id,
-            toIdx=to_index # type: ignore
+            toIdx=to_index
         )
 
         find_exception(journey_raw)
@@ -359,7 +359,7 @@ class Client():
             radius: Union[int, float] = 1000,
             max_number: int = 10,
             stop_type: Literal[LocationType.S, LocationType.P, LocationType.SP, LocationType.SE, LocationType.SPE] = LocationType.S,
-            selection_mode: Literal[SelectionMode.SLCT_A, SelectionMode.SLCT_N] = None, # type: ignore
+            selection_mode: Union[Literal[SelectionMode.SLCT_A, SelectionMode.SLCT_N], None] = None,
         ) -> List[Stop]:
         """Method returns a list of stops around a given center coordinate.
         The returned results are ordered by their distance to the center coordinate.  
@@ -380,7 +380,7 @@ class Client():
         """    
 
         if selection_mode == None:
-            selection_mode = None # type: ignore
+            selection_mode = None
         else:
             selection_mode = selection_mode.code
 
@@ -446,12 +446,12 @@ class Client():
             lang: Literal[Language.DE, Language.DA, Language.EN, Language.ES, Language.FR, Language.HU, Language.IT, Language.NL, Language.NO, Language.PL, Language.SV, Language.TR] = Language.EN,
             max_number: int = 10,
             stop_type: Literal[LocationType.A, LocationType.ALL, LocationType.AP, LocationType.P, LocationType.S, LocationType.SA, LocationType.SP] = LocationType.ALL,
-            selection_mode: Literal[SelectionMode.SLCT_A, SelectionMode.SLCT_N] = None, # type: ignore
-            coord_lat: Union[str, float] = None, # type: ignore
-            coord_lon: Union[str, float] = None, # type: ignore
+            selection_mode: Union[Literal[SelectionMode.SLCT_A, SelectionMode.SLCT_N], None] = None,
+            coord_lat: Union[str, float, None] = None,
+            coord_lon: Union[str, float, None] = None,
             radius: Union[int, float] = 1000,
-            refine_id: str = None, # type: ignore
-            stations: Union[str, list] = None, # type: ignore
+            refine_id: Union[str, None] = None,
+            stations: Union[str, list, None] = None,
             filter_mode: Literal[FilterMode.DIST_PERI, FilterMode.EXCL_PERI, FilterMode.SLCT_PERI] = FilterMode.DIST_PERI
         ) -> List[Stop]:
         """Method can be used to perform a pattern matching of a user input and to retrieve a list
@@ -478,7 +478,7 @@ class Client():
         """    
 
         if selection_mode == None:
-            selection_mode = None # type: ignore
+            selection_mode = None
         else:
             selection_mode = selection_mode.code
 
@@ -511,47 +511,47 @@ class Client():
     def trip_find(self,
             lang: Literal[Language.DE, Language.DA, Language.EN, Language.ES, Language.FR, Language.HU, Language.IT, Language.NL, Language.NO, Language.PL, Language.SV, Language.TR] = Language.EN,
 
-            origin_id: str = None, # type: ignore
-            origin_id_ext: str = None, # type: ignore
-            origin_coord_lat: Union[str, float] = None, # type: ignore
-            origin_coord_lon: Union[str, float] = None, # type: ignore
-            origin_coord_name: str = None, # type: ignore
+            origin_id: Union[str, None] = None,
+            origin_id_ext: Union[str, None] = None,
+            origin_coord_lat: Union[str, float, None] = None,
+            origin_coord_lon: Union[str, float, None] = None,
+            origin_coord_name: Union[str, None] = None,
 
-            destination_id: str = None, # type: ignore
-            destination_id_ext: str = None, # type: ignore
-            destination_coord_lat: Union[str, float] = None, # type: ignore
-            destination_coord_lon: Union[str, float] = None, # type: ignore
-            destination_coord_name: str = None, # type: ignore
+            destination_id: Union[str, None] = None,
+            destination_id_ext: Union[str, None] = None,
+            destination_coord_lat: Union[str, float, None] = None,
+            destination_coord_lon: Union[str, float, None] = None,
+            destination_coord_name: Union[str, None] = None,
 
-            via: str = None, # type: ignore
-            via_id: str = None, # type: ignore
-            via_gis: str = None, # type: ignore
+            via: Union[str, None] = None,
+            via_id: Union[str, None] = None,
+            via_gis: Union[str, None] = None,
             via_wait_time: int = 0,
 
-            avoid: str = None, # type: ignore
-            avoid_id: str = None, # type: ignore
+            avoid: Union[str, None] = None,
+            avoid_id: Union[str, None] = None,
 
             change_time_percent: int = 100,
-            change_time_min: int = None, # type: ignore
-            change_time_max: int = None, # type: ignore
-            change_time_add: int = None, # type: ignore
-            change_max: int = None, # type: ignore
+            change_time_min: Union[int, None] = None,
+            change_time_max: Union[int, None] = None,
+            change_time_add: Union[int, None] = None,
+            change_max: Union[int, None] = None,
 
-            date: Union[str, datetime] = None, # type: ignore
-            time: Union[str, datetime] = None, # type: ignore
+            date: Union[str, datetime, None] = None,
+            time: Union[str, datetime, None] = None,
             
             search_arrival: bool = False,
 
-            trips_after_time: int = None, # type: ignore
-            trips_before_time: int = None, # type: ignore
+            trips_after_time: Union[int, None] = None,
+            trips_before_time: Union[int, None] = None,
 
-            context: str = None, # type: ignore
+            context: Union[str, None] = None,
 
             passlist: bool = False,
-            operators: Union[str, list] = None, # type: ignore
+            operators: Union[str, list, None] = None,
             
-            lines: Union[str, list] = None, # type: ignore
-            lineids: Union[str, list] = None, # type: ignore
+            lines: Union[str, list, None] = None,
+            lineids: Union[str, list, None] = None,
 
             iv_include: bool = False,
             iv_only: bool = False,
@@ -560,11 +560,11 @@ class Client():
 
             passing_points: bool = False,
 
-            real_time_mode: Literal[RealTimeMode.FULL, RealTimeMode.INFOS, RealTimeMode.OFF, RealTimeMode.REALTIME, RealTimeMode.SERVER_DEFAULT] = None, # type: ignore
+            real_time_mode: Union[Literal[RealTimeMode.FULL, RealTimeMode.INFOS, RealTimeMode.OFF, RealTimeMode.REALTIME, RealTimeMode.SERVER_DEFAULT], None] = None,
 
             include_earlier: bool = False,
             ict_alternatives: bool = False,
-            tariff: bool = None, # type: ignore
+            tariff: Union[bool, None] = None,
             messages: bool = False,
             frequency: bool = True
         ) -> List[Trip]:
@@ -623,7 +623,7 @@ class Client():
         """    
 
         if real_time_mode == None:
-            real_time_mode = None # type: ignore
+            real_time_mode = None
         else:
             real_time_mode = real_time_mode.code
 
@@ -700,17 +700,17 @@ class Client():
 
     def trip_recon(self,
             context: Union[str, Trip],
-            date: Union[str, datetime] = None, # type: ignore
-            match_real_time: bool = None, # type: ignore
-            enable_replacements: bool = None, # type: ignore
-            arrival_dev_lower: int = None, # type: ignore
-            arrival_dev_upper: int = None, # type: ignore
-            departure_dev_lower: int = None, # type: ignore
-            departure_dev_upper: int = None, # type: ignore
-            passlist: bool = None, # type: ignore
+            date: Union[str, datetime, None] = None,
+            match_real_time: Union[bool, None] = None,
+            enable_replacements: Union[bool, None] = None,
+            arrival_dev_lower: Union[int, None] = None,
+            arrival_dev_upper: Union[int, None] = None,
+            departure_dev_lower: Union[int, None] = None,
+            departure_dev_upper: Union[int, None] = None,
+            passlist: bool = False,
             passing_points: bool = False,
-            real_time_mode: Literal[RealTimeMode.FULL, RealTimeMode.INFOS, RealTimeMode.OFF, RealTimeMode.REALTIME, RealTimeMode.SERVER_DEFAULT] = None, # type: ignore
-            tariff: bool = None, # type: ignore
+            real_time_mode: Union[Literal[RealTimeMode.FULL, RealTimeMode.INFOS, RealTimeMode.OFF, RealTimeMode.REALTIME, RealTimeMode.SERVER_DEFAULT], None] = None,
+            tariff: Union[bool, None] = None,
             messages: bool = False
         ) -> List[Trip]:
         """Reconstructing a trip can be achieved using the reconstruction context provided by any trip result in the
@@ -739,7 +739,7 @@ class Client():
         """    
         
         if real_time_mode == None:
-            real_time_mode = None # type: ignore
+            real_time_mode = None
         else:
             real_time_mode = real_time_mode.code
         
diff --git a/pyrmv/raw/board_arrival.py b/pyrmv/raw/board_arrival.py
index a0216ee..9b8f347 100644
--- a/pyrmv/raw/board_arrival.py
+++ b/pyrmv/raw/board_arrival.py
@@ -11,19 +11,19 @@ except ImportError:
 # 2.25. Arrival Board (arrivalBoard)
 def board_arrival(accessId: str,
         json: bool = True,
-        id: str = None, # type: ignore
-        extId: str = None, # type: ignore
-        direction: str = None, # type: ignore
-        date: Union[str, datetime] = None, # type: ignore
-        time: Union[str, datetime] = None, # type: ignore
-        duration: int = 60,
+        id: Union[str, None] = None,
+        extId: Union[str, None] = None,
+        direction: Union[str, None] = None,
+        date: Union[str, datetime, None] = None,
+        time: Union[str, datetime, None] = None,
+        duration: Union[int, timedelta] = 60,
         maxJourneys: int = -1,
-        products: int = None, # type: ignore
-        operators: Union[str, list] = None, # type: ignore
-        lines: Union[str, list] = None, # type: ignore
+        products: Union[int, None] = None,
+        operators: Union[str, list, None] = None,
+        lines: Union[str, list, None] = None,
         filterEquiv: bool = True,
-        attributes: Union[str, list] = None, # type: ignore
-        platforms: Union[str, list] = None, # type: ignore
+        attributes: Union[str, list, None] = None,
+        platforms: Union[str, list, None] = None,
         passlist: bool = False,
         boardType: Literal["ARR", "ARR_EQUIVS", "ARR_MAST", "ARR_STATION"] = "ARR"
     ) -> dict:
@@ -81,7 +81,7 @@ def board_arrival(accessId: str,
         elif str(var) == "duration":
             if val != None:
                 if isinstance(val, timedelta):
-                    payload[str(var)] = val.minutes
+                    payload[str(var)] = val.minutes # type: ignore
                 else:
                     payload[str(var)] = val
         elif str(var) == "boardType":
diff --git a/pyrmv/raw/board_departure.py b/pyrmv/raw/board_departure.py
index 20dab2a..ed30539 100644
--- a/pyrmv/raw/board_departure.py
+++ b/pyrmv/raw/board_departure.py
@@ -11,19 +11,19 @@ except ImportError:
 # 2.24. Departure Board (departureBoard)
 def board_departure(accessId: str,
         json: bool = True,
-        id: str = None, # type: ignore
-        extId: str = None, # type: ignore
-        direction: str = None, # type: ignore
-        date: Union[str, datetime] = None, # type: ignore
-        time: Union[str, datetime] = None, # type: ignore
-        duration: int = 60,
+        id: Union[str, None] = None,
+        extId: Union[str, None] = None,
+        direction: Union[str, None] = None,
+        date: Union[str, datetime, None] = None,
+        time: Union[str, datetime, None] = None,
+        duration: Union[int, timedelta] = 60,
         maxJourneys: int = -1,
-        products: int = None, # type: ignore
-        operators: Union[str, list] = None, # type: ignore
-        lines: Union[str, list] = None, # type: ignore
+        products: Union[int, None] = None,
+        operators: Union[str, list, None] = None,
+        lines: Union[str, list, None] = None,
         filterEquiv: bool = True,
-        attributes: Union[str, list] = None, # type: ignore
-        platforms: Union[str, list] = None, # type: ignore
+        attributes: Union[str, list, None] = None,
+        platforms: Union[str, list, None] = None,
         passlist: bool = False,
         boardType: Literal["DEP", "DEP_EQUIVS", "DEP_MAST", "DEP_STATION"] = "DEP"
     ) -> dict:
@@ -82,7 +82,7 @@ def board_departure(accessId: str,
         elif str(var) == "duration":
             if val != None:
                 if isinstance(val, timedelta):
-                    payload[str(var)] = val.minutes
+                    payload[str(var)] = val.minutes # type: ignore
                 else:
                     payload[str(var)] = val
         elif str(var) == "boardType":
diff --git a/pyrmv/raw/him_search.py b/pyrmv/raw/him_search.py
index ddb1c80..0ebf5fe 100644
--- a/pyrmv/raw/him_search.py
+++ b/pyrmv/raw/him_search.py
@@ -13,38 +13,38 @@ except ImportError:
 # 2.37. HIM Search (himsearch)
 def him_search(accessId: str,
         json: bool = True,
-        dateB: Union[str, datetime] = None, # type: ignore
-        dateE: Union[str, datetime] = None, # type: ignore
-        timeB: Union[str, datetime] = None, # type: ignore
-        timeE: Union[str, datetime] = None, # type: ignore
-        weekdays: Union[str, OrderedDict[str, bool]] = None, # type: ignore
-        himIds: Union[str, list] = None, # type: ignore
+        dateB: Union[str, datetime, None] = None,
+        dateE: Union[str, datetime, None] = None,
+        timeB: Union[str, datetime, None] = None,
+        timeE: Union[str, datetime, None] = None,
+        weekdays: Union[str, OrderedDict[str, bool], None] = None,
+        himIds: Union[str, list, None] = None,
         hierarchicalView: bool = False,
-        operators: Union[str, list] = None, # type: ignore
-        categories: Union[str, list] = None, # type: ignore
-        channels: Union[str, list] = None, # type: ignore
-        companies: Union[str, list] = None, # type: ignore
-        lines: Union[str, list] = None, # type: ignore
-        lineids: Union[str, list] = None, # type: ignore
-        stations: Union[str, list] = None, # type: ignore
-        fromstation: str = None, # type: ignore
-        tostation: str = None, # type: ignore
-        bothways: bool = None, # type: ignore
-        trainnames: Union[str, list] = None, # type: ignore
-        metas: Union[str, list] = None, # type: ignore
-        himcategory: str = None, # type: ignore
-        himtags: Union[str, list] = None, # type: ignore
-        regions: Union[str, list] = None, # type: ignore
-        himtext: Union[str, list] = None, # type: ignore
-        himtexttags: Union[str, list] = None, # type: ignore
-        additionalfields: Union[str, list, dict] = None, # type: ignore
+        operators: Union[str, list, None] = None,
+        categories: Union[str, list, None] = None,
+        channels: Union[str, list, None] = None,
+        companies: Union[str, list, None] = None,
+        lines: Union[str, list, None] = None,
+        lineids: Union[str, list, None] = None,
+        stations: Union[str, list, None] = None,
+        fromstation: Union[str, None] = None,
+        tostation: Union[str, None] = None,
+        bothways: Union[bool, None] = None,
+        trainnames: Union[str, list, None] = None,
+        metas: Union[str, list, None] = None,
+        himcategory: Union[str, None] = None,
+        himtags: Union[str, list, None] = None,
+        regions: Union[str, list, None] = None,
+        himtext: Union[str, list, None] = None,
+        himtexttags: Union[str, list, None] = None,
+        additionalfields: Union[str, list, dict, None] = None,
         poly: bool = False,
-        searchmode: Literal["MATCH", "NOMATCH", "TFMATCH"] = None, # type: ignore
-        affectedJourneyMode: Literal["ALL", "OFF"] = None, # type: ignore
-        affectedJourneyStopMode: Literal["ALL", "IMP", "OFF"] = None, # type: ignore
-        orderBy: Union[str, list] = None, # type: ignore
-        minprio: Union[str, int] = None, # type: ignore
-        maxprio: Union[str, int] = None # type: ignore
+        searchmode: Union[Literal["MATCH", "NOMATCH", "TFMATCH"], None] = None,
+        affectedJourneyMode: Union[Literal["ALL", "OFF"], None] = None,
+        affectedJourneyStopMode: Union[Literal["ALL", "IMP", "OFF"], None] = None,
+        orderBy: Union[str, list, None] = None,
+        minprio: Union[str, int, None] = None,
+        maxprio: Union[str, int, None] = None
     ) -> dict:
     """The himSearch will return a list of HIM messages if matched by the given criteria as well as affected
     products if any.
diff --git a/pyrmv/raw/journey_detail.py b/pyrmv/raw/journey_detail.py
index 8e51335..56347a0 100644
--- a/pyrmv/raw/journey_detail.py
+++ b/pyrmv/raw/journey_detail.py
@@ -12,15 +12,15 @@ except ImportError:
 def journey_detail(accessId: str,
         id: str,
         json: bool = True,
-        date: Union[str, datetime] = None, # type: ignore
+        date: Union[str, datetime, None] = None,
         poly: bool = False,
         polyEnc: Literal["DLT", "GPA", "N"] = "N",
         showPassingPoints: bool = False,
-        rtMode: Literal["FULL", "INFOS", "OFF", "REALTIME", "SERVER_DEFAULT"] = None, # type: ignore
-        fromId: str = None, # type: ignore
-        fromIdx: str = None, # type: ignore
-        toId: str = None, # type: ignore
-        toIdx: str = None, # type: ignore
+        rtMode: Union[Literal["FULL", "INFOS", "OFF", "REALTIME", "SERVER_DEFAULT"], None] = None,
+        fromId: Union[str, None] = None,
+        fromIdx: Union[int, None] = None,
+        toId: Union[str, None] = None,
+        toIdx: Union[int, None] = None,
         baim: bool = False
     ) -> dict:
     """The journey_detail method will deliver information about the complete route of a vehicle. The journey
diff --git a/pyrmv/raw/stop_by_coords.py b/pyrmv/raw/stop_by_coords.py
index d17ada7..160b2e4 100644
--- a/pyrmv/raw/stop_by_coords.py
+++ b/pyrmv/raw/stop_by_coords.py
@@ -16,11 +16,11 @@ def stop_by_coords(accessId: str,
         radius: Union[int, float] = 1000,
         maxNo: int = 10,
         stopType: Literal["S", "P", "SP", "SE", "SPE"] = "S",
-        locationSelectionMode: Literal["SLCT_N", "SLCT_A"] = None, # type: ignore
-        products: int = None, # type: ignore
-        meta: str = None, # type: ignore
-        sattributes: Union[str, list] = None, # type: ignore
-        sinfotexts: Union[str, list] = None # type: ignore
+        locationSelectionMode: Union[Literal["SLCT_N", "SLCT_A"], None] = None,
+        products: Union[int, None] = None,
+        meta: Union[str, None] = None,
+        sattributes: Union[str, list, None] = None,
+        sinfotexts: Union[str, list, None] = None
     ) -> dict:
     """The location.nearbystops service returns a list of stops around a given center coordinate (within a
     radius of 1000m). The returned results are ordered by their distance to the center coordinate.  
diff --git a/pyrmv/raw/stop_by_name.py b/pyrmv/raw/stop_by_name.py
index 2b27de7..ac0adb8 100644
--- a/pyrmv/raw/stop_by_name.py
+++ b/pyrmv/raw/stop_by_name.py
@@ -14,15 +14,15 @@ def stop_by_name(accessId: str,
         json: bool = True,
         maxNo: int = 10,
         stopType: Literal["A", "ALL", "AP", "P", "S", "SA", "SP"] = "ALL",
-        locationSelectionMode: Literal["SLCT_N", "SLCT_A"] = None, # type: ignore
-        products: int = None, # type: ignore
-        coordLat: Union[str, float] = None, # type: ignore
-        coordLong: Union[str, float] = None, # type: ignore
+        locationSelectionMode: Union[Literal["SLCT_N", "SLCT_A"], None] = None,
+        products: Union[int, None] = None,
+        coordLat: Union[str, float, None] = None,
+        coordLong: Union[str, float, None] = None,
         radius: Union[int, float] = 1000,
-        refineId: str = None, # type: ignore
-        meta: str = None, # type: ignore
-        stations: Union[str, list] = None, # type: ignore
-        sattributes: Union[str, list] = None, # type: ignore
+        refineId: Union[str, None] = None,
+        meta: Union[str, None] = None,
+        stations: Union[str, list, None] = None,
+        sattributes: Union[str, list, None] = None,
         filterMode: Literal["DIST_PERI", "EXCL_PERI", "SLCT_PERI"] = "DIST_PERI"
     ) -> dict:
     """The location.name service can be used to perform a pattern matching of a user input and to retrieve a list
diff --git a/pyrmv/raw/trip_find.py b/pyrmv/raw/trip_find.py
index cf1965a..19336a6 100644
--- a/pyrmv/raw/trip_find.py
+++ b/pyrmv/raw/trip_find.py
@@ -13,87 +13,87 @@ def trip_find(accessId: str,
         lang: Literal["de", "da", "en", "es", "fr", "hu", "it", "nl", "no", "pl", "sv", "tr"] = "en",
         json: bool = True,
 
-        originId: str = None, # type: ignore
-        originExtId: str = None, # type: ignore
-        originCoordLat: Union[str, float] = None, # type: ignore
-        originCoordLong: Union[str, float] = None, # type: ignore
-        originCoordName: str = None, # type: ignore
+        originId: Union[str, None] = None,
+        originExtId: Union[str, None] = None,
+        originCoordLat: Union[str, float, None] = None,
+        originCoordLong: Union[str, float, None] = None,
+        originCoordName: Union[str, None] = None,
 
-        destId: str = None, # type: ignore
-        destExtId: str = None, # type: ignore
-        destCoordLat: Union[str, float] = None, # type: ignore
-        destCoordLong: Union[str, float] = None, # type: ignore
-        destCoordName: str = None, # type: ignore
+        destId: Union[str, None] = None,
+        destExtId: Union[str, None] = None,
+        destCoordLat: Union[str, float, None] = None,
+        destCoordLong: Union[str, float, None] = None,
+        destCoordName: Union[str, None] = None,
 
-        via: str = None, # type: ignore
-        viaId: str = None, # type: ignore
+        via: Union[str, None] = None,
+        viaId: Union[str, None] = None,
         viaWaitTime: int = 0,
 
-        avoid: str = None, # type: ignore
-        avoidId: str = None, # type: ignore
+        avoid: Union[str, None] = None,
+        avoidId: Union[str, None] = None,
 
-        viaGis: str = None, # type: ignore
+        viaGis: Union[str, None] = None,
 
         changeTimePercent: int = 100,
-        minChangeTime: int = None, # type: ignore
-        maxChangeTime: int = None, # type: ignore
-        addChangeTime: int = None, # type: ignore
-        maxChange: int = None, # type: ignore
+        minChangeTime: Union[int, None] = None,
+        maxChangeTime: Union[int, None] = None,
+        addChangeTime: Union[int, None] = None,
+        maxChange: Union[int, None] = None,
 
-        date: Union[str, datetime] = None, # type: ignore
-        time: Union[str, datetime] = None, # type: ignore
+        date: Union[str, datetime, None] = None,
+        time: Union[str, datetime, None] = None,
         
         searchForArrival: bool = False,
 
-        numF: int = None, # type: ignore
-        numB: int = None, # type: ignore
+        numF: Union[int, None] = None,
+        numB: Union[int, None] = None,
 
-        context: str = None, # type: ignore
+        context: Union[str, None] = None,
 
         poly: bool = False,
         polyEnc: Literal["DLT", "GPA", "N"] = "N",
 
         passlist: bool = False,
-        products: int = None, # type: ignore
-        operators: Union[str, list] = None, # type: ignore
+        products: Union[int, None] = None,
+        operators: Union[str, list, None] = None,
         
-        attributes: Union[str, list] = None, # type: ignore
-        sattributes: Union[str, list] = None, # type: ignore
-        fattributes: Union[str, list] = None, # type: ignore
-        lines: Union[str, list] = None, # type: ignore
-        lineids: Union[str, list] = None, # type: ignore
+        attributes: Union[str, list, None] = None,
+        sattributes: Union[str, list, None] = None,
+        fattributes: Union[str, list, None] = None,
+        lines: Union[str, list, None] = None,
+        lineids: Union[str, list, None] = None,
 
-        avoidPaths: List[Literal["SW", "EA", "ES", "RA", "CB"]] = None, # type: ignore
+        avoidPaths: Union[List[Literal["SW", "EA", "ES", "RA", "CB"]], None] = None,
 
-        originWalk: Union[str, list] = None, # type: ignore
-        originBike: Union[str, list] = None, # type: ignore
-        originCar: Union[str, list] = None, # type: ignore
-        originTaxi: Union[str, list] = None, # type: ignore
-        originPark: Union[str, list] = None, # type: ignore
-        originMeta: Union[str, list] = None, # type: ignore
+        originWalk: Union[str, list, None] = None,
+        originBike: Union[str, list, None] = None,
+        originCar: Union[str, list, None] = None,
+        originTaxi: Union[str, list, None] = None,
+        originPark: Union[str, list, None] = None,
+        originMeta: Union[str, list, None] = None,
 
-        destWalk: Union[str, list] = None, # type: ignore
-        destBike: Union[str, list] = None, # type: ignore
-        destCar: Union[str, list] = None, # type: ignore
-        destTaxi: Union[str, list] = None, # type: ignore
-        destPark: Union[str, list] = None, # type: ignore
-        destMeta: Union[str, list] = None, # type: ignore
+        destWalk: Union[str, list, None] = None,
+        destBike: Union[str, list, None] = None,
+        destCar: Union[str, list, None] = None,
+        destTaxi: Union[str, list, None] = None,
+        destPark: Union[str, list, None] = None,
+        destMeta: Union[str, list, None] = None,
 
-        totalWalk: Union[str, list] = None, # type: ignore
-        totalBike: Union[str, list] = None, # type: ignore
-        totalCar: Union[str, list] = None, # type: ignore
-        totalTaxi: Union[str, list] = None, # type: ignore
-        totalMeta: Union[str, list] = None, # type: ignore
+        totalWalk: Union[str, list, None] = None,
+        totalBike: Union[str, list, None] = None,
+        totalCar: Union[str, list, None] = None,
+        totalTaxi: Union[str, list, None] = None,
+        totalMeta: Union[str, list, None] = None,
 
-        gisProducts: str = None, # type: ignore
+        gisProducts: Union[str, None] = None,
 
         includeIv: bool = False,
         ivOnly: bool = False,
 
-        mobilityProfile: str = None, # type: ignore
+        mobilityProfile: Union[str, None] = None,
         
         bikeCarriage: bool = False,
-        bikeCarriageType: Literal["SINGLEBIKES", "SMALLGROUPS", "LARGEGROUPS"] = None, # type: ignore
+        bikeCarriageType: Union[Literal["SINGLEBIKES", "SMALLGROUPS", "LARGEGROUPS"], None] = None,
 
         sleepingCar: bool = False,
         couchetteCoach: bool = False,
@@ -102,24 +102,24 @@ def trip_find(accessId: str,
 
         eco: bool = False,
         ecoCmp: bool = False,
-        ecoParams: str = None, # type: ignore
+        ecoParams: Union[str, None] = None,
 
-        rtMode: Literal["FULL", "INFOS", "OFF", "REALTIME", "SERVER_DEFAULT"] = None, # type: ignore
+        rtMode: Union[Literal["FULL", "INFOS", "OFF", "REALTIME", "SERVER_DEFAULT"], None] = None,
 
         unsharp: bool = False,
-        trainFilter: str = None, # type: ignore
+        trainFilter: Union[str, None] = None,
         economic: bool = False,
-        groupFilter: str = None, # type: ignore
+        groupFilter: Union[str, None] = None,
 
-        blockingList: str = None, # type: ignore
-        blockedEdges: str = None, # type: ignore
+        blockingList: Union[str, None] = None,
+        blockedEdges: Union[str, None] = None,
 
         trainComposition: bool = False,
         includeEarlier: bool = False,
         withICTAlternatives: bool = False,
-        tariff: bool = None, # type: ignore
+        tariff: Union[bool, None] = None,
         trafficMessages: bool = False,
-        travellerProfileData: str = None, # type: ignore
+        travellerProfileData: Union[str, None] = None,
         withFreq: bool = True
     ) -> dict:
     """The trip service calculates a trip from a specified origin to a specified destination. These might be
diff --git a/pyrmv/raw/trip_recon.py b/pyrmv/raw/trip_recon.py
index b6298d7..9b4ac45 100644
--- a/pyrmv/raw/trip_recon.py
+++ b/pyrmv/raw/trip_recon.py
@@ -14,31 +14,31 @@ def trip_recon(accessId: str,
         json: bool = True,
         poly: bool = False,
         polyEnc: Literal["DLT", "GPA", "N"] = "N",
-        date: Union[str, datetime] = None, # type: ignore
-        useCombinedComparison: bool = None, # type: ignore
-        acceptGaps: bool = None, # type: ignore
-        allowDummySections: bool = None, # type: ignore
-        flagAllNonReachable: bool = None, # type: ignore
-        matchCatStrict: bool = None, # type: ignore
-        matchIdNonBlank: bool = None, # type: ignore
-        matchIdStrict: bool = None, # type: ignore
-        matchNumStrict: bool = None, # type: ignore
-        matchRtType: bool = None, # type: ignore
-        enableRtFullSearch: bool = None, # type: ignore
-        enableReplacements: bool = None, # type: ignore
-        arrL: int = None, # type: ignore
-        arrU: int = None, # type: ignore
-        depL: int = None, # type: ignore
-        depU: int = None, # type: ignore
+        date: Union[str, datetime, None] = None,
+        useCombinedComparison: Union[bool, None] = None,
+        acceptGaps: Union[bool, None] = None,
+        allowDummySections: Union[bool, None] = None,
+        flagAllNonReachable: Union[bool, None] = None,
+        matchCatStrict: Union[bool, None] = None,
+        matchIdNonBlank: Union[bool, None] = None,
+        matchIdStrict: Union[bool, None] = None,
+        matchNumStrict: Union[bool, None] = None,
+        matchRtType: Union[bool, None] = None,
+        enableRtFullSearch: Union[bool, None] = None,
+        enableReplacements: Union[bool, None] = None,
+        arrL: Union[int, None] = None,
+        arrU: Union[int, None] = None,
+        depL: Union[int, None] = None,
+        depU: Union[int, None] = None,
         passlist: bool = False,
         showPassingPoints: bool = False,
-        rtMode: Literal["FULL", "INFOS", "OFF", "REALTIME", "SERVER_DEFAULT"] = None, # type: ignore
+        rtMode: Union[Literal["FULL", "INFOS", "OFF", "REALTIME", "SERVER_DEFAULT"], None] = None,
         eco: bool = False,
         ecoCmp: bool = False,
-        ecoParams: str = None, # type: ignore
-        tariff: bool = None, # type: ignore
-        trafficMessages: bool = None, # type: ignore
-        travellerProfileData: str = None # type: ignore
+        ecoParams: Union[str, None] = None,
+        tariff: Union[bool, None] = None,
+        trafficMessages: Union[bool, None] = None,
+        travellerProfileData: Union[str, None] = None
     ) -> dict:
     """Reconstructing a trip can be achieved using the reconstruction context provided by any trip result in the
     ctxRecon attribute of Trip element. The result will be a true copy of the original trip search result given