jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Fix some double reporting on faces

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2020-01-20 16:48:15 -08:00
parent 578576a4fd
commit 2e5955acd9
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/identities.html
View File

@ -20,24 +20,22 @@ function createFace(faceId, photoId, selectable) {
div.setAttribute("photo-id", photoId); div.setAttribute("photo-id", photoId);
div.setAttribute("face-id", faceId); div.setAttribute("face-id", faceId);
div.style.backgroundImage = "url(face-data/" + (faceId % 100) + "/" + faceId + "-original.png)"; div.style.backgroundImage = "url(face-data/" + (faceId % 100) + "/" + faceId + "-original.png)";
if (!selectable) {
div.addEventListener("click", (event) => { div.addEventListener("click", (event) => {
if (!selectable || event.ctrlKey) {
let photoId = parseInt(event.currentTarget.getAttribute("photo-id")); let photoId = parseInt(event.currentTarget.getAttribute("photo-id"));
if (photoId) { if (photoId) {
window.open("face-explorer.html?" + photoId, "photo-" + photoId); window.open("face-explorer.html?" + photoId, "photo-" + photoId);
} else { } else {
alert("No photo id mapped to face."); alert("No photo id mapped to face.");
} }
});
} else { } else {
div.addEventListener("click", (event) => {
if (event.currentTarget.hasAttribute("disabled")) { if (event.currentTarget.hasAttribute("disabled")) {
event.currentTarget.removeAttribute("disabled"); event.currentTarget.removeAttribute("disabled");
} else { } else {
event.currentTarget.setAttribute("disabled", ""); event.currentTarget.setAttribute("disabled", "");
} }
});
} }
});
return div; return div;
} }

2
server/routes/faces.js
View File

@ -111,7 +111,7 @@ router.get("/:id?", (req, res) => {
}).then((relatedFaces) => { }).then((relatedFaces) => {
faces.forEach((face) => { faces.forEach((face) => {
face.relatedFaces = relatedFaces.filter((related) => { face.relatedFaces = relatedFaces.filter((related) => {
return (related.photoId != id && (related.face1Id == face.id || related.face2Id == face.id)); return (related.photoId != faces[0].photoId && (related.face1Id == face.id || related.face2Id == face.id));
}).map((related) => { }).map((related) => {
return { return {
distance: related.distance, distance: related.distance,