|
|
|
@@ -232,13 +232,14 @@ def tgu_group_user_locations_api(request):
|
|
232
|
232
|
|
|
233
|
233
|
# [['x', 0.33, (2.68220901489e-06, 1.26736058093e-06)], []]
|
|
234
|
234
|
locations = r.georadius(TOUR_GUIDE_GROUP_GEO_INFO % group_id, gather_info.get('gather_lon', 0), gather_info.get('gather_lat', 0), '+inf', unit='m', withdist=True, withcoord=True, sort='ASC')
|
|
235
|
|
- # [{'location_info': ['x', 0.33, (2.68220901489e-06, 1.26736058093e-06)], 'user_info': {}}, {}]
|
|
|
235
|
+ # [{'lon': 2.68220901489e-06, 'lat': 26736058093e-06, 'dist': 0.33, etc...}, {}]
|
|
236
|
236
|
# 获取旅行团用户 KV 信息
|
|
237
|
237
|
group_users_kv_info = get_group_users_kv_info(group_id)
|
|
238
|
|
- locations = [{
|
|
239
|
|
- 'location_info': loc,
|
|
240
|
|
- 'user_info': group_users_kv_info[loc[0]],
|
|
241
|
|
- } for loc in locations]
|
|
|
238
|
+ locations = [dict(group_users_kv_info[loc[0]], **{
|
|
|
239
|
+ 'lon': loc[2][0],
|
|
|
240
|
+ 'lat': loc[2][1],
|
|
|
241
|
+ 'dist': loc[1]
|
|
|
242
|
+ }) for loc in locations]
|
|
242
|
243
|
|
|
243
|
244
|
return response(200, 'Get Tour Guide Group All User Location Success', u'获取旅行团成员地理位置信息成功', {
|
|
244
|
245
|
'group_id': group_id,
|
Brightcells
10 years ago