Merge pull request 'Support for camera:type=panorama' (#2492) from mbodin/MapComplete:develop into develop

Reviewed-on: MapComplete/MapComplete#2492
Reviewed-by: Pieter Vander Vennet <pietervdvn@posteo.net>

assets/layers/surveillance_camera/surveillance_camera.json

@@ -87,6 +87,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"
@@ -392,7 +396,7 @@
           },
           "icon": "./assets/themes/surveillance/dome.svg"
         },
-        {
+				{
           "if": "camera:type=panning",
           "then": {
             "en": "A panning camera",
@@ -407,6 +411,15 @@
             "ru": "Панорамная камера"
           }
         },
+        {
+          "if": "camera:type=panorama",
+          "then": {
+            "en": "A 360° camera",
+						"de": "Eine 360°-Kamera",
+						"es": "Una cámara de 360°",
+            "fr": "Une caméra 360°"
+          }
+        },
         {
           "if": "camera:type=doorbell",
           "icon": {
@@ -530,7 +543,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?"

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": []
   }
-]
+]

assets/themes/surveillance/panorama.svg

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="375px"
+   height="375px"
+   viewBox="0 0 375 375"
+   version="1.1"
+   id="svg11"
+   sodipodi:docname="panorama.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1848"
+     inkscape:window-height="1016"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="0.89001174"
+     inkscape:cx="-102.67639"
+     inkscape:cy="383.78091"
+     inkscape:window-x="72"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="surface1" />
+  <g
+     id="surface1">
+    <path
+       style="fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;stroke-width:4.364746;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;"
+       d="M 11.439583 11.609375 L 87.78125 11.609375 C 100.329167 11.645833 100.719792 26.828125 87.78125 26.669792 L 11.439583 26.669792 C 0.0791667 26.703125 0.219792 11.485417 11.439583 11.609375 Z M 11.439583 11.609375 "
+       transform="matrix(3.75,0,0,3.75,0,0)"
+       id="path2" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:16.36779785;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 63.757812,111.65625 c -1.03844,24.66436 1.56627,52.30634 19.60547,70.94141 16.4742,16.7613 42.602118,17.61508 63.911558,11.35236 21.32624,-7.0526 44.46621,-10.08945 66.51633,-4.55645 16.56255,4.20494 33.3571,10.27068 50.72954,7.54437 21.05714,-1.99646 38.48987,-18.37149 44.41741,-38.26561 5.07765,-15.08145 5.98637,-31.22416 5.27672,-47.01608 -83.48568,0.0122 -166.97135,0.0122 -250.457028,0 z"
+       id="path4"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g889-5"
+       transform="matrix(0.76242865,0,0,0.76242865,99.709367,31.399328)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6-3"
+         d="m 138.94637,153.12112 c 0,12.14155 -10.48036,21.98508 -23.40956,21.98508 -12.9292,0 -23.40956,-9.84353 -23.40956,-21.98508 0,-12.14156 10.48036,-21.98509 23.40956,-21.98509 12.9292,0 23.40956,9.84353 23.40956,21.98509 z m 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.53627264" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8-5"
+         d="m 129.9261,153.53588 c 0,7.78853 -6.53792,14.1044 -14.60506,14.1044 -8.06503,0 -14.60295,-6.31587 -14.60295,-14.1044 0,-7.78852 6.53792,-14.10228 14.60295,-14.10228 8.06714,0 14.60506,6.31376 14.60506,14.10228 z m 0,0"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.53627264" />
+    </g>
+    <g
+       id="g889-5-6"
+       transform="matrix(0.56728076,0,0,0.76242865,214.31784,31.399328)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6-3-2"
+         d="m 138.94637,153.12112 c 0,12.14155 -10.48036,21.98508 -23.40956,21.98508 -12.9292,0 -23.40956,-9.84353 -23.40956,-21.98508 0,-12.14156 10.48036,-21.98509 23.40956,-21.98509 12.9292,0 23.40956,9.84353 23.40956,21.98509 z m 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.53627264" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8-5-9"
+         d="m 129.9261,153.53588 c 0,7.78853 -6.53792,14.1044 -14.60506,14.1044 -8.06503,0 -14.60295,-6.31587 -14.60295,-14.1044 0,-7.78852 6.53792,-14.10228 14.60295,-14.10228 8.06714,0 14.60506,6.31376 14.60506,14.10228 z m 0,0"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.53627264" />
+    </g>
+    <g
+       id="g889-5-6-1"
+       transform="matrix(0.56728076,0,0,0.76242865,30.194419,31.399328)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6-3-2-2"
+         d="m 138.94637,153.12112 c 0,12.14155 -10.48036,21.98508 -23.40956,21.98508 -12.9292,0 -23.40956,-9.84353 -23.40956,-21.98508 0,-12.14156 10.48036,-21.98509 23.40956,-21.98509 12.9292,0 23.40956,9.84353 23.40956,21.98509 z m 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.53627264" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8-5-9-7"
+         d="m 129.9261,153.53588 c 0,7.78853 -6.53792,14.1044 -14.60506,14.1044 -8.06503,0 -14.60295,-6.31587 -14.60295,-14.1044 0,-7.78852 6.53792,-14.10228 14.60295,-14.10228 8.06714,0 14.60506,6.31376 14.60506,14.10228 z m 0,0"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.53627264" />
+    </g>
+  </g>
+</svg>

assets/themes/surveillance/panorama.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Martin Bodin
+SPDX-License-Identifier: CC0-1.0