diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml index 6dfac7b..940ce02 100644 --- a/.forgejo/workflows/images.yml +++ b/.forgejo/workflows/images.yml @@ -2,11 +2,12 @@ name: Build (and tag) Images on: push: - workflow_dispatch: + branches: + workflow_dispatch: jobs: build: - runs-on: docker + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/home/sunders/update_cameras/update_statistics.php b/home/sunders/update_cameras/update_statistics.php index e435342..f6bcc7a 100644 --- a/home/sunders/update_cameras/update_statistics.php +++ b/home/sunders/update_cameras/update_statistics.php @@ -76,11 +76,10 @@ 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.v = 'panorama')) OR + (t.k = 'camera:type' AND (t.v = 'fixed' OR t.v = 'panning' OR t.v = 'dome')) OR (t.k = 'surveillance:type' AND (t.v = 'guard' OR t.v = 'ALPR')) OR (t.k = 'surveillance' AND ( t.v = 'level_crossing' OR diff --git a/web/www/sunders/i18n/stats/de.json b/web/www/sunders/i18n/stats/de.json index c067237..ab6bd26 100644 --- a/web/www/sunders/i18n/stats/de.json +++ b/web/www/sunders/i18n/stats/de.json @@ -59,9 +59,6 @@ "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", diff --git a/web/www/sunders/i18n/stats/en.json b/web/www/sunders/i18n/stats/en.json index ad27654..bcf416d 100644 --- a/web/www/sunders/i18n/stats/en.json +++ b/web/www/sunders/i18n/stats/en.json @@ -59,9 +59,6 @@ "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", diff --git a/web/www/sunders/i18n/stats/es.json b/web/www/sunders/i18n/stats/es.json index b30a830..776731e 100644 --- a/web/www/sunders/i18n/stats/es.json +++ b/web/www/sunders/i18n/stats/es.json @@ -59,9 +59,6 @@ "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", diff --git a/web/www/sunders/i18n/stats/fr.json b/web/www/sunders/i18n/stats/fr.json index b6a20a9..8ecc09b 100644 --- a/web/www/sunders/i18n/stats/fr.json +++ b/web/www/sunders/i18n/stats/fr.json @@ -59,9 +59,6 @@ "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", diff --git a/web/www/sunders/i18n/stats/it.json b/web/www/sunders/i18n/stats/it.json index dd9ea09..f4b262a 100644 --- a/web/www/sunders/i18n/stats/it.json +++ b/web/www/sunders/i18n/stats/it.json @@ -59,9 +59,6 @@ "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", diff --git a/web/www/sunders/i18n/stats/ru.json b/web/www/sunders/i18n/stats/ru.json index fcd8d20..cf2f560 100644 --- a/web/www/sunders/i18n/stats/ru.json +++ b/web/www/sunders/i18n/stats/ru.json @@ -59,9 +59,6 @@ "type5-0": "АРНЗ", "type5-1": "Автоматическое Распознавание Номерных Знаков", "type5-2": "АРНЗ", - "type6-0": "Панорамная камера", - "type6-1": "обычно наблюдает зону обзора 180° или 360°", - "type6-2": "Панорамная", "all": "все", "Jan": "Янв", diff --git a/web/www/sunders/js/leafletembed_functions.js b/web/www/sunders/js/leafletembed_functions.js index 1cbdd46..6b38ce4 100644 --- a/web/www/sunders/js/leafletembed_functions.js +++ b/web/www/sunders/js/leafletembed_functions.js @@ -145,11 +145,11 @@ function onStateChanged() { } // Add camera icon. else { - plotLatLng = new L.LatLng(plotList[i].lat, plotList[i].lon); - var plotType = getPlotType(plotList[i]); - plotMarker = getPlotMarkerCamera(plotList[i], plotLatLng, plotType); - try { + plotLatLng = new L.LatLng(plotList[i].lat, plotList[i].lon); + var plotType = getPlotType(plotList[i]); + plotMarker = getPlotMarkerCamera(plotList[i], plotLatLng, plotType); + // 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,15 +194,13 @@ function onStateChanged() { } // Add camera's field of view. - if (plotFocus) { - map.addLayer(plotFocus); - plotLayers.push(plotFocus); - } + map.addLayer(plotFocus); + plotLayers.push(plotFocus); + + // Add camera details to camera marker. + addCameraDetailsData(plotMarker, plotList[i]); } catch(e) { } - - // Add camera details to camera marker. - addCameraDetailsData(plotMarker, plotList[i]); } if (plotMarker !== '') { diff --git a/web/www/sunders/json/symbology.json b/web/www/sunders/json/symbology.json index 636140a..2332b3f 100644 --- a/web/www/sunders/json/symbology.json +++ b/web/www/sunders/json/symbology.json @@ -8,7 +8,7 @@ "description": "desc-panning" }, { "icons": [ { "src": "domeAll.png", "alt": "icon-dome-alt" } ], "description": "desc-dome" }, - { "icons": [ { "src": "panoramaAll.png", "alt": "icon-panorama-alt" } ], + { "icons": [ { "src": "panorama.png", "alt": "icon-panorama-alt" } ], "description": "desc-panorama" }, { "icons": [ { "src": "guardAll.png", "alt": "icon-guard-alt" } ], "description": "desc-guard" },