diff --git a/webapp/public/alprs/elsag-1.jpg b/webapp/public/alprs/elsag-1.jpg new file mode 100644 index 0000000..8120c3c Binary files /dev/null and b/webapp/public/alprs/elsag-1.jpg differ diff --git a/webapp/public/alprs/elsag-2.jpg b/webapp/public/alprs/elsag-2.jpg new file mode 100644 index 0000000..e27e0c3 Binary files /dev/null and b/webapp/public/alprs/elsag-2.jpg differ diff --git a/webapp/public/alprs/elsag-3.jpg b/webapp/public/alprs/elsag-3.jpg new file mode 100644 index 0000000..47439f3 Binary files /dev/null and b/webapp/public/alprs/elsag-3.jpg differ diff --git a/webapp/public/alprs/elsag-4.jpg b/webapp/public/alprs/elsag-4.jpg new file mode 100644 index 0000000..b245191 Binary files /dev/null and b/webapp/public/alprs/elsag-4.jpg differ diff --git a/webapp/public/alprs/flock-1.jpg b/webapp/public/alprs/flock-1.jpg new file mode 100644 index 0000000..e071986 Binary files /dev/null and b/webapp/public/alprs/flock-1.jpg differ diff --git a/webapp/public/alprs/flock-2.jpg b/webapp/public/alprs/flock-2.jpg new file mode 100644 index 0000000..c11d28b Binary files /dev/null and b/webapp/public/alprs/flock-2.jpg differ diff --git a/webapp/public/alprs/flock-3.jpg b/webapp/public/alprs/flock-3.jpg new file mode 100644 index 0000000..ec36843 Binary files /dev/null and b/webapp/public/alprs/flock-3.jpg differ diff --git a/webapp/public/alprs/flock-4.jpg b/webapp/public/alprs/flock-4.jpg new file mode 100644 index 0000000..3ccb292 Binary files /dev/null and b/webapp/public/alprs/flock-4.jpg differ diff --git a/webapp/public/alprs/motorola-1.jpg b/webapp/public/alprs/motorola-1.jpg new file mode 100644 index 0000000..32e91e1 Binary files /dev/null and b/webapp/public/alprs/motorola-1.jpg differ diff --git a/webapp/public/alprs/motorola-2.jpg b/webapp/public/alprs/motorola-2.jpg new file mode 100644 index 0000000..6d3678d Binary files /dev/null and b/webapp/public/alprs/motorola-2.jpg differ diff --git a/webapp/public/alprs/motorola-3.jpg b/webapp/public/alprs/motorola-3.jpg new file mode 100644 index 0000000..389ad0e Binary files /dev/null and b/webapp/public/alprs/motorola-3.jpg differ diff --git a/webapp/public/alprs/motorola-4.jpg b/webapp/public/alprs/motorola-4.jpg new file mode 100644 index 0000000..dd261f7 Binary files /dev/null and b/webapp/public/alprs/motorola-4.jpg differ diff --git a/webapp/public/alprs/neology-1.jpg b/webapp/public/alprs/neology-1.jpg new file mode 100644 index 0000000..bd9db2b Binary files /dev/null and b/webapp/public/alprs/neology-1.jpg differ diff --git a/webapp/public/alprs/neology-2.jpg b/webapp/public/alprs/neology-2.jpg new file mode 100644 index 0000000..7ab74b8 Binary files /dev/null and b/webapp/public/alprs/neology-2.jpg differ diff --git a/webapp/public/chicago-pd.jpg b/webapp/public/chicago-pd.jpg deleted file mode 100644 index 69de0de..0000000 Binary files a/webapp/public/chicago-pd.jpg and /dev/null differ diff --git a/webapp/public/flock-1.jpg b/webapp/public/flock-1.jpg deleted file mode 100644 index f973630..0000000 Binary files a/webapp/public/flock-1.jpg and /dev/null differ diff --git a/webapp/public/flock-2.jpg b/webapp/public/flock-2.jpg deleted file mode 100644 index 5b0bb8b..0000000 Binary files a/webapp/public/flock-2.jpg and /dev/null differ diff --git a/webapp/public/flock-3.jpg b/webapp/public/flock-3.jpg deleted file mode 100644 index cc982be..0000000 Binary files a/webapp/public/flock-3.jpg and /dev/null differ diff --git a/webapp/public/flock-4.jpg b/webapp/public/flock-4.jpg deleted file mode 100644 index a03ae97..0000000 Binary files a/webapp/public/flock-4.jpg and /dev/null differ diff --git a/webapp/public/flock-5.jpg b/webapp/public/flock-5.jpg deleted file mode 100644 index 22f9c1b..0000000 Binary files a/webapp/public/flock-5.jpg and /dev/null differ diff --git a/webapp/public/flock-6.jpg b/webapp/public/flock-6.jpg deleted file mode 100644 index 0e5e4a9..0000000 Binary files a/webapp/public/flock-6.jpg and /dev/null differ diff --git a/webapp/public/flock-logo.svg b/webapp/public/flock-logo.svg new file mode 100644 index 0000000..0a0915d --- /dev/null +++ b/webapp/public/flock-logo.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/webapp/public/neology-1.jpg b/webapp/public/neology-1.jpg deleted file mode 100644 index 5d48547..0000000 Binary files a/webapp/public/neology-1.jpg and /dev/null differ diff --git a/webapp/public/redlight-camera.jpg b/webapp/public/redlight-camera.jpg deleted file mode 100644 index dc00bd8..0000000 Binary files a/webapp/public/redlight-camera.jpg and /dev/null differ diff --git a/webapp/public/security-camera.jpg b/webapp/public/security-camera.jpg deleted file mode 100644 index 43f99b7..0000000 Binary files a/webapp/public/security-camera.jpg and /dev/null differ diff --git a/webapp/public/toll-camera.jpg b/webapp/public/toll-camera.jpg deleted file mode 100644 index 7e81b8b..0000000 Binary files a/webapp/public/toll-camera.jpg and /dev/null differ diff --git a/webapp/public/traffic-camera.jpg b/webapp/public/traffic-camera.jpg deleted file mode 100644 index 57c5c54..0000000 Binary files a/webapp/public/traffic-camera.jpg and /dev/null differ diff --git a/webapp/public/vigilant-1.jpg b/webapp/public/vigilant-1.jpg deleted file mode 100644 index ba85e67..0000000 Binary files a/webapp/public/vigilant-1.jpg and /dev/null differ diff --git a/webapp/public/vigilant-2.jpg b/webapp/public/vigilant-2.jpg deleted file mode 100644 index ddf7bf4..0000000 Binary files a/webapp/public/vigilant-2.jpg and /dev/null differ diff --git a/webapp/public/vigilant-3.jpg b/webapp/public/vigilant-3.jpg deleted file mode 100644 index ee68041..0000000 Binary files a/webapp/public/vigilant-3.jpg and /dev/null differ diff --git a/webapp/src/assets/main.css b/webapp/src/assets/main.css index b03096b..325fd3a 100644 --- a/webapp/src/assets/main.css +++ b/webapp/src/assets/main.css @@ -32,6 +32,10 @@ p { font-family: "PT Serif", serif; } +.sans-serif { + font-family: unset !important; +} + /* Prevent Scrolling Horizontally */ html, body { overflow-x: hidden; diff --git a/webapp/src/components/DFMapPopup.vue b/webapp/src/components/DFMapPopup.vue index 22f510d..0e3deb3 100644 --- a/webapp/src/components/DFMapPopup.vue +++ b/webapp/src/components/DFMapPopup.vue @@ -64,8 +64,10 @@ const props = defineProps({ const isFaceRecognition = computed(() => props.alpr.tags.brand === 'Avigilon'); -const cardinalDirection = computed(() => - props.alpr.tags.direction === undefined ? 'Unknown Direction' : degreesToCardinal(parseInt(props.alpr.tags.direction)) +const cardinalDirection = computed(() => { + const direction = props.alpr.tags.direction || props.alpr.tags["camera:direction"]; + direction === undefined ? 'Unknown Direction' : degreesToCardinal(parseInt(direction)) +} ); function degreesToCardinal(degrees: number): string { diff --git a/webapp/src/components/LeafletMap.vue b/webapp/src/components/LeafletMap.vue index 5f2d715..e724e07 100644 --- a/webapp/src/components/LeafletMap.vue +++ b/webapp/src/components/LeafletMap.vue @@ -56,7 +56,7 @@ let currentLocationLayer: FeatureGroup; // Marker Creation Utilities function createSVGMarker(alpr: ALPR): string { - const orientationDegrees = alpr.tags.direction; + const orientationDegrees = alpr.tags.direction || alpr.tags['camera:direction']; const fovPath = ` @@ -73,7 +73,7 @@ function createSVGMarker(alpr: ALPR): string { } function createMarker(alpr: ALPR): Marker | CircleMarker { - if (hasPlottableOrientation(alpr.tags.direction)) { + if (hasPlottableOrientation(alpr.tags.direction || alpr.tags['camera:direction'])) { const icon = L.divIcon({ className: 'leaflet-data-marker', html: createSVGMarker(alpr), diff --git a/webapp/src/components/NewVisitor.vue b/webapp/src/components/NewVisitor.vue new file mode 100644 index 0000000..9beb7eb --- /dev/null +++ b/webapp/src/components/NewVisitor.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/webapp/src/components/OSMTagSelector.vue b/webapp/src/components/OSMTagSelector.vue index a434d07..ec0b6ce 100644 --- a/webapp/src/components/OSMTagSelector.vue +++ b/webapp/src/components/OSMTagSelector.vue @@ -1,6 +1,6 @@