From b6a318daabbaf485e327cab77adba98413462516 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 14 Jul 2017 14:06:06 +0500 Subject: Use driverUniqueId instead of rfid in test script and OsmAnd protocol --- src/org/traccar/protocol/OsmAndProtocolDecoder.java | 2 +- tools/test-generator.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java index cb324aa86..6f8513c41 100644 --- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java +++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java @@ -128,7 +128,7 @@ public class OsmAndProtocolDecoder extends BaseProtocolDecoder { case "batt": position.set(Position.KEY_BATTERY_LEVEL, Double.parseDouble(value)); break; - case "rfid": + case "driverUniqueId": position.set(Position.KEY_DRIVER_UNIQUE_ID, value); break; default: diff --git a/tools/test-generator.py b/tools/test-generator.py index 47c1c478f..41ec5a2fa 100755 --- a/tools/test-generator.py +++ b/tools/test-generator.py @@ -35,7 +35,7 @@ for i in range(0, len(waypoints)): lon = lon1 + (lon2 - lon1) * j / count points.append((lat, lon)) -def send(conn, lat, lon, course, speed, alarm, ignition, accuracy, rpm, fuel, rfid): +def send(conn, lat, lon, course, speed, alarm, ignition, accuracy, rpm, fuel, driverUniqueId): params = (('id', id), ('timestamp', int(time.time())), ('lat', lat), ('lon', lon), ('bearing', course), ('speed', speed)) if alarm: params = params + (('alarm', 'sos'),) @@ -47,8 +47,8 @@ def send(conn, lat, lon, course, speed, alarm, ignition, accuracy, rpm, fuel, rf params = params + (('rpm', rpm),) if fuel: params = params + (('fuel', fuel),) - if rfid: - params = params + (('rfid', rfid),) + if driverUniqueId: + params = params + (('driverUniqueId', driverUniqueId),) conn.request('GET', '?' + urllib.urlencode(params)) conn.getresponse().read() @@ -74,7 +74,7 @@ while True: accuracy = 100 if (index % 10) == 0 else 0 rpm = random.randint(500, 4000) fuel = random.randint(0, 80) - rfid = driver_id if (index % len(points)) == 0 else False - send(conn, lat1, lon1, course(lat1, lon1, lat2, lon2), speed, alarm, ignition, accuracy, rpm, fuel, rfid) + driverUniqueId = driver_id if (index % len(points)) == 0 else False + send(conn, lat1, lon1, course(lat1, lon1, lat2, lon2), speed, alarm, ignition, accuracy, rpm, fuel, driverUniqueId) time.sleep(period) index += 1 -- cgit v1.2.3