diff --git a/README.md b/README.md index 940c6a0..014326c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ Icon | Description ![Cameras][img_camall] | Camera — no further information ![Fixed cameras][img_fixedall] | Fixed camera — usually observing a limited area ![Panning cameras][img_panningall] | Panning camera — usually able to observe various areas -![Dome cameras][img_domeall] | Dome camera — usually observing a 360° area +![Dome cameras][img_domeall] | Dome camera — usually observing a 360° area by panning, tilting and zooming +![Panorama cameras][img_panoramaall] | Panorama camera — usually observing an entire 360° area all at once ![Guards][img_guardall] | Guard — e.g. an employee of a security service ![Automatic Licence Plate Recognition][img_traffic] | ALPR — Automatic Licence Plate Recognition @@ -18,7 +19,7 @@ Color | Description ![Public surveillance][img_redall] | Red background — observing a public outdoor area, accessable by everyone ![Outdoor surveillance][img_blueall] | Blue background — observing a private outdoor area, accessable only by authorized persons ![Indoor surveillance][img_greenall] | Green background — observing an indoor area -![Cameras, fixme][img_todo_camall]
![Dome cameras, fixme][img_todo_domeall]
![Guards, fixme][img_todo_guardall]
![Automatic Licence Plate Recognition, fixme][img_todo_traffic] | Yellow icon — camera or guard marked with a fixme key because it needs further attention +![Cameras, fixme][img_todo_camall]
![Dome cameras, fixme][img_todo_domeall]
![Panorama cameras, fixme][img_todo_panoramaall]
![Guards, fixme][img_todo_guardall]
![Automatic Licence Plate Recognition, fixme][img_todo_traffic] | Yellow icon — camera or guard marked with a fixme key because it needs further attention A running instance of this project can be visited at [https://sunders.uber.space/](https://sunders.uber.space/). @@ -70,6 +71,7 @@ Icon | Key | Value ![Fixed camera][img_fixed] | [`surveillance:type`](https://wiki.openstreetmap.org/wiki/Key:surveillance:type)
[`camera:type`](https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera) | `camera`
`fixed` ![Panning camera][img_panning] | [`surveillance:type`](https://wiki.openstreetmap.org/wiki/Key:surveillance:type)
[`camera:type`](https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera) | `camera`
`panning` ![Dome camera][img_dome] | [`surveillance:type`](https://wiki.openstreetmap.org/wiki/Key:surveillance:type)
[`camera:type`](https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera) | `camera`
`dome` +![Panorama camera][img_panorama] | [`surveillance:type`](https://wiki.openstreetmap.org/wiki/Key:surveillance:type)
[`camera:type`](https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera) | `camera`
`panorama` ![Guard][img_guard] | [`surveillance:type`](https://wiki.openstreetmap.org/wiki/Key:surveillance:type) | `guard` ![Automatic Licence Plate Recognition][img_traffic] | [`surveillance:type`](https://wiki.openstreetmap.org/wiki/Key:surveillance:type) | `ALPR` @@ -134,6 +136,10 @@ Key | Value [img_domeall]: ./web/www/sunders/images/domeAll.png "Dome cameras" [img_todo_domeall]: ./web/www/sunders/images/todo_domeAll.png "Dome cameras, fixme" +[img_panorama]: ./web/www/sunders/images/panorama.png "Panorama camera" +[img_panoramaall]: ./web/www/sunders/images/panoramaAll.png "Panorama cameras" +[img_todo_panoramaall]: ./web/www/sunders/images/todo_panoramaAll.png "Panorama cameras, fixme" + [img_guard]: ./web/www/sunders/images/guard.png "Guard" [img_guardall]: ./web/www/sunders/images/guardAll.png "Guards" [img_todo_guardall]: ./web/www/sunders/images/todo_guardAll.png "Guards, fixme" diff --git a/web/www/sunders/i18n/manual/de.json b/web/www/sunders/i18n/manual/de.json index c41f4fc..1e4ced6 100644 --- a/web/www/sunders/i18n/manual/de.json +++ b/web/www/sunders/i18n/manual/de.json @@ -13,6 +13,7 @@ "v-fixed": "fixed (feststehend)", "v-panning": "panning (schwenkbar)", "v-dome": "dome (Kuppel)", + "v-panorama": "panorama (Panorama)", "v-guard": "guard (Wachpersonal)", "v-alpr": "ALPR (AKLS)", "icon-public-alt": "Überwachung öffentlicher Bereiche", @@ -22,10 +23,12 @@ "icon-fixed-alt": "Feststehende Kamera", "icon-panning-alt": "Schwenkbare Kamera", "icon-dome-alt": "Kuppelkamera", + "icon-panorama-alt": "Panoramakamera", "icon-guard-alt": "Wachpersonal", "icon-alpr-alt": "Automatische Kennzeichenlesesysteme", "title-view-fixed": "Notwendig, zum Anzeigen des feststehenden Kamerablickfelds", "title-view-dome": "Notwendig, zum Anzeigen des Kuppelkamerablickfelds", + "title-view-panorama": "Notwendig, zum Anzeigen des Panoramakamerablickfelds", "k-cam-direction": "@@LT00", "k-cam-angle": "@@LT00", "k-height": "@@LT00", @@ -44,6 +47,9 @@ "example-img-3-alt": "Rundumblickfeld (Höhe: 3m)", "example-img-4-alt": "Rundumblickfeld (Höhe: 5m)", "example-img-5-alt": "Rundumblickfeld (Höhe: 5m, Richtung: 45°)", + "example-img-6-alt": "Panoramablickfeld (Höhe: 3m)", + "example-img-7-alt": "Panoramablickfeld (Höhe: 5m)", + "example-img-8-alt": "Panoramablickfeld (Höhe: 5m, Richtung: 45°)", "example-direction-45": "Richtung = 45°", "example-direction-90": "Richtung = 90°", "example-angle-15": "Winkel = 15°", diff --git a/web/www/sunders/i18n/manual/en.json b/web/www/sunders/i18n/manual/en.json index 3556368..de8db7a 100644 --- a/web/www/sunders/i18n/manual/en.json +++ b/web/www/sunders/i18n/manual/en.json @@ -13,6 +13,7 @@ "v-fixed": "fixed", "v-panning": "panning", "v-dome": "dome", + "v-panorama": "panorama", "v-guard": "guard", "v-alpr": "ALPR", "icon-public-alt": "Public surveillance", @@ -22,10 +23,12 @@ "icon-fixed-alt": "Fixed camera", "icon-panning-alt": "Panning camera", "icon-dome-alt": "Dome camera", + "icon-panorama-alt": "Panorama camera", "icon-guard-alt": "Guard", "icon-alpr-alt": "Automatic Licence Plate Recognition", "title-view-fixed": "Mandatory to draw a fixed camera's field of view", "title-view-dome": "Mandatory to draw a dome camera's field of view", + "title-view-panorama": "Mandatory to draw a panorama camera's field of view", "k-cam-direction": "@@LT00", "k-cam-angle": "@@LT00", "k-height": "@@LT00", @@ -44,6 +47,9 @@ "example-img-3-alt": "Dome field of view (height: 3m)", "example-img-4-alt": "Dome field of view (height: 5m)", "example-img-5-alt": "Dome field of view (height: 5m, direction: 45°)", + "example-img-6-alt": "Panorama field of view (height: 3m)", + "example-img-7-alt": "Panorama field of view (height: 5m)", + "example-img-8-alt": "Panorama field of view (height: 5m, direction: 45°)", "example-direction-45": "direction = 45°", "example-direction-90": "direction = 90°", "example-angle-15": "angle = 15°", diff --git a/web/www/sunders/i18n/symbology/de.json b/web/www/sunders/i18n/symbology/de.json index 86d8ad4..f756867 100644 --- a/web/www/sunders/i18n/symbology/de.json +++ b/web/www/sunders/i18n/symbology/de.json @@ -9,6 +9,8 @@ "desc-panning": "Schwenkbare Kamera — überwacht meist verschiedene Bereiche", "icon-dome-alt": "Kuppelkameras", "desc-dome": "Kuppelkamera — überwacht meist einen 360°-Bereich", + "icon-panorama-alt": "Panoramakameras", + "desc-panorama": "Panoramakamera — überwacht meist einen 180°- oder 360°-Bereich", "icon-guard-alt": "Wachpersonal", "desc-guard": "Wachpersonal — z.B. Beschäftigte eines Sicherheitsunternehmens", "icon-alpr-alt": "Automatische Kennzeichenlesesysteme", @@ -22,6 +24,7 @@ "desc-green": "Grüner Hintergrund — Überwachung eines Bereichs innerhalb eines Gebäudes", "icon-yellow-fixed-alt": "Feststehend Kamera, zu kontrollieren", "icon-yellow-dome-alt": "Kuppelkamera, zu kontrollieren", + "icon-yellow-panorama-alt": "Panoramakamera, zu kontrollieren", "icon-yellow-guard-alt": "Wachpersonal, zu kontrollieren", "icon-yellow-alpr-alt": "Automatische Nummernschilderkennung, zu kontrollieren", "desc-yellow": "Gelbes Symbol — Mit einem Kontrollkennzeichen markiere Kamera oder Wachpersonaleintrag, die/der noch korrigiert oder vervollständigt werden muss." diff --git a/web/www/sunders/i18n/symbology/en.json b/web/www/sunders/i18n/symbology/en.json index 679259f..ca3dcbc 100644 --- a/web/www/sunders/i18n/symbology/en.json +++ b/web/www/sunders/i18n/symbology/en.json @@ -9,6 +9,8 @@ "desc-panning": "Panning camera — usually able to observe various areas", "icon-dome-alt": "Dome cameras", "desc-dome": "Dome camera — usually observing a 360° area", + "icon-panorama-alt": "Panorama cameras", + "desc-panorama": "Panorama camera — usually observing a 180° or 360° area", "icon-guard-alt": "Guards", "desc-guard": "Guard — e.g. an employee of a security service", "icon-alpr-alt": "Automatic Licence Plate Recognition", @@ -22,6 +24,7 @@ "desc-green": "Green background — observing an indoor area", "icon-yellow-fixed-alt": "Fixed cameras, fixme", "icon-yellow-dome-alt": "Dome cameras, fixme", + "icon-yellow-panorama-alt": "Panorama cameras, fixme", "icon-yellow-guard-alt": "Guards, fixme", "icon-yellow-alpr-alt": "Automatic Licence Plate Recognition, fixme", "desc-yellow": "Yellow icon — camera or guard marked with a fixme key because it needs further attention" diff --git a/web/www/sunders/images/colorBlueAll.png b/web/www/sunders/images/colorBlueAll.png index 0a22f1d..c2d1538 100644 Binary files a/web/www/sunders/images/colorBlueAll.png and b/web/www/sunders/images/colorBlueAll.png differ diff --git a/web/www/sunders/images/colorGreenAll.png b/web/www/sunders/images/colorGreenAll.png index daf47d8..0628eb6 100644 Binary files a/web/www/sunders/images/colorGreenAll.png and b/web/www/sunders/images/colorGreenAll.png differ diff --git a/web/www/sunders/images/colorRedAll.png b/web/www/sunders/images/colorRedAll.png index b9adb9a..905f78f 100644 Binary files a/web/www/sunders/images/colorRedAll.png and b/web/www/sunders/images/colorRedAll.png differ diff --git a/web/www/sunders/images/panorama.png b/web/www/sunders/images/panorama.png new file mode 100644 index 0000000..ecc2b1f Binary files /dev/null and b/web/www/sunders/images/panorama.png differ diff --git a/web/www/sunders/images/panoramaAll.png b/web/www/sunders/images/panoramaAll.png new file mode 100644 index 0000000..b1a9b8a Binary files /dev/null and b/web/www/sunders/images/panoramaAll.png differ diff --git a/web/www/sunders/images/panoramaBlue.png b/web/www/sunders/images/panoramaBlue.png new file mode 100644 index 0000000..9428a3a Binary files /dev/null and b/web/www/sunders/images/panoramaBlue.png differ diff --git a/web/www/sunders/images/panoramaGreen.png b/web/www/sunders/images/panoramaGreen.png new file mode 100644 index 0000000..e0684a3 Binary files /dev/null and b/web/www/sunders/images/panoramaGreen.png differ diff --git a/web/www/sunders/images/panoramaRed.png b/web/www/sunders/images/panoramaRed.png new file mode 100644 index 0000000..1f87655 Binary files /dev/null and b/web/www/sunders/images/panoramaRed.png differ diff --git a/web/www/sunders/images/panorama_z-17_h-3.png b/web/www/sunders/images/panorama_z-17_h-3.png new file mode 100644 index 0000000..2a1b209 Binary files /dev/null and b/web/www/sunders/images/panorama_z-17_h-3.png differ diff --git a/web/www/sunders/images/panorama_z-17_h-5.png b/web/www/sunders/images/panorama_z-17_h-5.png new file mode 100644 index 0000000..e88753a Binary files /dev/null and b/web/www/sunders/images/panorama_z-17_h-5.png differ diff --git a/web/www/sunders/images/panorama_z-17_h-5_d-45.png b/web/www/sunders/images/panorama_z-17_h-5_d-45.png new file mode 100644 index 0000000..f81ed3a Binary files /dev/null and b/web/www/sunders/images/panorama_z-17_h-5_d-45.png differ diff --git a/web/www/sunders/images/todo_panorama.png b/web/www/sunders/images/todo_panorama.png new file mode 100644 index 0000000..f38450d Binary files /dev/null and b/web/www/sunders/images/todo_panorama.png differ diff --git a/web/www/sunders/images/todo_panoramaAll.png b/web/www/sunders/images/todo_panoramaAll.png new file mode 100644 index 0000000..48b50d3 Binary files /dev/null and b/web/www/sunders/images/todo_panoramaAll.png differ diff --git a/web/www/sunders/images/todo_panoramaBlue.png b/web/www/sunders/images/todo_panoramaBlue.png new file mode 100644 index 0000000..f5d01d8 Binary files /dev/null and b/web/www/sunders/images/todo_panoramaBlue.png differ diff --git a/web/www/sunders/images/todo_panoramaGreen.png b/web/www/sunders/images/todo_panoramaGreen.png new file mode 100644 index 0000000..9352e1e Binary files /dev/null and b/web/www/sunders/images/todo_panoramaGreen.png differ diff --git a/web/www/sunders/images/todo_panoramaRed.png b/web/www/sunders/images/todo_panoramaRed.png new file mode 100644 index 0000000..8a85457 Binary files /dev/null and b/web/www/sunders/images/todo_panoramaRed.png differ diff --git a/web/www/sunders/js/leafletembed_functions.js b/web/www/sunders/js/leafletembed_functions.js index cb199a0..6b38ce4 100644 --- a/web/www/sunders/js/leafletembed_functions.js +++ b/web/www/sunders/js/leafletembed_functions.js @@ -158,7 +158,7 @@ function onStateChanged() { // Draw fixed camera's field of view and add it to map. var cameraType = plotList[i]['camera:type']; - if (cameraType == 'fixed' || cameraType == 'static' || cameraType == 'dome') { + if (cameraType == 'fixed' || cameraType == 'static' || cameraType == 'dome' || cameraType == 'panorama') { var focusColor = getFocusColor(plotType); if (cameraType == 'fixed' || cameraType == 'static') { if (cameraDirection != null) { @@ -183,7 +183,7 @@ function onStateChanged() { } } // Draw dome's field of view and add it to map. - else if (cameraType == 'dome') { + else if (cameraType == 'dome' || cameraType == 'panorama') { var focusRadius = getRadiusForHeight(cameraHeight); if (isNumeric(cameraDirection)) { var plotFocus = drawCameraFocusFixed(plotLatLng, cameraDirection, focusRadius, 180, focusColor); @@ -275,6 +275,8 @@ function getPlotMarkerCamera(plot, plotLatLng, plotType) { iconName = 'panning'; } else if (plot['camera:type'] == 'dome') { iconName = 'dome'; + } else if (plot['camera:type'] == 'panorama') { + iconName = 'panorama'; } else if (plot['surveillance:type'] == 'guard') { iconName = 'guard'; } diff --git a/web/www/sunders/js/leafletembed_icons.js b/web/www/sunders/js/leafletembed_icons.js index 0e907a2..c28703c 100644 --- a/web/www/sunders/js/leafletembed_icons.js +++ b/web/www/sunders/js/leafletembed_icons.js @@ -35,6 +35,13 @@ var domeIcon = L.icon({ popupAnchor : [0, -10] }); +var panoramaIcon = L.icon({ + iconUrl: 'images/panorama.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var guardIcon = L.icon({ iconUrl: 'images/guard.png', iconSize: [20, 20], @@ -79,6 +86,13 @@ var domeBlueIcon = L.icon({ popupAnchor : [0, -10] }); +var panoramaBlueIcon = L.icon({ + iconUrl: 'images/panoramaBlue.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var guardBlueIcon = L.icon({ iconUrl: 'images/guardBlue.png', iconSize: [20, 20], @@ -115,6 +129,13 @@ var domeGreenIcon = L.icon({ popupAnchor : [0, -10] }); +var panoramaGreenIcon = L.icon({ + iconUrl: 'images/panoramaGreen.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var guardGreenIcon = L.icon({ iconUrl: 'images/guardGreen.png', iconSize: [20, 20], @@ -152,6 +173,13 @@ var domeRedIcon = L.icon({ popupAnchor : [0, -10] }); +var panoramaRedIcon = L.icon({ + iconUrl: 'images/panoramaRed.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var guardRedIcon = L.icon({ iconUrl: 'images/guardRed.png', iconSize: [20, 20], @@ -188,6 +216,13 @@ var todo_domeIcon = L.icon({ popupAnchor : [0, -10] }); +var todo_panoramaIcon = L.icon({ + iconUrl: 'images/todo_panorama.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var todo_guardIcon = L.icon({ iconUrl: 'images/todo_guard.png', iconSize: [20, 20], @@ -232,6 +267,13 @@ var todo_domeBlueIcon = L.icon({ popupAnchor : [0, -10] }); +var todo_panoramaBlueIcon = L.icon({ + iconUrl: 'images/todo_panoramaBlue.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var todo_guardBlueIcon = L.icon({ iconUrl: 'images/todo_guardBlue.png', iconSize: [20, 20], @@ -268,6 +310,13 @@ var todo_domeGreenIcon = L.icon({ popupAnchor : [0, -10] }); +var todo_panoramaGreenIcon = L.icon({ + iconUrl: 'images/todo_panoramaGreen.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var todo_guardGreenIcon = L.icon({ iconUrl: 'images/todo_guardGreen.png', iconSize: [20, 20], @@ -305,6 +354,13 @@ var todo_domeRedIcon = L.icon({ popupAnchor : [0, -10] }); +var todo_panoramaRedIcon = L.icon({ + iconUrl: 'images/todo_panoramaRed.png', + iconSize: [20, 20], + iconAnchor: [10, 10], + popupAnchor : [0, -10] +}); + var todo_guardRedIcon = L.icon({ iconUrl: 'images/todo_guardRed.png', iconSize: [20, 20], diff --git a/web/www/sunders/json/manual.json b/web/www/sunders/json/manual.json index e46f599..caddc10 100644 --- a/web/www/sunders/json/manual.json +++ b/web/www/sunders/json/manual.json @@ -1,76 +1,653 @@ -[ { "listTitle": "title-icon", "isListWithIcons": true, +[ + { + "listTitle": "title-icon", + "isListWithIcons": true, "listEntries": [ - { "keys": [ { "key": "k-manmade", "href": "https://wiki.openstreetmap.org/wiki/Key:man_made" } ], - "values": [ { "value": "v-surveillance", "href": "https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dsurveillance" } ], - "icon": null }, - { "keys": [ { "key": "k-surveillance", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance" } ], - "values": [ { "value": "v-public" } ], - "icon": { "src": "colorRed.png", "alt": "icon-public-alt" } }, - { "keys": [ { "key": "k-surveillance", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance" } ], - "values": [ { "value": "v-outdoor" } ], - "icon": { "src": "colorBlue.png", "alt": "icon-outdoor-alt" } }, - { "keys": [ { "key": "k-surveillance", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance" } ], - "values": [ { "value": "v-indoor" } ], - "icon": { "src": "colorGreen.png", "alt": "icon-indoor-alt" } }, - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" } ], - "values": [ { "value": "v-camera" } ], - "icon": { "src": "cam.png", "alt": "icon-cam-alt" } }, - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" }, { "key": "k-cam-type", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-camera" }, { "value": "v-fixed" } ], - "icon": { "src": "fixed.png", "alt": "icon-fixed-alt" } }, - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" }, { "key": "k-cam-type", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-camera" }, { "value": "v-panning" } ], - "icon": { "src": "panning.png", "alt": "icon-panning-alt" } }, - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" }, { "key": "k-cam-type", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-camera" }, { "value": "v-dome" } ], - "icon": { "src": "dome.png", "alt": "icon-dome-alt" } }, - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" } ], - "values": [ { "value": "v-guard" } ], - "icon": { "src": "guard.png", "alt": "icon-guard-alt" } }, - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" } ], - "values": [ { "value": "v-alpr" } ], - "icon": { "src": "traffic.png", "alt": "icon-alpr-alt" } } ] }, - { "listTitle": "title-view-fixed", "isListWithIcons": false, + { + "keys": [ + { + "key": "k-manmade", + "href": "https://wiki.openstreetmap.org/wiki/Key:man_made" + } + ], + "values": [ + { + "value": "v-surveillance", + "href": "https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dsurveillance" + } + ], + "icon": null + }, + { + "keys": [ + { + "key": "k-surveillance", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance" + } + ], + "values": [ + { + "value": "v-public" + } + ], + "icon": { + "src": "colorRed.png", + "alt": "icon-public-alt" + } + }, + { + "keys": [ + { + "key": "k-surveillance", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance" + } + ], + "values": [ + { + "value": "v-outdoor" + } + ], + "icon": { + "src": "colorBlue.png", + "alt": "icon-outdoor-alt" + } + }, + { + "keys": [ + { + "key": "k-surveillance", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance" + } + ], + "values": [ + { + "value": "v-indoor" + } + ], + "icon": { + "src": "colorGreen.png", + "alt": "icon-indoor-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + } + ], + "values": [ + { + "value": "v-camera" + } + ], + "icon": { + "src": "cam.png", + "alt": "icon-cam-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + }, + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-camera" + }, + { + "value": "v-fixed" + } + ], + "icon": { + "src": "fixed.png", + "alt": "icon-fixed-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + }, + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-camera" + }, + { + "value": "v-panning" + } + ], + "icon": { + "src": "panning.png", + "alt": "icon-panning-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + }, + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-camera" + }, + { + "value": "v-dome" + } + ], + "icon": { + "src": "dome.png", + "alt": "icon-dome-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + }, + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-camera" + }, + { + "value": "v-panorama" + } + ], + "icon": { + "src": "panorama.png", + "alt": "icon-panorama-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + }, + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-camera" + }, + { + "value": "v-panorama" + } + ], + "icon": { + "src": "panorama.png", + "alt": "icon-panorama-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + } + ], + "values": [ + { + "value": "v-guard" + } + ], + "icon": { + "src": "guard.png", + "alt": "icon-guard-alt" + } + }, + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + } + ], + "values": [ + { + "value": "v-alpr" + } + ], + "icon": { + "src": "traffic.png", + "alt": "icon-alpr-alt" + } + } + ] + }, + { + "listTitle": "title-view-fixed", + "isListWithIcons": false, "listEntries": [ - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" } ], - "values": [ { "value": "v-camera" } ] }, - { "keys": [ { "key": "k-cam-type", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-fixed" } ] }, - { "keys": [ { "key": "k-cam-direction", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-direction-0" }, { "value": "v-direction-1" } ] }, - { "keys": [ { "key": "k-cam-angle", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-angle-0" }, { "value": "v-angle-1" }, { "value": "v-angle-2" } ] }, - { "keys": [ { "key": "k-height", "href": "https://wiki.openstreetmap.org/wiki/Key:height" } ], - "values": [ { "value": "v-height-0" }, { "value": "v-height-1" } ] } ], + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + } + ], + "values": [ + { + "value": "v-camera" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-fixed" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-direction", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-direction-0" + }, + { + "value": "v-direction-1" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-angle", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-angle-0" + }, + { + "value": "v-angle-1" + }, + { + "value": "v-angle-2" + } + ] + }, + { + "keys": [ + { + "key": "k-height", + "href": "https://wiki.openstreetmap.org/wiki/Key:height" + } + ], + "values": [ + { + "value": "v-height-0" + }, + { + "value": "v-height-1" + } + ] + } + ], "examples": { - "images": [ { "src": "fixed_z-17_d-90_a-15_h-5.png", "alt": "example-img-0-alt" }, { "src": "fixed_z-17_d-90_a-15_h-10.png", "alt": "example-img-1-alt" }, { "src": "fixed_z-17_d-90_a-60_h-10.png", "alt": "example-img-2-alt" } ], - "descriptions": [ { "lines": [ "example-direction-90", "example-angle-15", "example-height-5" ] }, { "lines": [ "example-direction-90", "example-angle-15", "example-height-10" ] }, { "lines": [ "example-direction-90", "example-angle-60", "example-height-10" ] } ] } }, - { "listTitle": "title-view-dome", "isListWithIcons": false, + "images": [ + { + "src": "fixed_z-17_d-90_a-15_h-5.png", + "alt": "example-img-0-alt" + }, + { + "src": "fixed_z-17_d-90_a-15_h-10.png", + "alt": "example-img-1-alt" + }, + { + "src": "fixed_z-17_d-90_a-60_h-10.png", + "alt": "example-img-2-alt" + } + ], + "descriptions": [ + { + "lines": [ + "example-direction-90", + "example-angle-15", + "example-height-5" + ] + }, + { + "lines": [ + "example-direction-90", + "example-angle-15", + "example-height-10" + ] + }, + { + "lines": [ + "example-direction-90", + "example-angle-60", + "example-height-10" + ] + } + ] + } + }, + { + "listTitle": "title-view-dome", + "isListWithIcons": false, "listEntries": [ - { "keys": [ { "key": "k-surv-type", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" } ], - "values": [ { "value": "v-camera" } ] }, - { "keys": [ { "key": "k-cam-type", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-dome" } ] }, - { "keys": [ { "key": "k-cam-direction", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-direction-0" }, { "value": "v-direction-1" }, { "value": "v-direction-2" } ] }, - { "keys": [ { "key": "k-height", "href": "https://wiki.openstreetmap.org/wiki/Key:height" } ], - "values": [ { "value": "v-height-0" }, { "value": "v-height-1" } ] } ], + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + } + ], + "values": [ + { + "value": "v-camera" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-dome" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-direction", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-direction-0" + }, + { + "value": "v-direction-1" + }, + { + "value": "v-direction-2" + } + ] + }, + { + "keys": [ + { + "key": "k-height", + "href": "https://wiki.openstreetmap.org/wiki/Key:height" + } + ], + "values": [ + { + "value": "v-height-0" + }, + { + "value": "v-height-1" + } + ] + } + ], "examples": { - "images": [ { "src": "dome_z-17_h-3.png", "alt": "example-img-3-alt" }, { "src": "dome_z-17_h-5.png", "alt": "example-img-4-alt" }, { "src": "dome_z-17_h-5_d-45.png", "alt": "example-img-5-alt" } ], - "descriptions": [ { "lines": [ "example-height-3" ] }, { "lines": [ "example-height-5" ] }, { "lines": [ "example-height-5", "example-direction-45" ] } ] } }, - { "listTitle": "title-optional", "isListWithIcons": false, + "images": [ + { + "src": "dome_z-17_h-3.png", + "alt": "example-img-3-alt" + }, + { + "src": "dome_z-17_h-5.png", + "alt": "example-img-4-alt" + }, + { + "src": "dome_z-17_h-5_d-45.png", + "alt": "example-img-5-alt" + } + ], + "descriptions": [ + { + "lines": [ + "example-height-3" + ] + }, + { + "lines": [ + "example-height-5" + ] + }, + { + "lines": [ + "example-height-5", + "example-direction-45" + ] + } + ] + } + }, + { + "listTitle": "title-view-panorama", + "isListWithIcons": false, "listEntries": [ - { "keys": [ { "key": "k-surv-zone", "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:zone" } ], - "values": [ { "value": "v-surv-zone" } ] }, - { "keys": [ { "key": "k-cam-mount", "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" } ], - "values": [ { "value": "v-cam-mount" } ] }, - { "keys": [ { "key": "k-operator", "href": "https://wiki.openstreetmap.org/wiki/Key:operator" } ], - "values": [ { "value": "v-operator" } ] }, - { "keys": [ { "key": "k-name", "href": "https://wiki.openstreetmap.org/wiki/Key:name" } ], - "values": [ { "value": "v-name" } ] }, - { "keys": [ { "key": "k-ref", "href": "https://wiki.openstreetmap.org/wiki/Key:ref" } ], - "values": [ { "value": "v-ref" } ] }, - { "keys": [ { "key": "k-image", "href": "https://wiki.openstreetmap.org/wiki/Key:image" } ], - "values": [ { "value": "v-image" } ] } - ] } -] + { + "keys": [ + { + "key": "k-surv-type", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:type" + } + ], + "values": [ + { + "value": "v-camera" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-type", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-panorama" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-direction", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-direction-0" + }, + { + "value": "v-direction-1" + }, + { + "value": "v-direction-2" + } + ] + }, + { + "keys": [ + { + "key": "k-height", + "href": "https://wiki.openstreetmap.org/wiki/Key:height" + } + ], + "values": [ + { + "value": "v-height-0" + }, + { + "value": "v-height-1" + } + ] + } + ], + "examples": { + "images": [ + { + "src": "panorama_z-17_h-3.png", + "alt": "example-img-3-alt" + }, + { + "src": "panorama_z-17_h-5.png", + "alt": "example-img-4-alt" + }, + { + "src": "panorama_z-17_h-5_d-45.png", + "alt": "example-img-5-alt" + } + ], + "descriptions": [ + { + "lines": [ + "example-height-3" + ] + }, + { + "lines": [ + "example-height-5" + ] + }, + { + "lines": [ + "example-height-5", + "example-direction-45" + ] + } + ] + } + }, + { + "listTitle": "title-optional", + "isListWithIcons": false, + "listEntries": [ + { + "keys": [ + { + "key": "k-surv-zone", + "href": "https://wiki.openstreetmap.org/wiki/Key:surveillance:zone" + } + ], + "values": [ + { + "value": "v-surv-zone" + } + ] + }, + { + "keys": [ + { + "key": "k-cam-mount", + "href": "https://wiki.openstreetmap.org/wiki/Proposed_features/Extended_tags_for_Key:Surveillance#Camera" + } + ], + "values": [ + { + "value": "v-cam-mount" + } + ] + }, + { + "keys": [ + { + "key": "k-operator", + "href": "https://wiki.openstreetmap.org/wiki/Key:operator" + } + ], + "values": [ + { + "value": "v-operator" + } + ] + }, + { + "keys": [ + { + "key": "k-name", + "href": "https://wiki.openstreetmap.org/wiki/Key:name" + } + ], + "values": [ + { + "value": "v-name" + } + ] + }, + { + "keys": [ + { + "key": "k-ref", + "href": "https://wiki.openstreetmap.org/wiki/Key:ref" + } + ], + "values": [ + { + "value": "v-ref" + } + ] + }, + { + "keys": [ + { + "key": "k-image", + "href": "https://wiki.openstreetmap.org/wiki/Key:image" + } + ], + "values": [ + { + "value": "v-image" + } + ] + } + ] + } +] \ No newline at end of file diff --git a/web/www/sunders/json/symbology.json b/web/www/sunders/json/symbology.json index a0765ef..2332b3f 100644 --- a/web/www/sunders/json/symbology.json +++ b/web/www/sunders/json/symbology.json @@ -8,6 +8,8 @@ "description": "desc-panning" }, { "icons": [ { "src": "domeAll.png", "alt": "icon-dome-alt" } ], "description": "desc-dome" }, + { "icons": [ { "src": "panorama.png", "alt": "icon-panorama-alt" } ], + "description": "desc-panorama" }, { "icons": [ { "src": "guardAll.png", "alt": "icon-guard-alt" } ], "description": "desc-guard" }, { "icons": [ { "src": "traffic.png", "alt": "icon-alpr-alt" } ], @@ -23,6 +25,7 @@ { "icons": [ { "src": "todo_camAll.png", "alt": "icon-yellow-fixed-alt" }, { "src": "todo_domeAll.png", "alt": "icon-yellow-dome-alt" }, + { "src": "todo_panorama.png", "alt": "icon-yellow-panorama-alt" }, { "src": "todo_guardAll.png", "alt": "icon-yellow-guard-alt" }, { "src": "todo_traffic.png", "alt": "icon-yellow-alpr-alt" } ], "description": "desc-yellow" } ] }