forked from kamba4/sunders
Compare commits
8 commits
2f8a64d7d8
...
42f7456e18
| Author | SHA1 | Date | |
|---|---|---|---|
|
42f7456e18 |
|||
|
df45b9bbc4 |
|||
|
0a3b543796 |
|||
|
6ab393b2af |
|||
|
4b5811d951 |
|||
|
954b534b10 |
|||
|
17c6946361 |
|||
|
8775e3fc17 |
10 changed files with 34 additions and 14 deletions
|
|
@ -2,12 +2,11 @@ name: Build (and tag) Images
|
|||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
workflow_dispatch:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: docker
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
|
|
|||
|
|
@ -76,10 +76,11 @@ if (USE_STATISTICS) {
|
|||
t.v = 'level_crossing' OR
|
||||
t.v = 'red_light' OR
|
||||
t.v = 'speed_camera')) THEN 5
|
||||
WHEN t.k = 'camera:type' AND t.v = 'panorama' THEN 6
|
||||
ELSE 0
|
||||
END
|
||||
WHERE s.id = ? AND (
|
||||
(t.k = 'camera:type' AND (t.v = 'fixed' OR t.v = 'panning' OR t.v = 'dome')) OR
|
||||
(t.k = 'camera:type' AND (t.v = 'fixed' OR t.v = 'panning' OR t.v = 'dome' OR t.v = 'panorama')) OR
|
||||
(t.k = 'surveillance:type' AND (t.v = 'guard' OR t.v = 'ALPR')) OR
|
||||
(t.k = 'surveillance' AND (
|
||||
t.v = 'level_crossing' OR
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
"type5-0": "ANSE",
|
||||
"type5-1": "Automatische Nummernschilderkennung",
|
||||
"type5-2": "ANSE",
|
||||
"type6-0": "Panoramakamera",
|
||||
"type6-1": "überwacht meist einen 180°- oder 360°-Bereich",
|
||||
"type6-2": "Panorama",
|
||||
|
||||
"all": "alle",
|
||||
"Jan": "Jan",
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
"type5-0": "ALPR",
|
||||
"type5-1": "Automatic Licence Plate Recognition",
|
||||
"type5-2": "ALPR",
|
||||
"type6-0": "Panorama camera",
|
||||
"type6-1": "usually observing a 180° or 360° area",
|
||||
"type6-2": "Panorama",
|
||||
|
||||
"all": "all",
|
||||
"Jan": "Jan",
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
"type5-0": "ICAP",
|
||||
"type5-1": "identificador automático de patentes",
|
||||
"type5-2": "ICAP",
|
||||
"type6-0": "Cámara panorámica",
|
||||
"type6-1": "suele observar un área de 180° o 360°",
|
||||
"type6-2": "Panorámica",
|
||||
|
||||
"all": "todo",
|
||||
"Jan": "Ene",
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
"type5-0": "LAPI",
|
||||
"type5-1": "Lecture Automatisée de Plaques d’Immatriculation",
|
||||
"type5-2": "LAPI",
|
||||
"type6-0": "Caméra panoramique",
|
||||
"type6-1": "observe généralement une zone de 180° ou 360°",
|
||||
"type6-2": "Panoramique",
|
||||
|
||||
"all": "tout",
|
||||
"Jan": "Jan",
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
"type5-0": "ALPR",
|
||||
"type5-1": "Riconoscimento automatico delle targhe",
|
||||
"type5-2": "ALPR",
|
||||
"type6-0": "Telecamera panoramica",
|
||||
"type6-1": "di solito osserva un'area di 180° o 360°",
|
||||
"type6-2": "Panoramica",
|
||||
|
||||
"all": "tutti",
|
||||
"Jan": "Gen",
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
"type5-0": "АРНЗ",
|
||||
"type5-1": "Автоматическое Распознавание Номерных Знаков",
|
||||
"type5-2": "АРНЗ",
|
||||
"type6-0": "Панорамная камера",
|
||||
"type6-1": "обычно наблюдает зону обзора 180° или 360°",
|
||||
"type6-2": "Панорамная",
|
||||
|
||||
"all": "все",
|
||||
"Jan": "Янв",
|
||||
|
|
|
|||
|
|
@ -145,11 +145,11 @@ function onStateChanged() {
|
|||
}
|
||||
// Add camera icon.
|
||||
else {
|
||||
try {
|
||||
plotLatLng = new L.LatLng(plotList[i].lat, plotList[i].lon);
|
||||
var plotType = getPlotType(plotList[i]);
|
||||
plotMarker = getPlotMarkerCamera(plotList[i], plotLatLng, plotType);
|
||||
plotLatLng = new L.LatLng(plotList[i].lat, plotList[i].lon);
|
||||
var plotType = getPlotType(plotList[i]);
|
||||
plotMarker = getPlotMarkerCamera(plotList[i], plotLatLng, plotType);
|
||||
|
||||
try {
|
||||
// Get camera height to draw camera's field of view.
|
||||
var cameraHeight = getCameraHeight(plotList[i]);
|
||||
// Get camera direction to draw camera's field of view.
|
||||
|
|
@ -194,13 +194,15 @@ function onStateChanged() {
|
|||
}
|
||||
|
||||
// Add camera's field of view.
|
||||
map.addLayer(plotFocus);
|
||||
plotLayers.push(plotFocus);
|
||||
|
||||
// Add camera details to camera marker.
|
||||
addCameraDetailsData(plotMarker, plotList[i]);
|
||||
if (plotFocus) {
|
||||
map.addLayer(plotFocus);
|
||||
plotLayers.push(plotFocus);
|
||||
}
|
||||
} catch(e) {
|
||||
}
|
||||
|
||||
// Add camera details to camera marker.
|
||||
addCameraDetailsData(plotMarker, plotList[i]);
|
||||
}
|
||||
|
||||
if (plotMarker !== '') {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"description": "desc-panning" },
|
||||
{ "icons": [ { "src": "domeAll.png", "alt": "icon-dome-alt" } ],
|
||||
"description": "desc-dome" },
|
||||
{ "icons": [ { "src": "panorama.png", "alt": "icon-panorama-alt" } ],
|
||||
{ "icons": [ { "src": "panoramaAll.png", "alt": "icon-panorama-alt" } ],
|
||||
"description": "desc-panorama" },
|
||||
{ "icons": [ { "src": "guardAll.png", "alt": "icon-guard-alt" } ],
|
||||
"description": "desc-guard" },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue