Implement OTP feeds and move helsinki to it

Author: eskerda

pybikes/data/otp.json

@@ -0,0 +1,25 @@
+{
+    "system":"otp",
+    "class": "OTP",
+    "instances":[
+        {
+            "tag":"citybikes-helsinki",
+            "meta":{
+                "city":"Helsinki",
+                "name":"City bikes",
+                "country":"FI",
+                "company":[
+                    "Helsinki City Transport",
+                    "Helsinki Regional Transport",
+                    "CityBikeFinland",
+                    "Smoove SAS",
+                    "Moventia",
+                    "Alepa"
+                ],
+                "longitude":24.938379,
+                "latitude":60.16985569999999
+            },
+            "feed_url":"https://dev.hsl.fi/matka.hsl.fi/otp/routers/hsl/bike_rental"
+        }
+    ]
+}

pybikes/data/smoove.json

@@ -2,27 +2,7 @@
     "system":"smoove",
     "class":{
         "SmooveAPI":{
-            "instances":[
-                {
-                    "tag":"citybikes-helsinki",
-                    "meta":{
-                        "city":"Helsinki",
-                        "name":"City bikes",
-                        "country":"FI",
-                        "company":[
-                            "Helsinki City Transport",
-                            "Helsinki Regional Transport",
-                            "CityBikeFinland",
-                            "Smoove SAS",
-                            "Moventia",
-                            "Alepa"
-                        ],
-                        "longitude":24.938379,
-                        "latitude":60.16985569999999
-                    },
-                    "feed_url":"https://helsinki-fi-smoove.klervi.net/api-public/stations"
-                }
-            ]
+            "instances":[]
         },
         "Smoove":{
             "instances":[

pybikes/otp.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+import json
+
+from .base import BikeShareSystem, BikeShareStation
+from .utils import PyBikesScraper
+
+# Documented at
+# http://dev.opentripplanner.org/apidoc/0.15.0/ns0_bikeRentalStationList.html
+
+
+class OTP(BikeShareSystem):
+    # Please note company is not provided by this class and should be added on
+    # the metadata JSON, as OTP implementation is generic for different systems
+    meta = {
+        'system': 'OTP',
+    }
+
+    def __init__(self, tag, feed_url, meta):
+        super(OTP, self).__init__(tag, meta)
+        self.feed_url = feed_url
+
+    def update(self, scraper=None):
+        scraper = scraper or PyBikesScraper()
+        scraper.headers['Accept'] = 'application/json'
+
+        data = json.loads(scraper.request(self.feed_url))
+        stations = []
+        for st in data['stations']:
+            name = st['name']
+            bikes = st['bikesAvailable']
+            free = st['spacesAvailable']
+            lat = st['x']
+            lng = st['y']
+            extra = {
+                'uid': st['id']
+            }
+            station = BikeShareStation(name, lat, lng, bikes, free, extra)
+            stations.append(station)
+
+        self.stations = stations

pybikes/smoove.py

@@ -59,12 +59,13 @@ def update(self, scraper=None):
 
 
 class SmooveAPI(Smoove):
-
+    # Example feed:
+    # https://helsinki-fi-smoove.klervi.net/api-public/stations
     def update(self, scraper=None):
         scraper = scraper or utils.PyBikesScraper()
 
         data = json.loads(scraper.request(self.feed_url))
-
+        stations = []
         for s in data['result']:
             lat, lng = map(float, s['coordinates'].split(','))
             name = s['name']
@@ -82,4 +83,6 @@ def update(self, scraper=None):
                 extra['uid'] = idx
 
             station = BikeShareStation(name, lat, lng, bikes, free, extra)
-            self.stations.append(station)
+            stations.append(station)
+
+        self.stations = stations