Merge remote-tracking branch 'origin/master'

JoinTheCityREST/lib/api/API.py

@@ -17,7 +17,7 @@ class BaseAPI(object):
         parameters['resource'] = self.resource
         r = requests.get(self.site, auth=self.auth, params=parameters, verify=self.verifySSL)
         if r.status_code == 200:
-            return json.dumps(r.json())
+            return r.json()
         return False
 
     def execute(self, method):

JoinTheCityREST/lib/api/apteki.py

+import json
+from app.API.serializers import APISerializer
+from lib.api.API import BaseAPI
+
+__author__ = 'Dominik Rosiek'
+
+class API(BaseAPI):
+    resource = "d5629ae6-3450-44fb-becb-4a418f354145"
+    site = "https://api.bihapi.pl/dane/krakow"
+    methods = ('default', 'object')
+
+    def default(self):
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))
+
+    def object(self):
+        data = self.GET(parameters=self.request.GET.dict())
+        results = []
+        try:
+            for obj in data['results']:
+                results.append(self.unpack(obj))
+        except TypeError as e:
+            results.append(self.unpack(data['results']))
+        return json.dumps(results)
+
+    def unpack(self, obj):
+        result = {}
+        for property in obj['properties']:
+            if property['key'] == 'APTEKI':
+                result['name'] = property['value']
+            elif property['key'] == 'OADR_GPS_S':
+                result['latitude'] = property['value']
+            elif property['key'] == 'OADR_GPS_D':
+                result['longitude'] = property['value']
+        return result

JoinTheCityREST/lib/api/baseny.py

+import json
+from app.API.serializers import APISerializer
+from lib.api.API import BaseAPI
+
+__author__ = 'Dominik Rosiek'
+
+class API(BaseAPI):
+    resource = "6c8f204a-e061-4e64-945c-d07a41ea788a"
+    site = "https://api.bihapi.pl/dane/krakow"
+    methods = ('default')
+
+    def default(self):
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))

JoinTheCityREST/lib/api/hotele.py

+import json
+from app.API.serializers import APISerializer
+from lib.api.API import BaseAPI
+
+__author__ = 'Dominik Rosiek'
+
+class API(BaseAPI):
+    resource = "b02b0bb5-1197-4128-9e48-c679e07ba350"
+    site = "https://api.bihapi.pl/dane/krakow"
+    methods = ('default')
+
+    def default(self):
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))

JoinTheCityREST/lib/api/mapaHotSpotow.py

+import json
+from app.API.serializers import APISerializer
+from lib.api.API import BaseAPI
+
+__author__ = 'Dominik Rosiek'
+
+class API(BaseAPI):
+    resource = "9a69b858-70aa-4f02-a38e-5de184417111"
+    site = "https://api.bihapi.pl/dane/krakow"
+    methods = ('default')
+
+    def default(self):
+        return json.dumps({"error": "Not implemented"})
+        return self.GET(parameters=self.request.GET.dict())

JoinTheCityREST/lib/api/mapaUtrudnien.py

+import json
+from app.API.serializers import APISerializer
+from lib.api.API import BaseAPI
+
+__author__ = 'Dominik Rosiek'
+
+class API(BaseAPI):
+    resource = "56c603a9-c4a8-4888-98c3-b5bebda65599"
+    site = "https://api.bihapi.pl/dane/krakow"
+    methods = ('default')
+
+    def default(self):
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))

JoinTheCityREST/lib/api/restauracje.py

+import json
+from app.API.serializers import APISerializer
+from lib.api.API import BaseAPI
+
+__author__ = 'Dominik Rosiek'
+
+class API(BaseAPI):
+    resource = "9a69b858-70aa-4f02-a38e-5de184417111"
+    site = "https://api.bihapi.pl/dane/krakow"
+    methods = ('default')
+
+    def default(self):
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))

JoinTheCityREST/lib/api/szpitale.py

+import json
+from app.API.serializers import APISerializer
+from lib.api.API import BaseAPI
+
+__author__ = 'Dominik Rosiek'
+
+class API(BaseAPI):
+    resource = "3812a858-7d72-48ff-b790-186fdd4be2a5"
+    site = "https://api.bihapi.pl/dane/krakow"
+    methods = ('default')
+
+    def default(self):
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))

JoinTheCityREST/lib/api/zdarzeniaDrogowe.py

+import json
 from app.API.serializers import APISerializer
 from lib.api.API import BaseAPI
 
@@ -9,4 +10,4 @@ class API(BaseAPI):
     methods = ('default')
 
     def default(self):
-        return self.GET(parameters=self.request.GET.dict())
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))