From 4658bf42a6c92d7305f4cca190442b426e620f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Constantino=E2=80=93Bodin?= Date: Sun, 10 Aug 2025 18:05:44 +0200 Subject: [PATCH 1/5] Adding support for panorama cameras. --- .../surveillance_camera/surveillance_camera.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index 6f52f9c6b..0295d4524 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -340,7 +340,7 @@ ] }, { - "id": "Camera type: fixed; panning; dome", + "id": "Camera type: fixed; panning; dome; panorama", "question": { "en": "What kind of camera is this?", "ca": "Quin tipus de càmera és aquesta?", @@ -388,7 +388,7 @@ }, "icon": "./assets/themes/surveillance/dome.svg" }, - { + { "if": "camera:type=panning", "then": { "en": "A panning camera", @@ -403,6 +403,13 @@ "ru": "Панорамная камера" } }, + { + "if": "camera:type=panorama", + "then": { + "en": "A camera with a wide field of view", + "fr": "Une caméra 360°" + } + }, { "if": "camera:type=doorbell", "icon": { @@ -958,4 +965,4 @@ "enableRelocation": false }, "enableMorePrivacy": true -} \ No newline at end of file +} From 3dc528f0daeb0f75c098ea2d39ef722efc55231e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Constantino=E2=80=93Bodin?= Date: Sun, 10 Aug 2025 18:11:26 +0200 Subject: [PATCH 2/5] Adding an image for panorama cameras. --- .../surveillance_camera.json | 4 + assets/themes/surveillance/panorama.license | 2 + assets/themes/surveillance/panorama.svg | 105 ++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 assets/themes/surveillance/panorama.license create mode 100644 assets/themes/surveillance/panorama.svg diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index 0295d4524..ac7500215 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -86,6 +86,10 @@ "if": "camera:type=doorbell", "then": "./assets/layers/surveillance_camera/doorbell.svg" }, + { + "if": "camera:type=panorama", + "then": "./assets/themes/surveillance/panorama.svg" + }, { "if": "_direction:leftright=right", "then": "./assets/themes/surveillance/cam_right.svg" diff --git a/assets/themes/surveillance/panorama.license b/assets/themes/surveillance/panorama.license new file mode 100644 index 000000000..f725fff05 --- /dev/null +++ b/assets/themes/surveillance/panorama.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Martin Bodin +SPDX-License-Identifier: CC0-1.0 diff --git a/assets/themes/surveillance/panorama.svg b/assets/themes/surveillance/panorama.svg new file mode 100644 index 000000000..0a21207b0 --- /dev/null +++ b/assets/themes/surveillance/panorama.svg @@ -0,0 +1,105 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + From ef16f5ccef821ee80ef18fb49f65ab2951f5c6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Constantino=E2=80=93Bodin?= Date: Sun, 10 Aug 2025 18:17:00 +0200 Subject: [PATCH 3/5] Translation suggestions for panorama cameras. --- assets/layers/surveillance_camera/surveillance_camera.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index ac7500215..03008ae9b 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -410,7 +410,9 @@ { "if": "camera:type=panorama", "then": { - "en": "A camera with a wide field of view", + "en": "A 360° camera", + "de": "Eine 360°-Kamera", + "es": "Una cámara de 360°", "fr": "Une caméra 360°" } }, @@ -537,7 +539,7 @@ "da": "Hvilken form for overvågning er dette kamera?", "de": "Was überwacht diese Kamera?", "es": "¿Qué tipo de vigilancia es esta cámara?", - "fr": "De quel genre de surveillance cette caméra est-elle ?", + "fr": "De quel genre de surveillance cette caméra est-elle ?", "it": "Che tipo di sorveglianza è questa telecamera?", "nl": "Wat soort bewaking wordt hier uitgevoerd?", "sl": "Kaj nadzoruje ta kamera?" From ba4d220b63fe707ad9e91f4b1c4980e2c930d443 Mon Sep 17 00:00:00 2001 From: Martin Bodin Date: Wed, 27 Aug 2025 11:34:50 +0200 Subject: [PATCH 4/5] Including feedbacks from @pietervdvn. --- assets/layers/surveillance_camera/surveillance_camera.json | 2 +- .../surveillance/{panorama.license => panorama.svg.license} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename assets/themes/surveillance/{panorama.license => panorama.svg.license} (100%) diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index 03008ae9b..1843c3977 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -344,7 +344,7 @@ ] }, { - "id": "Camera type: fixed; panning; dome; panorama", + "id": "Camera type: fixed; panning; dome", "question": { "en": "What kind of camera is this?", "ca": "Quin tipus de càmera és aquesta?", diff --git a/assets/themes/surveillance/panorama.license b/assets/themes/surveillance/panorama.svg.license similarity index 100% rename from assets/themes/surveillance/panorama.license rename to assets/themes/surveillance/panorama.svg.license From e9263eb342e7862c3de2a8f356dd8e29fc6ab179 Mon Sep 17 00:00:00 2001 From: Martin Bodin Date: Wed, 27 Aug 2025 11:36:33 +0200 Subject: [PATCH 5/5] I think that I forgot to add this information in the license file. --- assets/themes/surveillance/license_info.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/themes/surveillance/license_info.json b/assets/themes/surveillance/license_info.json index 53a9f3c25..393433ece 100644 --- a/assets/themes/surveillance/license_info.json +++ b/assets/themes/surveillance/license_info.json @@ -23,6 +23,14 @@ ], "sources": [] }, + { + "path": "panorama.svg", + "license": "CC0-1.0", + "authors": [ + "Martin Bodin" + ], + "sources": [] + }, { "path": "logo.svg", "license": "CC0-1.0", @@ -31,4 +39,4 @@ ], "sources": [] } -] \ No newline at end of file +]