admin/snakkimo-API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use object.selections polygon for chip highlight instead of bbox columns

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
admin
2026-05-25 21:38:04 +02:00
parent b8802baf36
commit d243e6e286
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/routes/feed.js
View File

@@ -98,13 +98,15 @@ router.get('/', requireJwt, async (req, res, next) => {
placeholderMap[w.id] = { de: w.de, en: w.en, sv: w.sv, type: 'word', bbox: null }; placeholderMap[w.id] = { de: w.de, en: w.en, sv: w.sv, type: 'word', bbox: null };
}); });
// Object lookup → get first linked word as label // Object lookup → get first linked word as label + selections polygon
const objUuids = uuidArr.filter(u => !placeholderMap[u]); const objUuids = uuidArr.filter(u => !placeholderMap[u]);
if (objUuids.length) { if (objUuids.length) {
const objRes = await query( const objRes = await query(
`SELECT ow.object_id AS id, w.titel_de AS de, w.titel_en AS en, w.titel_sv AS sv `SELECT ow.object_id AS id, w.titel_de AS de, w.titel_en AS en, w.titel_sv AS sv,
o.selections
FROM object_words ow FROM object_words ow
JOIN words w ON w.id = ow.word_id JOIN words w ON w.id = ow.word_id
JOIN objects o ON o.id = ow.object_id
WHERE ow.object_id = ANY($1)`, WHERE ow.object_id = ANY($1)`,
[objUuids] [objUuids]
); );
@@ -112,7 +114,11 @@ router.get('/', requireJwt, async (req, res, next) => {
const seen = new Set(); const seen = new Set();
objRes.rows.forEach(r => { objRes.rows.forEach(r => {
if (!seen.has(r.id)) { if (!seen.has(r.id)) {
placeholderMap[r.id] = { de: r.de, en: r.en, sv: r.sv, type: 'object', bbox: null }; placeholderMap[r.id] = {
de: r.de, en: r.en, sv: r.sv,
type: 'object',
selections: r.selections || [],
};
seen.add(r.id); seen.add(r.id);
} }
}); });
@@ -162,8 +168,7 @@ router.get('/', requireJwt, async (req, res, next) => {
if (resolvedObjectIds.size) { if (resolvedObjectIds.size) {
const picRes = await query( const picRes = await query(
`SELECT DISTINCT ON (op.object_id) `SELECT DISTINCT ON (op.object_id)
op.object_id, p.picture_link AS url, p.blurhash, op.object_id, p.picture_link AS url, p.blurhash
op.bbox_x, op.bbox_y, op.bbox_w, op.bbox_h
FROM object_pictures op FROM object_pictures op
JOIN pictures p ON p.id = op.picture_id JOIN pictures p ON p.id = op.picture_id
WHERE op.object_id = ANY($1) WHERE op.object_id = ANY($1)
@@ -172,12 +177,6 @@ router.get('/', requireJwt, async (req, res, next) => {
); );
picRes.rows.forEach(r => { picRes.rows.forEach(r => {
pictureMap[r.object_id] = { url: r.url, blurhash: r.blurhash }; pictureMap[r.object_id] = { url: r.url, blurhash: r.blurhash };
// Attach bbox to placeholder if all four values are present
if (placeholderMap[r.object_id] && r.bbox_x != null) {
placeholderMap[r.object_id].bbox = {
x: r.bbox_x, y: r.bbox_y, w: r.bbox_w, h: r.bbox_h,
};
}
}); });
} }