Merge branch 'master' of https://gitlab.telemabk.pl/vallher/JoinTheCity

JoinTheCityREST/app/API/management/commands/init_apis.py

@@ -14,7 +14,7 @@ class Command(BaseCommand):
             ['Apteki w Krakowie', 'Krakow', 'map', 'apteki', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
             ['Baseny w Krakowie', 'Krakow', 'map', 'baseny', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
             ['Hotele w Krakowie', 'Krakow', 'map','hotele', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
-            ['HotSpoty w Krakowie', 'Krakow', 'map','mapaHotSpotow', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
+            #['HotSpoty w Krakowie', 'Krakow', 'map','mapaHotSpotow', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
             ['Utrudnienia w Krakowie', 'Krakow', 'map','mapaUtrudnien', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
             ['Restauracje w Krakowie', 'Krakow', 'map','restauracje', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],
             ['Szpitale w Krakowie', 'Krakow', 'map','szpitale', 'image/icon.jpg', 'Opis API o aptekach w Krakowie'],

JoinTheCityREST/app/Discussion/models.py

@@ -24,8 +24,7 @@ class Discussion(models.Model):
         return self.question
 
     def add_message(self, user, text):
-        message = TextMessage.objects.create()
-        message.user = user
-        message.text = text
+        message = TextMessage.objects.create(user=user, text=text)
+        message.save()
         self.messages.add(message)
         self.save()
\ No newline at end of file

JoinTheCityREST/lib/api/zdarzeniaDrogowe.py

@@ -7,7 +7,40 @@ __author__ = 'Dominik Rosiek'
 class API(BaseAPI):
     resource = "b9349f75-c0e5-47a7-99a2-2f1ec4f32ad6"
     site = "https://api.bihapi.pl/dane/krakow"
-    methods = ('default')
+    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'] == 'date':
+                result['date'] = property['value']
+            elif property['key'] == 'street1':
+                result['street1'] = property['value']
+            elif property['key'] == 'street2':
+                result['street2'] = property['value']
+            elif property['key'] == 'street3':
+                result['street3'] = property['value']
+            elif property['key'] == 'geometry':
+                result['geometry'] = property['value']
+            elif property['key'] == 'light':
+                result['light'] = property['value']
+            elif property['key'] == 'type':
+                result['type'] = property['value']
+            elif property['key'] == 'maxspeed':
+                result['maxspeed'] = property['value']
+            elif property['key'] == 'sprawca':
+                result['sprawca'] = property['value']
+        return result
\ No newline at end of file