From bdb306e5e1459ee7960eb07c505cf3385745effb Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Tue, 28 Jan 2020 04:31:41 +0800
Subject: [PATCH] Fix bug in mqtt_rider script #299

---
 utils/mqtt_rider/rider_location_cache.py  |  16 ++++------------
 utils/mqtt_rider/rider_location_cache.pyc | Bin 2234 -> 1929 bytes
 utils/mqtt_rider/riderloc.py              |   5 ++++-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/utils/mqtt_rider/rider_location_cache.py b/utils/mqtt_rider/rider_location_cache.py
index b7f59977..b07d4acc 100644
--- a/utils/mqtt_rider/rider_location_cache.py
+++ b/utils/mqtt_rider/rider_location_cache.py
@@ -23,27 +23,19 @@ def on_connect(client, userdata, flags, rc):
     #print("Connected with result code "+str(rc))
     # client.subscribe("$SYS/#")
 
-def user_data_set(userdata):
-    conn = redis.StrictRedis(host='localhost', port=6379, db=0)
-    return conn
-
 def on_publish(client, userdata, mid):
     pass
 
 def on_message(client, userdata, message):
-    # TODO: persist redis connection
-    redis_conn = user_data_set(userdata)
-    #print("message topic=", message.topic[0:10])
+    redis_conn = userdata['redis']
 
     topic_split = message.topic.split('/')
     if topic_split[0] != 'rider':
         return;
     payload_split = message.payload.split(':')
 
-    #print repr(message)
-    rider_long = str(res['longitude'])
-    rider_lat = str(res['latitude'])
+    rider_long = str(payload_split[1])
+    rider_lat = str(payload_split[0])
 
     # set the location
-    redis_conn.geoadd('rider_active', rider_long, rider_lat, topic_split[1])
-
+    redis_conn.geoadd('loc_rider_active', rider_long, rider_lat, topic_split[1])
diff --git a/utils/mqtt_rider/rider_location_cache.pyc b/utils/mqtt_rider/rider_location_cache.pyc
index a0fd917a82bed349888ad782c4f6f6dfb8c8d0fe..e8968436ff784ec3bb1aca3ba18a64dba399a0d8 100644
GIT binary patch
delta 326
zcmXv|Jxjzu6r7j+NI1}2uQ_v3#4d$!VlN0{V{w943I@rhNEC!5SS2W2WhJt;jocrw
z6aRpft-rzEKj2%@WoP!ydoz!HTe}}7;(KLqwmm)1@plBj2aIO<m@E}xo<=VpN5YNO
z!|lZP113=JeGx-54jIiIQ%A6bxEJUGR6xZ#z=F_AbP`q|wi1^D^)4(h_b$HdQok;R
zmZJ(*Blao%uQ|A&J@g?ufr>YAq0upO?adP87pDG8vsN+Jg)JL*qLYo1Shj}g>N?Nr
z(iU}gk+<bdkt+ABcig9bPd0hncn^Ys7?B}KBVhs~Q{!I4DGl9Mc&t}>e!AuMqm0(w
IQ#2v*14alqNB{r;

delta 547
zcmXw0&ubGw6n?WayPKG#-Gm?}(H0AZ2o|9ykAf&Dm_u?XR4{CJmbz(3%I>764Uxu+
z7a`2advB$OUOjm7;Q!*$Kfr!(lP<h(->>=J`)0mv|Ezc9zuJTSqk~ToZ9a+rD_C~3
z>RfG==qu52Kw8kCTfY7MMlJ-34$OzW=EgmMAsPwp(hg}!T9I~1d$c4u7nJj9?(Z1|
z{5;K!DZ?30qi|eAoIanXCi(jaWK6G55+HTiH!dKJb&{FNQ@8_@CXwlLqNw+ote}pj
zlZoB+-ae@zGt1(1s6!JDv)Hte$aoBi9qX$V@P~T5xI_ZWW5cDOxuo1-AtR_*XB6eo
z;!q2!&LpLWq%ohnWYMLHb1qNEmJr=y9`8Q(*0E1H+C9>6Jj#I}EumIZB$%+v3VQaP
z+j+UUnaOElW;!+{6vm-h2UP@Vq9H4cOmYz?{20Z}_M7&L``qW(OXJL5yMH=-Q&|8Y
vrz#sF5K1&;AOhK~+wa~BQMbRm_mw8<{f7+C?0@mWe)JonZ6|(Ps<ONTC}U+u

diff --git a/utils/mqtt_rider/riderloc.py b/utils/mqtt_rider/riderloc.py
index e2503f8c..2b810cca 100644
--- a/utils/mqtt_rider/riderloc.py
+++ b/utils/mqtt_rider/riderloc.py
@@ -1,10 +1,13 @@
 import paho.mqtt.client as mqtt
 import rider_location_cache as rlc
 import ssl
+import redis
 import logging
 
+redis_client = redis.StrictRedis(host='localhost', port=6379, db=0)
+userdata = {'redis': redis_client}
 
-client = mqtt.Client()
+client = mqtt.Client("", True, userdata)
 client.on_connect = rlc.on_connect
 # client.on_publish = on_publish
 client.on_message = rlc.on_message