Merge pull request #768 from eskerda/fix-baksi

update baksi

Author: eskerda

Diff for: pybikes/baksi.py

@@ -3,65 +3,47 @@
 # Distributed under the AGPL license, see LICENSE.txt
 
 import re
+import json
 
-from .base import BikeShareSystem, BikeShareStation
-from . import utils
+from pybikes import BikeShareSystem, BikeShareStation, PyBikesScraper
+from pybikes.utils import Bounded
 
-__all__ = ['Baksi', 'BaksiStation']
 
-ID_NAME_RGX = "([0-9]+)\-([\w\s.()-]+)\'"
-STATUS_RGX = "Durum\ [ ]+\ (\w+)"
-DOCKS_RGX = "Park[ ]+([0-9]+)"
-BIKES_RGX = "Bisiklet[ ]+([0-9]+)"
-LAT_LNG_RGX = "([\s0-9.]+)\',\ \'([\s0-9.]+)"
-
-class Baksi(BikeShareSystem):
+class Baksi(Bounded, BikeShareSystem):
 
     meta = {
         'system': 'Baksi',
         'company': ['Baksi Bike Sharing System']
     }
 
-    def __init__(self, tag, meta, feed_url):
-        super(Baksi, self).__init__(tag, meta)
+    def __init__(self, tag, meta, feed_url, bbox=None):
+        super(Baksi, self).__init__(tag, meta, bounds=bbox)
         self.feed_url = feed_url
 
-    def update(self, scraper = None):
-        if scraper is None:
-            scraper = utils.PyBikesScraper()
-
-        html_data=scraper.request(self.feed_url, raw = True).decode('iso-8859-9')
-
-        # Fetch Data
-        id_name = re.findall(ID_NAME_RGX, html_data, re.UNICODE)
-        status = re.findall(STATUS_RGX, html_data, re.UNICODE)
-        docks = re.findall(DOCKS_RGX, html_data, re.UNICODE)
-        bikes = re.findall(BIKES_RGX, html_data, re.UNICODE)
-        geopoints = re.findall(LAT_LNG_RGX, html_data, re.UNICODE)
-
-        # Refine Output
-        station_id, name = zip(*id_name)
-        status = ["Active" if out == "Aktif" else "Inactive" for out in status]
-        docks = [int(i) for i in docks]
-        bikes = [int(i) for i in bikes]
-        latitude, longitude = zip(*geopoints)
+    def update(self, scraper=None):
+        scraper = scraper or PyBikesScraper()
 
-        fields = zip(station_id, name, status, docks, bikes, latitude,
-                     longitude)
+        html_data = scraper.request(self.feed_url)
+        ex_data = re.search(r'var all = (\[.*\]);', html_data).group(1)
+        data = json.loads(ex_data)
 
-        self.stations = list(map(BaksiStation, fields))
+        self.stations = list(map(BaksiStation, data))
 
 
 class BaksiStation(BikeShareStation):
     def __init__(self, data):
         super(BaksiStation, self).__init__()
-        self.name = data[1]
-        self.bikes = data[3]
-        self.free = data[4]
+
+        uid, name = data[0].split('-', 1)
+
+        self.name = name
         self.latitude = float(data[5])
         self.longitude = float(data[6])
+
+        self.bikes = int(re.findall(r'\d+', data[2])[0])
+        self.free = int(re.findall(r'\d+', data[3])[0])
+
         self.extra = {
-                'uid': data[0],
-                'status': data[2],
-                'slots': int(data[3] + data[4])
+            'uid': uid,
+            'online': 'Aktif' in data[1],
         }

Diff for: pybikes/data/baksi.json

@@ -12,38 +12,29 @@
             "feed_url": "http://abone.antbis.com/harita.asp"
         },
         {
-            "tag": "baksi-bisim",
+            "tag": "baksi-cabis",
             "meta":{
-                "latitude": 38.4134047464,
-                "city": "Izmir",
-                "name": "Baksi",
-                "longitude": 27.0325753524,
-                "country":"TR"
-            },
-            "feed_url": "http://abone.bisim.com.tr/harita.asp"
-        },
-        {
-            "tag": "baksi-istanbul",
-            "meta":{
-                "latitude": 40.9696887925,
-                "city": "Istanbul",
-                "name": "Isbike",
-                "longitude": 29.0475373717,
+                "latitude": 40.1531,
+                "city": "Çanakkale",
+                "name": "Çabis",
+                "longitude": 26.4146,
                 "country": "TR"
             },
-            "feed_url": "https://www.isbike.com.tr/abone/harita.asp"
+            "feed_url": "https://cabis.canakkale.bel.tr/abone/harita.asp"
         },
         {
-            "tag": "baksi-kobis",
+            "tag": "baksi-nilesplit",
             "meta":{
-                "latitude": 40.7674733342,
-                "city": "Kocaeli",
-                "name": "Baksi",
-                "longitude": 29.9755885985,
+                "latitude": 40.2127,
+                "city": "Nilüfer",
+                "name": "Nilesplit",
+                "longitude": 28.9627,
                 "country": "TR"
             },
-            "feed_url": "http://abone.kobis.com.tr/harita.asp"
+            "bbox": [[40.0050, 28.6523], [40.3951, 29.2069]],
+            "feed_url": "https://nilespit.com/abone/harita.asp"
         }
+
     ],
     "system":"baksi",
     "class":"Baksi"