|
|
@@ -192,6 +192,7 @@ def group_points(points, distance_threshold):
|
|
|
else:
|
|
|
grid['%s-%s' % grid_key]['id'] = point.id
|
|
|
grid['%s-%s'%grid_key]['dataType'] = point.dataType
|
|
|
+ grid['%s-%s'%grid_key]['infoType'] = point.infoType
|
|
|
grid['%s-%s'%grid_key]['name'] = point.name
|
|
|
grid['%s-%s'%grid_key]['type'] ='2'
|
|
|
grid['%s-%s'%grid_key]['latitude'] = float(point.latitude)
|
|
|
@@ -222,7 +223,8 @@ def get_videos(db:Session,dict_value,latitude_min,latitude_max,longitude_min,lon
|
|
|
TPVideoInfo.longitude,
|
|
|
TPVideoInfo.name,
|
|
|
TPVideoInfo.status,
|
|
|
- literal('video').label("dataType")
|
|
|
+ literal('video').label("dataType"),
|
|
|
+ literal('video').label("infoType")
|
|
|
)
|
|
|
.select_from(TPVideoInfo).where(
|
|
|
and_(
|
