From 346a34e8c0a3199ed321fbac852f1e33981d64cc Mon Sep 17 00:00:00 2001
From: Ian Rees <ian@ianrees.net>
Date: Tue, 24 Jan 2023 14:26:49 -0800
Subject: [PATCH] Update

---
 routetester/checker.py  |  5 ++---
 routetester/checkotp.py |  2 +-
 routetester/compare.py  | 27 +++++++++------------------
 routetester/main.py     | 11 +----------
 4 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/routetester/checker.py b/routetester/checker.py
index 3994161..2d1b3f9 100644
--- a/routetester/checker.py
+++ b/routetester/checker.py
@@ -48,7 +48,7 @@ def json(self):
         }
 
 class Checker(object):
-    def __init__(self, host=None, request_cls=None, request_factories=None, when=None, whentz=None, params=None, count=1):
+    def __init__(self, host=None, request_cls=None, request_factories=None, when=None, whentz=None, count=1):
         self.host = host
         self.request_factories = request_factories or []
         if host and request_cls:
@@ -58,7 +58,6 @@ def __init__(self, host=None, request_cls=None, request_factories=None, when=Non
         self.count = count
         self.when = when
         self.whentz = whentz
-        self.params = params
 
     def load(self, testfile):
         with open(testfile) as f:
@@ -77,7 +76,7 @@ def run(self):
             for f in self.request_factories:
                 for _ in range(self.count):
                     request = f()
-                    response = request.request(trip, params=self.params)
+                    response = request.request(trip)
                     response.errors += TripMatcher().check(trip, response)
                     logging.info("%s -> %s"%(response.url, response.status_code))
                     self.rsets[trip].add_response(response)
diff --git a/routetester/checkotp.py b/routetester/checkotp.py
index 2185caa..f15b6ab 100644
--- a/routetester/checkotp.py
+++ b/routetester/checkotp.py
@@ -29,7 +29,7 @@ def url(self, trip, params=None):
         }
         if params:
             q.update(params)
-        url = "%s/otp/routers/default/plan?%s"%(self.host, urlencode(q))
+        url = "%s/plan?%s"%(self.host, urlencode(q))
         return url
 
     def request(self, trip, params=None):
diff --git a/routetester/compare.py b/routetester/compare.py
index b5c9764..251d375 100644
--- a/routetester/compare.py
+++ b/routetester/compare.py
@@ -21,26 +21,9 @@ def main():
     parser.add_argument('--when', help='Override all trip date/times, e.g. "next monday at 10am"')
     parser.add_argument('--whentz', help='Timezone for --when')
     parser.add_argument('-v', '--verbose', help='Print urls and failures', action='store_true')
-    parser.add_argument('-p', '--param', help='Add or override request parameter; example -p costing=auto', action='append')
     parser.add_argument('--debug', action='store_true')
     args = parser.parse_args()
 
-    # Set log level
-    level = logging.WARNING
-    if args.debug:
-        level = logging.DEBUG
-    elif args.verbose:
-        level = logging.INFO
-    logging.basicConfig(format='%(message)s', level=level)
-
-    # Check params
-    params = None
-    if args.param:
-        params = {}
-        for p in args.param:
-            key, _, value = p.partition("=")
-            params[key] = value
-
     # Select planner
     request_factories = []
     i = 0
@@ -51,8 +34,16 @@ def main():
         request_factories.append(functools.partial(request_cls, url))
         i += 2
 
+    # Set log level
+    level = logging.WARNING
+    if args.debug:
+        level = logging.DEBUG
+    elif args.verbose:
+        level = logging.INFO
+    logging.basicConfig(format='%(message)s', level=level)
+
     # Load tests
-    checker = Checker(request_factories=request_factories, when=args.when, whentz=args.whentz, params=params)
+    checker = Checker(request_factories=request_factories, when=args.when, whentz=args.whentz)
     checker.load(args.testfile)
     checker.run()
     fc = checker.result_geojson()
diff --git a/routetester/main.py b/routetester/main.py
index c3bd6e9..9037d05 100644
--- a/routetester/main.py
+++ b/routetester/main.py
@@ -18,7 +18,6 @@ def main():
     parser.add_argument('--debug', help='Print debug information', action='store_true')
     parser.add_argument('-o', '--out', help='Save GeoJSON output to file')
     parser.add_argument('-c', '--count', help='Run each test n times', default=1, type=int)
-    parser.add_argument('-p', '--param', help='Add or override request parameter; example -p costing=auto', action='append')
     parser.add_argument('url', help='Test endpoint')
     parser.add_argument('testfiles', nargs='+', help='Test GeoJSON input file')
     args = parser.parse_args()
@@ -29,14 +28,6 @@ def main():
         print("Unknown planner: %s"%args.mode)
         sys.exit(1)
 
-    # Check params
-    params = None
-    if args.param:
-        params = {}
-        for p in args.param:
-            key, _, value = p.partition("=")
-            params[key] = value
-
     # Set log level
     level = logging.WARNING
     if args.debug:
@@ -46,7 +37,7 @@ def main():
     logging.basicConfig(format='%(message)s', level=level)
 
     # Run checker
-    checker = Checker(args.url, request_cls, when=args.when, whentz=args.whentz, count=args.count, params=params)
+    checker = Checker(args.url, request_cls, when=args.when, whentz=args.whentz, count=args.count)
     for filename in args.testfiles:
         checker.load(filename)
     checker.run()