apyefa 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

apyefa/__init__.py

@@ -2,6 +2,7 @@ from apyefa.client import EfaClient
 from apyefa.data_classes import (
     Departure,
     Line,
+    LineRequestType,
     Location,
     LocationFilter,
     LocationType,
@@ -12,6 +13,7 @@ from apyefa.data_classes import (
 __all__ = [
     "LocationFilter",
     "Location",
+    "LineRequestType",
     "LocationType",
     "Departure",
     "SystemInfo",

apyefa/client.py

@@ -79,14 +79,13 @@ class EfaClient:
         _LOGGER.debug(f"limit: {limit}")
 
         command = CommandStopFinder("any", name)
-        command.add_param("anyMaxSizeHitList", limit)
 
         if filters:
             command.add_param("anyObjFilter_sf", sum(filters))
 
         response = await self._run_query(self._build_url(command))
 
-        return command.parse(response)
+        return command.parse(response)[:limit]
 
     async def location_by_coord(
         self,
@@ -113,11 +112,10 @@ class EfaClient:
         _LOGGER.debug(f"limit: {limit}")
 
         command = CommandStopFinder("coord", f"{coord_x}:{coord_y}:{format}")
-        command.add_param("anyMaxSizeHitList", limit)
 
         response = await self._run_query(self._build_url(command))
 
-        return command.parse(response)
+        return command.parse(response)[:limit]
 
     async def trip(self):
         raise NotImplementedError

apyefa/commands/command.py

@@ -7,6 +7,8 @@ from apyefa.commands.parsers.rapid_json_parser import RapidJsonParser
 from apyefa.exceptions import EfaFormatNotSupported, EfaParameterError
 from apyefa.helpers import is_date, is_datetime, is_time
 
+from ..data_classes import CoordFormat
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -18,7 +20,7 @@ class Command:
         self._format: str = output_format
 
         self.add_param("outputFormat", output_format)
-        self.add_param("coordOutputFormat", "WGS84")
+        self.add_param("coordOutputFormat", CoordFormat.WGS84.value)
 
     def add_param(self, param: str, value: str):
         if not param or not value:

apyefa/commands/command_departures.py

@@ -3,7 +3,7 @@ import logging
 from voluptuous import Any, Date, Datetime, Optional, Required, Schema
 
 from apyefa.commands.command import Command
-from apyefa.data_classes import Departure
+from apyefa.data_classes import CoordFormat, Departure
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -32,7 +32,9 @@ class CommandDepartures(Command):
         return Schema(
             {
                 Required("outputFormat", default="rapidJSON"): Any("rapidJSON"),
-                Required("coordOutputFormat", default="WGS84"): Any("WGS84"),
+                Required("coordOutputFormat", default="WGS84"): Any(
+                    *[x.value for x in CoordFormat]
+                ),
                 Required("name_dm"): str,
                 Required("type_dm", default="stop"): Any("any", "stop"),
                 Required("mode", default="direct"): Any("any", "direct"),

apyefa/commands/command_serving_lines.py

@@ -3,7 +3,7 @@ import logging
 from voluptuous import Any, Optional, Range, Required, Schema
 
 from apyefa.commands.command import Command
-from apyefa.data_classes import Line, LineRequestType
+from apyefa.data_classes import CoordFormat, Line, LineRequestType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -41,7 +41,9 @@ class CommandServingLines(Command):
         return Schema(
             {
                 Required("outputFormat", default="rapidJSON"): Any("rapidJSON"),
-                Required("coordOutputFormat", default="WGS84"): Any("WGS84"),
+                Required("coordOutputFormat", default="WGS84"): Any(
+                    *[x.value for x in CoordFormat]
+                ),
                 Required("mode", default="line"): Any("odv", "line"),
                 # mode 'odv'
                 Optional("type_sl"): Any("stopID"),

apyefa/commands/command_stop_finder.py

@@ -3,7 +3,7 @@ import logging
 from voluptuous import Any, Optional, Range, Required, Schema
 
 from apyefa.commands.command import Command
-from apyefa.data_classes import Location, LocationFilter
+from apyefa.data_classes import CoordFormat, Location, LocationFilter
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,7 +33,9 @@ class CommandStopFinder(Command):
         return Schema(
             {
                 Required("outputFormat", default="rapidJSON"): Any("rapidJSON"),
-                Required("coordOutputFormat", default="WGS84"): Any("WGS84"),
+                Required("coordOutputFormat", default="WGS84"): Any(
+                    *[x.value for x in CoordFormat]
+                ),
                 Required("type_sf", default="any"): Any("any", "coord"),
                 Required("name_sf"): str,
                 Optional("anyMaxSizeHitList"): int,
@@ -41,6 +43,10 @@ class CommandStopFinder(Command):
                 Optional("anyResSort_sf"): str,
                 Optional("anyObjFilter_sf"): int,
                 Optional("doNotSearchForStops_sf"): Any("0", "1", 0, 1),
+                Optional("locationInfoActive_sf"): Any("0", "1", 0, 1),
+                Optional("useHouseNumberList_sf"): Any("0", "1", 0, 1),
+                Optional("useLocalityMainStop"): Any("0", "1", 0, 1),
+                Optional("prMinQu"): int,
                 Optional("anyObjFilter_origin"): Range(
                     min=0, max=sum([x.value for x in LocationFilter])
                 ),

apyefa/commands/command_system_info.py

@@ -3,7 +3,7 @@ import logging
 from voluptuous import Any, Optional, Required, Schema
 
 from apyefa.commands.command import Command
-from apyefa.data_classes import SystemInfo
+from apyefa.data_classes import CoordFormat, SystemInfo
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -23,6 +23,8 @@ class CommandSystemInfo(Command):
         return Schema(
             {
                 Required("outputFormat", default="rapidJSON"): Any("rapidJSON"),
-                Optional("coordOutputFormat", default="WGS84"): Any("WGS84"),
+                Optional("coordOutputFormat", default="WGS84"): Any(
+                    *[x.value for x in CoordFormat]
+                ),
             }
         )

apyefa/commands/command_trip.py

@@ -4,6 +4,8 @@ from voluptuous import Any, Optional, Required, Schema
 
 from apyefa.commands.command import Command
 
+from ..data_classes import CoordFormat
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -18,7 +20,9 @@ class CommandTrip(Command):
         return Schema(
             {
                 Required("outputFormat", default="rapidJSON"): Any("rapidJSON"),
-                Required("coordOutputFormat", default="WGS84"): Any("WGS84"),
+                Required("coordOutputFormat", default="WGS84"): Any(
+                    *[x.value for x in CoordFormat]
+                ),
                 Required("type_origin", default="any"): Any("any", "coord"),
                 Required("name_origin"): str,
                 Required("type_destination", default="any"): Any("any", "coord"),

apyefa/data_classes.py

@@ -97,7 +97,7 @@ def IsLocationType(type: str):
 
 SCHEMA_PROPERTIES = vol.Schema(
     {
-        vol.Required("stopId"): str,
+        vol.Optional("stopId"): str,
         vol.Optional("downloads"): list,
         vol.Optional("area"): str,
         vol.Optional("platform"): str,

{apyefa-0.0.5.dist-info → apyefa-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apyefa
-Version: 0.0.5
+Version: 0.0.7
 Summary: Python API for EFA(Elektronische Fahrplanauskunft) async requests
 Author-email: Alex Jung <jungdevelop@gmail.com>
 License: MIT License
@@ -185,16 +185,14 @@ async with EfaClient("https://efa.vgn.de/vgnExt_oeffi/") as client:
 ```
 
 ## locations_by_coord()
-Find localities by coordinates.
-
-> :x: Currently test endpoint does not sent any answers for this request
+Find localities by their coordinates.
 
 ### Arguments
 |Arguments|Type                |Required|Description|
 |---------|--------------------|--------|-----------|
 |coord_x  |float               |required|X-coordinate|
 |coord_y  |float               |required|Y-coordinate|
-|format   |[CoordFormat](#coordformat)|optional|Coordinates format used for request|
+|format   |[CoordFormat](#coordformat)|optional|Coordinates format used for request. Default to WGS84.|
 |limit    |int                 |optional|Max size of returned list. Default value is `10`|
 
 ### Return value

apyefa-0.0.7.dist-info/RECORD

@@ -0,0 +1,21 @@
+apyefa/__init__.py,sha256=9LuZCm4L02Jz-rgvSyTSQ10fzMEZ0P2nWQQ6m3Z9Ab0,386
+apyefa/client.py,sha256=OP9HnzwufH9joS-Bx7r768yu185ILbpVFGuYV2APjQ0,6832
+apyefa/data_classes.py,sha256=gw89j_cr5rRfNx2GFxYDDV52dcdW5ao9N_aebcuul0I,11552
+apyefa/exceptions.py,sha256=Vhc8FEtI1xSxbVRLFXd3BlNTekY2w3byEvd3Jhhg8h4,240
+apyefa/helpers.py,sha256=EJyj-Pw3xDrn8WKGbpfqbnaUZjHtVrE2A2LYpTkACps,1695
+apyefa/commands/__init__.py,sha256=kC7Zr8IcahAN8xEOytDUS6WCADQ5oe_nqDIPAjlzxy4,425
+apyefa/commands/command.py,sha256=ruVb8kpvsShsfT4wrgwcCdxqlGnYs4jsXTEoYx873rk,3633
+apyefa/commands/command_departures.py,sha256=kYt6GbXD1XYXEbGpi61TEFBTznqShyOaqJmpRi0mHZ4,1811
+apyefa/commands/command_serving_lines.py,sha256=PSWjr0el4bhq20IaW_P56q8sJ3vNlfV-KpoAUjrsHqo,2212
+apyefa/commands/command_stop_finder.py,sha256=lUkubSe7mVu8M6rss-RumnCPOaJJo_v6qlRNF7n6R88,2019
+apyefa/commands/command_system_info.py,sha256=rhAoeOE8V9Wc3G6z7NDrB9pjcULDz1o7oo-idS4VyXQ,858
+apyefa/commands/command_trip.py,sha256=Mhqv7wR11DtvxfaZSmNF-hLZxgC3XFH3UgBuI2fFEBA,1197
+apyefa/commands/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apyefa/commands/parsers/parser.py,sha256=1PSlLpfYrNeKRTpvCcYsCzAKlNrs0oHvSN7zpF4Xcs8,140
+apyefa/commands/parsers/rapid_json_parser.py,sha256=UMexRiMKkJLcK5EEj80B6RYkWBuR8ZWD3YpeGa0J3lQ,212
+apyefa/commands/parsers/xml_parser.py,sha256=ru52QtBP68KoTZ8OgjFWrLy-PD4_j1miY8Zv5umNSE8,151
+apyefa-0.0.7.dist-info/LICENSE,sha256=C2Gdvb1B39BeEP-RGqVd7w6j94GnJo4gnYyiC_l3SFQ,1066
+apyefa-0.0.7.dist-info/METADATA,sha256=rI_SnnRqdCS4AwgpaNSnPISlPhBECjtwCcpJh5E97ho,16701
+apyefa-0.0.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+apyefa-0.0.7.dist-info/top_level.txt,sha256=b9VSv2S7lxdaypCumxO92IEQFpJdFuB8vQs03j5gZxY,7
+apyefa-0.0.7.dist-info/RECORD,,

apyefa-0.0.5.dist-info/RECORD

@@ -1,21 +0,0 @@
-apyefa/__init__.py,sha256=kohSwa1VlugPyxKa0QZqQFwRi4hIGrKFd74W7NDgunA,342
-apyefa/client.py,sha256=UYt1kvxvPjg-VfdlUqPsazyEdc97J27_DMoprjF8C8g,6924
-apyefa/data_classes.py,sha256=Njt7r8ONEY5KxUz9uVFnPHU9qz9sp5RWmmhiR8ywDiY,11552
-apyefa/exceptions.py,sha256=Vhc8FEtI1xSxbVRLFXd3BlNTekY2w3byEvd3Jhhg8h4,240
-apyefa/helpers.py,sha256=EJyj-Pw3xDrn8WKGbpfqbnaUZjHtVrE2A2LYpTkACps,1695
-apyefa/commands/__init__.py,sha256=kC7Zr8IcahAN8xEOytDUS6WCADQ5oe_nqDIPAjlzxy4,425
-apyefa/commands/command.py,sha256=wq3rEaYd3NUpkNqo2sX3Yw9-lcRerp8scAy2SVpx1hs,3577
-apyefa/commands/command_departures.py,sha256=kHOyxxSHn7F7ClAV1fQdl1O4cOVRs6a60pkqc8-r_9o,1736
-apyefa/commands/command_serving_lines.py,sha256=V-HVYgFyeEWBLebKbp6NNXshxw0fVPttGZLu-CTmFC4,2137
-apyefa/commands/command_stop_finder.py,sha256=oDCbjVoQVK_ARDEdmHXuaUJ-IJA0P6f99cVDRS2hqT8,1688
-apyefa/commands/command_system_info.py,sha256=0bQ0oYbp7FFqPA1b5RgaxANm9-BYlN5KiwRILCCuDVY,783
-apyefa/commands/command_trip.py,sha256=kOlchWyBRlvWBqwjqpx130VXEh5kly6KMSv_pgCBljs,1095
-apyefa/commands/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apyefa/commands/parsers/parser.py,sha256=1PSlLpfYrNeKRTpvCcYsCzAKlNrs0oHvSN7zpF4Xcs8,140
-apyefa/commands/parsers/rapid_json_parser.py,sha256=UMexRiMKkJLcK5EEj80B6RYkWBuR8ZWD3YpeGa0J3lQ,212
-apyefa/commands/parsers/xml_parser.py,sha256=ru52QtBP68KoTZ8OgjFWrLy-PD4_j1miY8Zv5umNSE8,151
-apyefa-0.0.5.dist-info/LICENSE,sha256=C2Gdvb1B39BeEP-RGqVd7w6j94GnJo4gnYyiC_l3SFQ,1066
-apyefa-0.0.5.dist-info/METADATA,sha256=bop1VP_hhMO9A_9inje-HerUa1uArdE2jkvA1mZUHa0,16750
-apyefa-0.0.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-apyefa-0.0.5.dist-info/top_level.txt,sha256=b9VSv2S7lxdaypCumxO92IEQFpJdFuB8vQs03j5gZxY,7
-apyefa-0.0.5.dist-info/RECORD,,