Merge branch 'traccar:master' into master

1 files changed, 7 insertions, 6 deletions

diff --git a/tools/test-map.py b/tools/test-map.py
index c289df605..664917eff 100755
--- a/tools/test-map.py
+++ b/tools/test-map.py
@@ -1,8 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import urllib
-import urllib2
-import httplib
+import urllib.request as urllib2
+import http.client as httplib
 import time
 import random
 import json
@@ -14,7 +14,7 @@ devices = 500
 
 def login():
     request = urllib2.Request(baseUrl + '/api/session')
-    response = urllib2.urlopen(request, urllib.urlencode(user))
+    response = urllib2.urlopen(request, urllib.parse.urlencode(user).encode())
     return response.headers.get('Set-Cookie')
 
 def add_device(cookie, unique_id):
@@ -23,13 +23,13 @@ def add_device(cookie, unique_id):
     request.add_header('Content-Type', 'application/json')
     device = { 'name' : unique_id, 'uniqueId' : unique_id }
     try:
-        response = urllib2.urlopen(request, json.dumps(device))
+        response = urllib2.urlopen(request, json.dumps(device).encode())
     except urllib2.HTTPError:
         pass
 
 def send_message(conn, device_id):
     params = (('id', device_id), ('lat', random.uniform(59, 61)), ('lon', random.uniform(29, 31)))
-    conn.request('GET', '?' + urllib.urlencode(params))
+    conn.request('GET', '?' + urllib.parse.urlencode(params))
     conn.getresponse().read()
 
 cookie = login()
@@ -38,6 +38,7 @@ conn = httplib.HTTPConnection(server)
 for i in range(devices):
     device_id = "{0:0>6}".format(i)
     add_device(cookie, device_id)
+    send_message(conn, device_id)
 
 while True:
     device_id = "{0:0>6}".format(random.randint(0, devices))