Skip to content

implements a size filter for Largo #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlangenk wants to merge 1 commit into
base: master
Choose a base branch
from
+742 −6
Open

implements a size filter for Largo #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 77 additions & 1 deletion app/Http/Controllers/Api/Projects/FilterImageAnnotationsByLabelController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class FilterImageAnnotationsByLabelController extends Controller
* @apiParam (Optional arguments) {Number} take Number of image annotations to return. If this parameter is present, the most recent annotations will be returned first. Default is unlimited.
* @apiParam (Optional arguments) {Array} shape_id Array of shape ids to use to filter images
* @apiParam (Optional arguments) {Array} user_id Array of user ids to use to filter values
* @apiParam (Optional arguments) {Array} annotation_size Array of annotation size category ids to use to filter values
* @apiParam (Optional arguments) {Boolean} union Whether the filters should be considered inclusive (OR) or exclusive (AND)
* @apiPermission projectMember
* @apiDescription Returns a map of image annotation IDs to their image UUIDs.
Expand All @@ -43,13 +44,16 @@ public function index(Request $request, $pid, $lid)
'shape_id.*' => 'integer',
'user_id' => 'array',
'user_id.*' => 'integer',
'annotation_size' => 'array',
'annotation_size.*' => 'integer',
'union' => 'boolean',
]);

$take = $request->input('take');
$filters = [
'shape_id' => $request->input('shape_id'),
'user_id' => $request->input('user_id'),
'annotation_size' => $request->input('annotation_size'),
];
$filters = array_filter($filters);
$union = $request->input('union', false);
Expand All @@ -63,10 +67,82 @@ public function index(Request $request, $pid, $lid)
})
->when(!is_null($take), fn ($query) => $query->take($take))
->where('image_annotation_labels.label_id', $lid)
->when(!empty($filters), fn ($query) => $this->compileFilterConditions($query, $union, $filters))
->when(!empty($filters), function ($query) use ($union, $filters) {
// Handle annotation size filtering separately as it requires calculation
if (isset($filters['annotation_size'])) {
$sizeValues = $filters['annotation_size'];

if ($union) {
$query->where(function ($q) use ($sizeValues) {
foreach ($sizeValues as $value) {
if ($value < 0) {
$q->orWhereRaw($this->getAnnotationSizeQuery(abs($value), true));
} else {
$q->orWhereRaw($this->getAnnotationSizeQuery($value, false));
}
}
});
} else {
foreach ($sizeValues as $value) {
if ($value < 0) {
$query->whereRaw($this->getAnnotationSizeQuery(abs($value), true));
} else {
$query->whereRaw($this->getAnnotationSizeQuery($value, false));
}
}
}

// Remove annotation_size from filters array to avoid double processing
unset($filters['annotation_size']);
}

// Process remaining filters normally
if (!empty($filters)) {
$this->compileFilterConditions($query, $union, $filters);
}
})
->select('images.uuid', 'image_annotations.id')
->distinct()
->orderBy('image_annotations.id', 'desc')
->pluck('images.uuid', 'image_annotations.id');
}

/**
* Get the SQL query for filtering annotations by size category.
*
* @param int $categoryId The size category ID
* @param bool $negate Whether to negate the condition
* @return string The SQL condition
*/
private function getAnnotationSizeQuery(int $categoryId, bool $negate = false): string
{
$operator = $negate ? '!=' : '=';

return "CASE
WHEN image_annotations.shape_id = " . \Biigle\Shape::circleId() . " THEN
CASE
WHEN POW((image_annotations.points->>2)::float, 2) * PI() = 0 THEN 0
WHEN POW((image_annotations.points->>2)::float, 2) * PI() < 100 THEN 1
WHEN POW((image_annotations.points->>2)::float, 2) * PI() < 1000 THEN 2
WHEN POW((image_annotations.points->>2)::float, 2) * PI() < 10000 THEN 3
WHEN POW((image_annotations.points->>2)::float, 2) * PI() < 100000 THEN 4
ELSE 5
END
WHEN image_annotations.shape_id = " . \Biigle\Shape::rectangleId() . " THEN
CASE
WHEN SQRT(POW((image_annotations.points->>0)::float - (image_annotations.points->>2)::float, 2) + POW((image_annotations.points->>1)::float - (image_annotations.points->>3)::float, 2)) * SQRT(POW((image_annotations.points->>2)::float - (image_annotations.points->>4)::float, 2) + POW((image_annotations.points->>3)::float - (image_annotations.points->>5)::float, 2)) = 0 THEN 0
WHEN SQRT(POW((image_annotations.points->>0)::float - (image_annotations.points->>2)::float, 2) + POW((image_annotations.points->>1)::float - (image_annotations.points->>3)::float, 2)) * SQRT(POW((image_annotations.points->>2)::float - (image_annotations.points->>4)::float, 2) + POW((image_annotations.points->>3)::float - (image_annotations.points->>5)::float, 2)) < 100 THEN 1
WHEN SQRT(POW((image_annotations.points->>0)::float - (image_annotations.points->>2)::float, 2) + POW((image_annotations.points->>1)::float - (image_annotations.points->>3)::float, 2)) * SQRT(POW((image_annotations.points->>2)::float - (image_annotations.points->>4)::float, 2) + POW((image_annotations.points->>3)::float - (image_annotations.points->>5)::float, 2)) < 1000 THEN 2
WHEN SQRT(POW((image_annotations.points->>0)::float - (image_annotations.points->>2)::float, 2) + POW((image_annotations.points->>1)::float - (image_annotations.points->>3)::float, 2)) * SQRT(POW((image_annotations.points->>2)::float - (image_annotations.points->>4)::float, 2) + POW((image_annotations.points->>3)::float - (image_annotations.points->>5)::float, 2)) < 10000 THEN 3
WHEN SQRT(POW((image_annotations.points->>0)::float - (image_annotations.points->>2)::float, 2) + POW((image_annotations.points->>1)::float - (image_annotations.points->>3)::float, 2)) * SQRT(POW((image_annotations.points->>2)::float - (image_annotations.points->>4)::float, 2) + POW((image_annotations.points->>3)::float - (image_annotations.points->>5)::float, 2)) < 100000 THEN 4
ELSE 5
END
WHEN image_annotations.shape_id IN (" . \Biigle\Shape::pointId() . ", " . \Biigle\Shape::lineId() . ") THEN 0
ELSE
CASE
WHEN json_array_length(image_annotations.points) < 6 THEN 0
ELSE 2
END
END {$operator} {$categoryId}";
}
}
78 changes: 77 additions & 1 deletion app/Http/Controllers/Api/Projects/FilterVideoAnnotationsByLabelController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class FilterVideoAnnotationsByLabelController extends Controller
* @apiParam (Optional arguments) {Number} take Number of video annotations to return. If this parameter is present, the most recent annotations will be returned first. Default is unlimited.
* @apiParam (Optional arguments) {Array} shape_id Array of shape ids to use to filter images
* @apiParam (Optional arguments) {Array} user_id Array of user ids to use to filter values
* @apiParam (Optional arguments) {Array} annotation_size Array of annotation size category ids to use to filter values
* @apiParam (Optional arguments) {Boolean} union Whether the filters should be considered inclusive (OR) or exclusive (AND)
* @apiPermission projectMember
* @apiDescription Returns a map of video annotation IDs to their video UUIDs.
Expand All @@ -43,13 +44,16 @@ public function index(Request $request, $pid, $lid)
'shape_id.*' => 'integer',
'user_id' => 'array',
'user_id.*' => 'integer',
'annotation_size' => 'array',
'annotation_size.*' => 'integer',
'union' => 'boolean',
]);

$take = $request->input('take');
$filters = [
'shape_id' => $request->input('shape_id'),
'user_id' => $request->input('user_id'),
'annotation_size' => $request->input('annotation_size'),
];
$filters = array_filter($filters);
$union = $request->input('union', false);
Expand All @@ -62,11 +66,83 @@ public function index(Request $request, $pid, $lid)
->where('project_id', $pid);
})
->where('video_annotation_labels.label_id', $lid)
->when(!empty($filters), fn ($query) => $this->compileFilterConditions($query, $union, $filters))
->when(!empty($filters), function ($query) use ($union, $filters) {
// Handle annotation size filtering separately as it requires calculation
if (isset($filters['annotation_size'])) {
$sizeValues = $filters['annotation_size'];

if ($union) {
$query->where(function ($q) use ($sizeValues) {
foreach ($sizeValues as $value) {
if ($value < 0) {
$q->orWhereRaw($this->getAnnotationSizeQuery(abs($value), true));
} else {
$q->orWhereRaw($this->getAnnotationSizeQuery($value, false));
}
}
});
} else {
foreach ($sizeValues as $value) {
if ($value < 0) {
$query->whereRaw($this->getAnnotationSizeQuery(abs($value), true));
} else {
$query->whereRaw($this->getAnnotationSizeQuery($value, false));
}
}
}

// Remove annotation_size from filters array to avoid double processing
unset($filters['annotation_size']);
}

// Process remaining filters normally
if (!empty($filters)) {
$this->compileFilterConditions($query, $union, $filters);
}
})
->when(!is_null($take), fn ($query) => $query->take($take))
->select('videos.uuid', 'video_annotations.id')
->distinct()
->orderBy('video_annotations.id', 'desc')
->pluck('videos.uuid', 'video_annotations.id');
}

/**
* Get the SQL query for filtering video annotations by size category.
*
* @param int $categoryId The size category ID
* @param bool $negate Whether to negate the condition
* @return string The SQL condition
*/
private function getAnnotationSizeQuery(int $categoryId, bool $negate = false): string
{
$operator = $negate ? '!=' : '=';

return "CASE
WHEN video_annotations.shape_id = " . \Biigle\Shape::circleId() . " THEN
CASE
WHEN POW((video_annotations.points->0->>2)::float, 2) * PI() = 0 THEN 0
WHEN POW((video_annotations.points->0->>2)::float, 2) * PI() < 100 THEN 1
WHEN POW((video_annotations.points->0->>2)::float, 2) * PI() < 1000 THEN 2
WHEN POW((video_annotations.points->0->>2)::float, 2) * PI() < 10000 THEN 3
WHEN POW((video_annotations.points->0->>2)::float, 2) * PI() < 100000 THEN 4
ELSE 5
END
WHEN video_annotations.shape_id = " . \Biigle\Shape::rectangleId() . " THEN
CASE
WHEN SQRT(POW((video_annotations.points->0->>0)::float - (video_annotations.points->0->>2)::float, 2) + POW((video_annotations.points->0->>1)::float - (video_annotations.points->0->>3)::float, 2)) * SQRT(POW((video_annotations.points->0->>2)::float - (video_annotations.points->0->>4)::float, 2) + POW((video_annotations.points->0->>3)::float - (video_annotations.points->0->>5)::float, 2)) = 0 THEN 0
WHEN SQRT(POW((video_annotations.points->0->>0)::float - (video_annotations.points->0->>2)::float, 2) + POW((video_annotations.points->0->>1)::float - (video_annotations.points->0->>3)::float, 2)) * SQRT(POW((video_annotations.points->0->>2)::float - (video_annotations.points->0->>4)::float, 2) + POW((video_annotations.points->0->>3)::float - (video_annotations.points->0->>5)::float, 2)) < 100 THEN 1
WHEN SQRT(POW((video_annotations.points->0->>0)::float - (video_annotations.points->0->>2)::float, 2) + POW((video_annotations.points->0->>1)::float - (video_annotations.points->0->>3)::float, 2)) * SQRT(POW((video_annotations.points->0->>2)::float - (video_annotations.points->0->>4)::float, 2) + POW((video_annotations.points->0->>3)::float - (video_annotations.points->0->>5)::float, 2)) < 1000 THEN 2
WHEN SQRT(POW((video_annotations.points->0->>0)::float - (video_annotations.points->0->>2)::float, 2) + POW((video_annotations.points->0->>1)::float - (video_annotations.points->0->>3)::float, 2)) * SQRT(POW((video_annotations.points->0->>2)::float - (video_annotations.points->0->>4)::float, 2) + POW((video_annotations.points->0->>3)::float - (video_annotations.points->0->>5)::float, 2)) < 10000 THEN 3
WHEN SQRT(POW((video_annotations.points->0->>0)::float - (video_annotations.points->0->>2)::float, 2) + POW((video_annotations.points->0->>1)::float - (video_annotations.points->0->>3)::float, 2)) * SQRT(POW((video_annotations.points->0->>2)::float - (video_annotations.points->0->>4)::float, 2) + POW((video_annotations.points->0->>3)::float - (video_annotations.points->0->>5)::float, 2)) < 100000 THEN 4
ELSE 5
END
WHEN video_annotations.shape_id IN (" . \Biigle\Shape::pointId() . ", " . \Biigle\Shape::lineId() . ") THEN 0
ELSE
CASE
WHEN json_array_length(video_annotations.points->0) < 6 THEN 0
ELSE 2
END
END {$operator} {$categoryId}";
}
}
Loading
Loading