Merge develop

This commit is contained in:
Pieter Vander Vennet 2023-10-01 13:13:07 +02:00
commit 55c6442cac
388 changed files with 16178 additions and 17860 deletions

View file

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="500"
height="500"
viewBox="0 0 132.29166 132.29167"
version="1.1"
id="svg5"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
sodipodi:docname="ALPR.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#b1a245"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="true"
inkscape:document-units="mm"
showgrid="false"
units="px"
width="500px"
inkscape:object-paths="true"
inkscape:snap-smooth-nodes="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-global="false"
inkscape:zoom="1.4442101"
inkscape:cx="179.33679"
inkscape:cy="233.69176"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs2" />
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<path
id="circle5562"
style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.15875,0.15875;stroke-dashoffset:0;stroke-opacity:1"
d="M 29.428339,95.048375 A 28.373579,28.373579 0 0 1 1.0546228,66.674664 28.373579,28.373579 0 0 1 29.428339,38.302588 a 28.373579,28.373579 0 0 1 0.573442,0.02143 v -0.01156 h 72.311059 a 28.373579,28.373579 0 0 1 0.26529,-0.0099 28.373579,28.373579 0 0 1 0.2653,0.0099 h 2.27563 v 0.116999 a 28.373579,28.373579 0 0 1 25.83279,28.245193 28.373579,28.373579 0 0 1 -25.83279,28.258373 v 0.08733 h -1.29518 a 28.373579,28.373579 0 0 1 -1.24575,0.02802 28.373579,28.373579 0 0 1 -0.75141,-0.02802 H 30.675739 a 28.373579,28.373579 0 0 1 -1.2474,0.02802 z" />
<circle
style="fill:none;stroke:#ffffff;stroke-width:5.51088;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.551088, 0.551088;stroke-dashoffset:0;stroke-opacity:1"
id="circle4462"
cx="103.66268"
cy="-66.675468"
r="17.653652"
transform="scale(1,-1)" />
<circle
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:5.51112;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.551112, 0.551112;stroke-dashoffset:0;stroke-opacity:1"
id="circle4544"
cx="28.500475"
cy="-66.675468"
r="17.653652"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="path4884"
cx="52.892296"
cy="-48.590332"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle4966"
cx="65.282982"
cy="-48.590332"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle4968"
cx="77.673676"
cy="-48.590332"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle5142"
cx="52.892296"
cy="-48.590332"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle5144"
cx="65.282982"
cy="-48.590332"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle5146"
cx="77.673676"
cy="-48.590332"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle5148"
cx="59.221966"
cy="-59.741222"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle5150"
cx="71.612656"
cy="-59.741222"
r="5.0460854"
transform="scale(1,-1)" />
<circle
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.89558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:0.689558, 0.689558;stroke-dashoffset:0;stroke-opacity:1"
id="circle5576"
cx="65.282982"
cy="70.004204"
r="5.0460854" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.8 KiB

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Pieter Vander Vennet
SPDX-License-Identifier: CC0-1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: synx508
SPDX-License-Identifier: CC-BY-NC 2.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: https://commons.wikimedia.org/wiki/User:Mbrickn
SPDX-License-Identifier: CC-BY 4.0

View file

@ -0,0 +1,30 @@
[
{
"path": "ALPR.svg",
"license": "CC0-1.0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "ALPR_Example.jpg",
"license": "CC-BY-NC 2.0",
"authors": [
"synx508"
],
"sources": [
"https://www.flickr.com/photos/synx508/5742253934/"
]
},
{
"path": "ALPR_Example2.jpg",
"license": "CC-BY 4.0",
"authors": [
"https://commons.wikimedia.org/wiki/User:Mbrickn"
],
"sources": [
"https://commons.wikimedia.org/wiki/File:ANPR_Camera_Front.jpg"
]
}
]

View file

@ -40,6 +40,36 @@
},
"tagRenderings": [
"images",
{
"id": "has_alpr",
"question": {
"en": "Can this camera automatically detect license plates?",
"ca": "Aquesta càmera pot detectar matrícules automàticament?"
},
"questionHint": {
"en": "An <b>ALPR</b> (Automatic License Plate Reader) typically has two lenses and an array of infrared LEDS in between.",
"ca": "Un <b>ALPR</b> (lector automàtic de matrícules, per les seves sigles en anglès) normalment té dues lents i una sèrie de LEDs infrarojos entremig."
},
"mappings": [
{
"if": "surveillance:type=camera",
"then": {
"en": "This is a camera without number plate recognition.",
"ca": "Es tracta d'una càmera sense reconeixement de matrícules."
}
},
{
"if": "surveillance:type=ALPR",
"then": {
"en": "This is an ALPR (Automatic License Plate Reader)",
"ca": "Açò és un ALPR (lector automàtic de matrícules, per les seves sigles en anglès)"
},
"icon": {
"path": "./assets/layers/surveillance_camera/ALPR.svg"
}
}
]
},
{
"question": {
"en": "What kind of camera is this?",
@ -53,11 +83,7 @@
},
"mappings": [
{
"if": {
"and": [
"camera:type=fixed"
]
},
"if": "camera:type=fixed",
"then": {
"en": "A fixed (non-moving) camera",
"nl": "Een vaste camera",
@ -66,14 +92,11 @@
"de": "Eine fest montierte (nicht bewegliche) Kamera",
"ca": "Una càmera fixa (no movible)",
"es": "Cámara fija (no móvil)"
}
},
"icon": "./assets/themes/surveillance/cam_right.svg"
},
{
"if": {
"and": [
"camera:type=dome"
]
},
"if": "camera:type=dome",
"then": {
"en": "A dome camera (which can turn)",
"nl": "Een dome (bolvormige camera die kan draaien)",
@ -83,7 +106,8 @@
"de": "Eine Kuppelkamera (drehbar)",
"ca": "Càmera de cúpula (que pot girar)",
"es": "Cámara con domo (que se puede girar)"
}
},
"icon": "./assets/themes/surveillance/dome.svg"
},
{
"if": {
@ -158,7 +182,8 @@
"it": "Punta in direzione {direction}",
"de": "filmt in Himmelsrichtung {direction}",
"da": "Filmer til en kompasretning af {direction}",
"es": "Graba en dirección a {direction}"
"es": "Graba en dirección a {direction}",
"ca": "Grava en direcció {direction}"
},
"hideInAnswer": true
}
@ -209,7 +234,7 @@
},
"then": {
"en": "A public area is surveilled, such as a street, a bridge, a square, a park, a train station, a public corridor or tunnel, …",
"nl": "Bewaking van de publieke ruilmte, dus een straat, een brug, een park, een plein, een stationsgebouw, een publiek toegankelijke gang of tunnel…",
"nl": "Bewaking van de publieke ruimte, dus een straat, een brug, een park, een plein, een stationsgebouw, een publiek toegankelijke gang of tunnel…",
"fr": "Une zone publique est surveillée, telle qu'une rue, un pont, une place, un parc, une gare, un couloir, un tunnel public…",
"it": "Sorveglia un'area pubblica, come una strada, un ponte, una piazza, un parco, una stazione, un passaggio o un sottopasso pubblico, ...",
"de": "Die Kamera überwacht einen öffentlichen Bereich, z. B. Straßen, Brücken, Plätze, Parks, Bahnhöfe, öffentliche Gänge oder Tunnel, …",
@ -263,7 +288,8 @@
"it": "Lo spazio pubblico sorvegliato da questa videocamera è all'aperto o al chiuso?",
"de": "Handelt es sich bei dem von dieser Kamera überwachten öffentlichen Raum um einen Innen- oder Außenbereich?",
"da": "Er det offentlige rum, der overvåges af dette kamera, et indendørs eller udendørs rum?",
"es": "¿El espacio público vigilado por esta cámara es un espacio interior o exterior?"
"es": "¿El espacio público vigilado por esta cámara es un espacio interior o exterior?",
"ca": "L'espai públic vigilat per aquesta càmera és un espai interior o exterior?"
},
"condition": {
"and": [
@ -280,7 +306,8 @@
"it": "Questa videocamera si trova al chiuso",
"de": "Diese Kamera befindet sich im Innenraum",
"da": "Dette kamera er placeret indendørs",
"es": "Esta cámara está ubicada en un lugar interior"
"es": "Esta cámara está ubicada en un lugar interior",
"ca": "Aquesta càmera es troba a l'interior"
}
},
{
@ -293,7 +320,8 @@
"ru": "Эта камера расположена снаружи",
"de": "Diese Kamera befindet sich im Freien",
"da": "Dette kamera er placeret udendørs",
"es": "Esta cámara está ubicada en un lugar exterior"
"es": "Esta cámara está ubicada en un lugar exterior",
"ca": "Aquesta càmera es troba a l'exterior"
}
},
{
@ -306,7 +334,8 @@
"ru": "Возможно, эта камера расположена снаружи",
"de": "Diese Kamera ist möglicherweise im Freien",
"da": "Dette kamera er sandsynligvis placeret udendørs",
"es": "Esta cámara está probablemente colocada en el exterior"
"es": "Esta cámara está probablemente colocada en el exterior",
"ca": "Aquesta càmera probablement es troba a l'exterior"
},
"hideInAnswer": true
}
@ -328,7 +357,8 @@
"fr": "Situé au niveau {level}",
"it": "Si trova al piano {level}",
"de": "Befindet sich auf Ebene {level}",
"es": "Está colocada a nivel {level}"
"es": "Ubicado en la planta {level}",
"ca": "Ubicat a la planta {level}"
},
"freeform": {
"key": "level",
@ -578,7 +608,8 @@
"nl": "een bewakingscamera",
"de": "eine Überwachungskamera",
"es": "una cámara de vigilancia",
"fr": "une caméra de surveillance"
"fr": "une caméra de surveillance",
"ca": "una càmera de vigilància"
}
},
{
@ -592,11 +623,50 @@
"nl": "een bewakingscamera gemonteerd op een muur",
"de": "eine an einer Wand montierte Überwachungskamera",
"es": "una cámara de vigilancia montada en una pared",
"fr": "une caméra de surveillance fixée au mur"
"fr": "une caméra de surveillance fixée au mur",
"ca": "una càmera de vigilància muntada en una paret"
},
"snapToLayer": [
"walls_and_buildings"
]
},
{
"tags": [
"man_made=surveillance",
"surveillance:type=ALPR"
],
"title": {
"en": "an ALPR camera (Automatic Number Plate Reader)",
"ca": "una càmera ALPR (lector automàtic de matrícules, per les seves sigles en anglès)"
},
"description": {
"en": "An ALPR typically has two lenses and an array of infrared lights.",
"ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes."
},
"exampleImages": [
"./assets/layers/surveillance_camera/ALPR_Example.jpg",
"./assets/layers/surveillance_camera/ALPR_Example2.jpg"
]
},
{
"tags": [
"man_made=surveillance",
"surveillance:type=ALPR",
"camera:mount=wall"
],
"title": {
"en": "an ALPR camera (Automatic Number Plate Reader) mounted on a wall",
"ca": "una càmera ALPR (lector automàtic de matrícules) muntada a la paret"
},
"description": {
"en": "An ALPR typically has two lenses and an array of infrared lights.",
"ca": "Un ALPR normalment té dues lents i una sèrie de llums infrarojes."
},
"exampleImages": [
"./assets/layers/surveillance_camera/ALPR_Example.jpg",
"./assets/layers/surveillance_camera/ALPR_Example2.jpg"
],
"snapToLayer": ["walls_and_buildings"]
}
],
"deletion": true,
@ -612,6 +682,10 @@
"icon": {
"render": "./assets/themes/surveillance/logo.svg",
"mappings": [
{
"if": "surveillance:type=ALPR",
"then": "./assets/layers/surveillance_camera/ALPR.svg"
},
{
"if": "camera:type=dome",
"then": "./assets/themes/surveillance/dome.svg"
@ -629,15 +703,17 @@
"iconSize": {
"mappings": [
{
"if": "camera:type=dome",
"then": "50,50,center"
},
{
"if": "_direction:leftright~*",
"if": {
"and": [
"camera:type=fixed",
"surveillance:type=camera",
"_direction:leftright~*"
]
},
"then": "100,35,center"
}
],
"render": "50,50,center"
"render": "35,35,center"
},
"location": [
"point",
@ -648,7 +724,12 @@
"render": "calc({_direction:numerical}deg + 90deg)",
"mappings": [
{
"if": "camera:type=dome",
"if": {
"or": [
"camera:type=dome",
"surveillance:type=ALPR"
]
},
"then": "0"
},
{
@ -664,5 +745,14 @@
"color": "#f00",
"width": "8"
}
]
],
"deletion": true,
"description": {
"en": "This layer shows surveillance cameras and allows a contributor to update information and add new cameras",
"nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen",
"de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen",
"es": "Esta capa muestra las cámaras de vigilancia y permite a quien colabora, actualizar la información y agregar nuevas cámaras",
"fr": "Cette couche affiche les caméras de surveillance et permet au contributeur de mettre à jour les informations et ajouter de nouvelles caméras",
"ca": "Aquesta capa mostra les càmeres de vigilància i permet a qui col·labora, actualitzar la informació i afegir noves càmeres"
}
}