14
14
15
15
16
16
class Loklak (object ):
17
- baseUrl = 'http://loklak.org/api/ '
17
+ baseUrl = 'http://loklak.org/'
18
18
name = None
19
19
followers = None
20
20
following = None
@@ -31,7 +31,7 @@ class Loklak (object):
31
31
data = {}
32
32
33
33
def status (self ):
34
- statusAPI = 'status.json'
34
+ statusAPI = 'api/ status.json'
35
35
Url = self .baseUrl + statusAPI
36
36
r = requests .get (Url )
37
37
if r .status_code == 200 :
@@ -41,7 +41,7 @@ def status(self):
41
41
return json .dumps (r )
42
42
43
43
def hello (self ):
44
- helloAPI = 'hello.json'
44
+ helloAPI = 'api/ hello.json'
45
45
Url = self .baseUrl + helloAPI
46
46
r = requests .get (Url )
47
47
if r .status_code == 200 :
@@ -51,7 +51,7 @@ def hello(self):
51
51
return json .dumps (r )
52
52
53
53
def geocode (self , places = None ):
54
- geoAPI = 'geocode.json'
54
+ geoAPI = 'api/ geocode.json'
55
55
Url = self .baseUrl + geoAPI
56
56
params = {}
57
57
params ['places' ] = places
@@ -62,9 +62,17 @@ def geocode(self, places=None):
62
62
r = {}
63
63
return json .dumps (r )
64
64
65
+ def map (self , latitude , longitude , width = 500 , height = 500 , zoom = 8 , text = "" ):
66
+ mapAPI = 'vis/map.png'
67
+ params = {'text' : text , 'mlat' : latitude , 'mlon' : longitude , 'width' : width , 'height' : height , 'zoom' : zoom }
68
+ r = requests .get (self .baseUrl + mapAPI , params = params , stream = True )
69
+ if r .status_code == 200 :
70
+ return r .raw .read ()
71
+ else :
72
+ return ''
65
73
66
74
def peers (self ):
67
- peersAPI = 'peers.json'
75
+ peersAPI = 'api/ peers.json'
68
76
Url = self .baseUrl + peersAPI
69
77
r = requests .get (Url )
70
78
if r .status_code == 200 :
@@ -74,7 +82,7 @@ def peers(self):
74
82
return json .dumps (r )
75
83
76
84
def user (self , name = None , followers = None , following = None ):
77
- userAPI = 'user.json'
85
+ userAPI = 'api/ user.json'
78
86
Url = self .baseUrl + userAPI
79
87
self .name = name
80
88
self .followers = followers
@@ -110,7 +118,7 @@ def settings(self):
110
118
return json .dumps (r )
111
119
112
120
def search (self , q = None , since = None , until = None , fromUser = None ):
113
- searchAPI = 'search.json'
121
+ searchAPI = 'api/ search.json'
114
122
Url = self .baseUrl + searchAPI
115
123
self .q = q
116
124
self .since = since
@@ -138,7 +146,7 @@ def search(self, q=None, since=None, until=None, fromUser=None):
138
146
return json .dumps (r )
139
147
140
148
def aggregations (self , q = None , since = None , until = None , fields = None , limit = None ):
141
- aggregationsAPI = 'search.json'
149
+ aggregationsAPI = 'api/ search.json'
142
150
Url = self .baseUrl + aggregationsAPI
143
151
self .q = q
144
152
self .since = since
0 commit comments