Skip to content

Commit 9165aa6

Browse files
author
Koehler, Jonathan
committed
name change to BaseUrl as Global Static
1 parent 2e1b247 commit 9165aa6

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎osm/osm_api.py

+31-31
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222

2323

2424
class OsmApi(a_osm_api.OsmApi):
25-
base_url = 'https://master.apis.dev.openstreetmap.org/api/0.6'
25+
BASE_URL = 'https://master.apis.dev.openstreetmap.org/api/0.6'
2626

2727
def get_permissions(self) -> set:
2828
"""
2929
current permissions
3030
GET /api/0.6/permissions
3131
"""
32-
data = requests.get(self.base_url + '/permissions', auth=(NAME, PASS))
32+
data = requests.get(self.BASE_URL + '/permissions', auth=(NAME, PASS))
3333
if data.ok:
3434
tree = ElemTree.fromstring(data.text)
3535
permissions = set()
@@ -51,7 +51,7 @@ def create_changeset(self, tags: dict) -> int:
5151
xml = ElemTree.tostring(root)
5252

5353
logger.debug(xml)
54-
data = requests.put(self.base_url + '/changeset/create', data=xml, auth=(NAME, PASS))
54+
data = requests.put(self.BASE_URL + '/changeset/create', data=xml, auth=(NAME, PASS))
5555
if data.ok:
5656
return int(data.text)
5757
elif data.status_code == HTTPStatus.BAD_REQUEST:
@@ -66,7 +66,7 @@ def get_changeset(self, cid: int, discussion: bool = False) -> ChangeSet:
6666
GET /api/0.6/changeset/#id?include_discussion=
6767
exclude discussion by <empty> or omitting
6868
"""
69-
url = self.base_url + '/changeset/{}'.format(cid)
69+
url = self.BASE_URL + '/changeset/{}'.format(cid)
7070
if discussion:
7171
url += '?include_discussion=True'
7272
data = requests.get(url, auth=(NAME, PASS))
@@ -82,7 +82,7 @@ def close_changeset(self, cid: int):
8282
closes a changeset
8383
PUT /api/0.6/changeset/#id/close
8484
"""
85-
data = requests.get(self.base_url + '/changeset/{}/close'.format(cid), auth=(NAME, PASS))
85+
data = requests.get(self.BASE_URL + '/changeset/{}/close'.format(cid), auth=(NAME, PASS))
8686
if data.ok:
8787
return None
8888
elif data.status_code == HTTPStatus.NOT_FOUND:
@@ -95,7 +95,7 @@ def download_changeset(self, cid: int) -> str:
9595
"""
9696
GET /api/0.6/changeset/#id/download
9797
"""
98-
data = requests.get(self.base_url + '/changeset/close', auth=(NAME, PASS))
98+
data = requests.get(self.BASE_URL + '/changeset/close', auth=(NAME, PASS))
9999
if data.ok:
100100
return data.text
101101
elif data.status_code == HTTPStatus.NOT_FOUND:
@@ -127,7 +127,7 @@ def comm_changeset(self, cid: int, text: str) -> ChangeSet:
127127
Add a comment to a changeset. The changeset must be closed.
128128
POST /api/0.6/changeset/#id/comment
129129
"""
130-
data = requests.post(self.base_url + '/changeset/{}/comment'.format(str(cid)),
130+
data = requests.post(self.BASE_URL + '/changeset/{}/comment'.format(str(cid)),
131131
data={'text': text}, auth=(NAME, PASS))
132132
logger.debug(data.text)
133133
if data.ok:
@@ -142,7 +142,7 @@ def sub_changeset(self, cid: int) -> ChangeSet:
142142
Subscribes the current authenticated user to changeset discussion
143143
POST /api/0.6/changeset/#id/subscribe
144144
"""
145-
data = requests.post(self.base_url + '/changeset/{}/subscribe'.format(cid), auth=(NAME, PASS))
145+
data = requests.post(self.BASE_URL + '/changeset/{}/subscribe'.format(cid), auth=(NAME, PASS))
146146
if data.ok:
147147
return self.__changeset_parser(data.text)
148148
elif data.status_code == HTTPStatus.CONFLICT:
@@ -154,7 +154,7 @@ def unsub_changeset(self, cid: int) -> ChangeSet:
154154
Unsubscribe the current authenticated user from changeset discussion
155155
POST /api/0.6/changeset/#id/subscribe
156156
"""
157-
data = requests.post(self.base_url + '/changeset/{}/unsubscribe'.format(cid), auth=(NAME, PASS))
157+
data = requests.post(self.BASE_URL + '/changeset/{}/unsubscribe'.format(cid), auth=(NAME, PASS))
158158
if data.ok:
159159
return self.__changeset_parser(data.text)
160160
elif data.status_code == HTTPStatus.NOT_FOUND:
@@ -171,7 +171,7 @@ def create_element(self, elem: Element, cid: int) -> int:
171171
"""
172172
elem.changeset = cid
173173
xml = self.__serial_elem(elem, True)
174-
data = requests.get(self.base_url + '/{}/create'.format(elem.e_type), data=xml, auth=(NAME, PASS))
174+
data = requests.get(self.BASE_URL + '/{}/create'.format(elem.e_type), data=xml, auth=(NAME, PASS))
175175
if data.ok:
176176
return int(data.text)
177177
elif data.status_code == HTTPStatus.BAD_REQUEST:
@@ -185,7 +185,7 @@ def get_element(self, etype: str, eid: int) -> Element:
185185
"""
186186
GET /api/0.6/[node|way|relation]/#id
187187
"""
188-
data = requests.get(self.base_url + '/{}/{}'.format(etype, eid), auth=(NAME, PASS))
188+
data = requests.get(self.BASE_URL + '/{}/{}'.format(etype, eid), auth=(NAME, PASS))
189189
if data.ok:
190190
tree = ElemTree.fromstring(data.text)
191191
logger.debug(data.text)
@@ -259,7 +259,7 @@ def edit_element(self, elem: Element, cid: int) -> int:
259259
:returns: New version Number
260260
"""
261261
elem.changeset = cid
262-
data = requests.put(self.base_url + '/{}/{}'.format(elem.e_type, elem.id),
262+
data = requests.put(self.BASE_URL + '/{}/{}'.format(elem.e_type, elem.id),
263263
data=self.__serial_elem(elem), auth=(NAME, PASS))
264264
if data.ok:
265265
return int(data.text)
@@ -280,7 +280,7 @@ def delete_element(self, elem: Element, cid: int) -> int:
280280
:returns: new version number
281281
"""
282282
elem.changeset = cid
283-
data = requests.delete(self.base_url + '/{}/{}'.format(elem.e_type, elem.id),
283+
data = requests.delete(self.BASE_URL + '/{}/{}'.format(elem.e_type, elem.id),
284284
data=self.__serial_elem(elem), auth=(NAME, PASS))
285285
if data.ok:
286286
return int(data.text)
@@ -300,7 +300,7 @@ def get_elements(self, etype: str, lst_eid: list) -> list:
300300
"""
301301
GET /api/0.6/[nodes|ways|relations]?#parameters
302302
"""
303-
data = requests.get(self.base_url + '/{}s?{}s={}'.format(etype, etype, ','.join(map(str, lst_eid))),
303+
data = requests.get(self.BASE_URL + '/{}s?{}s={}'.format(etype, etype, ','.join(map(str, lst_eid))),
304304
auth=(NAME, PASS))
305305
if data.ok:
306306
tree = ElemTree.fromstring(data.text)
@@ -322,7 +322,7 @@ def get_relation_of_element(self, etype: str, eid: int) -> list:
322322
"""
323323
GET /api/0.6/[node|way|relation]/#id/relations
324324
"""
325-
data = requests.get(self.base_url + '/{}/{}/relations'.format(etype, eid), auth=(NAME, PASS))
325+
data = requests.get(self.BASE_URL + '/{}/{}/relations'.format(etype, eid), auth=(NAME, PASS))
326326
if data.ok:
327327
tree = ElemTree.fromstring(data.text)
328328
logger.debug(data.text)
@@ -338,7 +338,7 @@ def get_ways_of_node(self, eid: int) -> list:
338338
"""
339339
GET /api/0.6/node/#id/ways
340340
"""
341-
data = requests.get(self.base_url + '/node/{}/ways'.format(eid), auth=(NAME, PASS))
341+
data = requests.get(self.BASE_URL + '/node/{}/ways'.format(eid), auth=(NAME, PASS))
342342
if data.ok:
343343
tree = ElemTree.fromstring(data.text)
344344
logger.debug(data.text)
@@ -356,7 +356,7 @@ def get_element_bbox(self, bbox: tuple) -> list:
356356
GET /api/0.6/map?bbox=left,bottom,right,top
357357
358358
"""
359-
data = requests.get(self.base_url + '/map?bbox={}'.format(','.join(map(str, bbox))), auth=(NAME, PASS))
359+
data = requests.get(self.BASE_URL + '/map?bbox={}'.format(','.join(map(str, bbox))), auth=(NAME, PASS))
360360
if data.ok:
361361
tree = ElemTree.fromstring(data.text)
362362
logger.debug(data.text)
@@ -375,7 +375,7 @@ def get_bbox_gpx(self, bbox: tuple, page: int = 0) -> list:
375375
returns 5000GPS trackpoints max, increase page for any additional 5000
376376
GET /api/0.6/trackpoints?bbox=left,bottom,right,top&page=pageNumber
377377
"""
378-
data = requests.get(self.base_url + '/trackpoints?bbox={}' + ','.join(map(str, bbox)), auth=(NAME, PASS))
378+
data = requests.get(self.BASE_URL + '/trackpoints?bbox={}' + ','.join(map(str, bbox)), auth=(NAME, PASS))
379379
if data.ok:
380380
return self.__parse_gpx_info(data.text)
381381
raise Exception(data.text)
@@ -388,7 +388,7 @@ def upload_gpx(self, trace: str, name: str, description: str, tags: set,
388388
"""
389389
content = {'description': description, 'tags': ','.join(tags), 'visibility': visibility}
390390
req_file = {'file': (name, trace)}
391-
data = requests.post(self.base_url + '/gpx/create', auth=(NAME, PASS), files=req_file, data=content)
391+
data = requests.post(self.BASE_URL + '/gpx/create', auth=(NAME, PASS), files=req_file, data=content)
392392
if data.ok:
393393
return int(data.text)
394394
raise Exception(data.text)
@@ -401,7 +401,7 @@ def update_gpx(self, tid: int, trace: str, description: str, tags: list,
401401
"""
402402
content = {'description': description, 'tags': ','.join(tags), 'public': public, 'visibility': visibility}
403403
req_file = {'file': ('test-trace.gpx', trace)}
404-
data = requests.put(self.base_url + '/gpx/' + str(tid), auth=(NAME, PASS), files=req_file, data=content)
404+
data = requests.put(self.BASE_URL + '/gpx/' + str(tid), auth=(NAME, PASS), files=req_file, data=content)
405405
if data.ok:
406406
logger.debug('updated')
407407
else:
@@ -412,7 +412,7 @@ def delete_gpx(self, tid: int):
412412
"""
413413
DELETE /api/0.6/gpx/#id
414414
"""
415-
data = requests.delete(self.base_url + '/gpx/' + str(tid), auth=(NAME, PASS))
415+
data = requests.delete(self.BASE_URL + '/gpx/' + str(tid), auth=(NAME, PASS))
416416
if data.ok:
417417
logger.debug('deleted')
418418
else:
@@ -423,7 +423,7 @@ def get_gpx(self, tid: int) -> str:
423423
"""
424424
GET /api/0.6/gpx/#id/data
425425
"""
426-
data = requests.get(self.base_url + '/gpx/{}/data'.format(tid), auth=(NAME, PASS))
426+
data = requests.get(self.BASE_URL + '/gpx/{}/data'.format(tid), auth=(NAME, PASS))
427427
if data.ok:
428428
return data.text
429429
raise Exception(data.text)
@@ -432,7 +432,7 @@ def get_own_gpx(self) -> list:
432432
"""
433433
GET /api/0.6/user/gpx_files
434434
"""
435-
data = requests.get(self.base_url + '/user/gpx_files', auth=(NAME, PASS))
435+
data = requests.get(self.BASE_URL + '/user/gpx_files', auth=(NAME, PASS))
436436
if data.ok:
437437
return self.__parse_gpx_info(data.text)
438438
raise Exception(data.text)
@@ -456,7 +456,7 @@ def get_user(self, uid: int) -> dict:
456456
:param uid: user id
457457
:returns: dictionary with user detail
458458
"""
459-
data = requests.get(self.base_url + '/user/' + str(uid), auth=(NAME, PASS))
459+
data = requests.get(self.BASE_URL + '/user/' + str(uid), auth=(NAME, PASS))
460460
if data.ok:
461461
return self.__parse_user(data.text)[0]
462462
raise Exception(data.text)
@@ -468,7 +468,7 @@ def get_users(self, uids: list) -> list:
468468
:param uids: uid in a list
469469
:returns: list of dictionary with user detail
470470
"""
471-
data = requests.get(self.base_url + '/users?users=' + ','.join(map(str, uids)), auth=(NAME, PASS))
471+
data = requests.get(self.BASE_URL + '/users?users=' + ','.join(map(str, uids)), auth=(NAME, PASS))
472472
if data.ok:
473473
logger.debug(data.text)
474474
return self.__parse_user(data.text)
@@ -524,7 +524,7 @@ def get_notes_bbox(self, bbox: tuple, limit: int = 100, closed: int = 7) -> list
524524
"""
525525
GET /api/0.6/notes?bbox=left,bottom,right,top
526526
"""
527-
data = requests.get(self.base_url + '/notes?bbox=' + ','.join(map(str, bbox)), auth=(NAME, PASS))
527+
data = requests.get(self.BASE_URL + '/notes?bbox=' + ','.join(map(str, bbox)), auth=(NAME, PASS))
528528
logger.debug(data.text)
529529
if data.ok:
530530
tree = ElemTree.fromstring(data.text)
@@ -537,7 +537,7 @@ def get_note(self, nid: int) -> Note:
537537
"""
538538
GET /api/0.6/notes/#id
539539
"""
540-
data = requests.get(self.base_url + '/notes/{}'.format(str(nid)), auth=(NAME, PASS))
540+
data = requests.get(self.BASE_URL + '/notes/{}'.format(str(nid)), auth=(NAME, PASS))
541541
logger.debug(data.text)
542542
if data.ok:
543543
tree = ElemTree.fromstring(data.text)
@@ -550,7 +550,7 @@ def create_note(self, text: str, lat: float, lon: float) -> Note:
550550
"""
551551
POST /api/0.6/notes?lat=<lat>&lon=<lon>&text=<ANote>
552552
"""
553-
data = requests.post(self.base_url + '/notes', params={'lat': lat, 'lon': lon, 'text': text}, auth=(NAME, PASS))
553+
data = requests.post(self.BASE_URL + '/notes', params={'lat': lat, 'lon': lon, 'text': text}, auth=(NAME, PASS))
554554
logger.debug(data.text)
555555
if data.ok:
556556
tree = ElemTree.fromstring(data.text)
@@ -563,7 +563,7 @@ def comment_note(self, nid: int, text: str) -> Note:
563563
"""
564564
POST /api/0.6/notes/#id/comment?text=<ANoteComment>
565565
"""
566-
data = requests.post(self.base_url + '/notes/{}/comment'.format(str(nid)),
566+
data = requests.post(self.BASE_URL + '/notes/{}/comment'.format(str(nid)),
567567
params={'text': text}, auth=(NAME, PASS))
568568
logger.debug(data.text)
569569
if data.ok:
@@ -581,7 +581,7 @@ def close_note(self, nid: int, text: str) -> Note:
581581
"""
582582
POST /api/0.6/notes/#id/close?text=<Comment>
583583
"""
584-
data = requests.post(self.base_url + '/notes/{}/close'.format(str(nid)),
584+
data = requests.post(self.BASE_URL + '/notes/{}/close'.format(str(nid)),
585585
params={'text': text}, auth=(NAME, PASS))
586586
logger.debug(data.text)
587587
if data.ok:
@@ -599,7 +599,7 @@ def reopen_note(self, nid: int, text: str):
599599
"""
600600
POST /api/0.6/notes/#id/reopen?text=<ANoteComment>
601601
"""
602-
data = requests.post(self.base_url + '/notes/{}/close'.format(str(nid)),
602+
data = requests.post(self.BASE_URL + '/notes/{}/close'.format(str(nid)),
603603
params={'text': text}, auth=(NAME, PASS))
604604
logger.debug(data.text)
605605
if data.ok:

0 commit comments

Comments
 (0)