|
@@ -229,6 +229,7 @@ def group_points(points, distance_threshold,db=get_db(),iszjcj='',pac=''):
|
|
|
grid['%s-%s'%grid_key]['longitude'] = float(point.longitude)
|
|
|
|
|
|
groups = list(grid.values())
|
|
|
+
|
|
|
if iszjcj!='':
|
|
|
geom = get_geom(db, iszjcj, pac)
|
|
|
for group in groups:
|
|
@@ -237,7 +238,7 @@ def group_points(points, distance_threshold,db=get_db(),iszjcj='',pac=''):
|
|
|
if wkb.loads(wkb_bytes).contains(Point(lon, lat)):
|
|
|
break
|
|
|
else:
|
|
|
- del group
|
|
|
+ groups.remove(group)
|
|
|
return groups
|
|
|
|
|
|
def get_videos(db:Session,dict_value,latitude_min,latitude_max,longitude_min,longitude_max,iszjcj=''):
|