Spitfire/Search
Spitfire/Search
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for map results page
Some checks failed
Run Integration Tests / test (push) Failing after 19m14s
Details

Browse source
This commit is contained in:
partisan 2025-06-30 14:48:18 +02:00
parent 04fb53cf11
commit 43d7068c7a
48 changed files with 120 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lang/af/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Strate"
msgid "satellite"
msgstr "Satelliet"
msgid "esri_satellite"
msgstr "Esri Satelliet"
msgid "topographic"
msgstr "Topografiese"

2
lang/ar/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "شوارع"
msgid "satellite"
msgstr "قمر صناعي"
msgid "esri_satellite"
msgstr "قمر صناعي ESRI"
msgid "topographic"
msgstr "طوبوغرافي"

2
lang/be/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Вуліцы"
msgid "satellite"
msgstr "Спадарожнік"
msgid "esri_satellite"
msgstr "Спадарожнік ESRI"
msgid "topographic"
msgstr "Тапаграфічная"

2
lang/bg/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Улици"
msgid "satellite"
msgstr "Сателит"
msgid "esri_satellite"
msgstr "ESRI Сателит"
msgid "topographic"
msgstr "Топографска"

2
lang/ca/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Carrers"
msgid "satellite"
msgstr "Satèl·lit"
msgid "esri_satellite"
msgstr "Satèl·lit ESRI"
msgid "topographic"
msgstr "Topogràfic"

2
lang/cs/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Ulice"
msgid "satellite"
msgstr "Satelitní"
msgid "esri_satellite"
msgstr "Esri Satelitní"
msgid "topographic"
msgstr "Topografická"

2
lang/da/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Gader"
msgid "satellite"
msgstr "Satellit"
msgid "esri_satellite"
msgstr "ESRI Satellit"
msgid "topographic"
msgstr "Topografisk"

2
lang/de/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Straßen"
msgid "satellite"
msgstr "Satellit"
msgid "esri_satellite"
msgstr "ESRI-Satellit"
msgid "topographic"
msgstr "Topographisch"

2
lang/el/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Δρόμοι"
msgid "satellite"
msgstr "Δορυφόρος"
msgid "esri_satellite"
msgstr "ESRI Δορυφόρος"
msgid "topographic"
msgstr "Τοπογραφικός"

2
lang/en/LC_MESSAGES/default.po
View file

@ -190,8 +190,6 @@ msgstr "Streets"
msgid "satellite"
msgstr "Satellite"
msgid "esri_satellite"
msgstr "Esri Satellite"
msgid "topographic"
msgstr "Topographic"

2
lang/eo/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Stratoj"
msgid "satellite"
msgstr "Satelito"
msgid "esri_satellite"
msgstr "ESRI Satelito"
msgid "topographic"
msgstr "Topografia"

2
lang/es/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Calles"
msgid "satellite"
msgstr "Satélite"
msgid "esri_satellite"
msgstr "Satélite ESRI"
msgid "topographic"
msgstr "Topográfico"

2
lang/et/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Tänavad"
msgid "satellite"
msgstr "Satelliit"
msgid "esri_satellite"
msgstr "ESRI Satelliit"
msgid "topographic"
msgstr "Topograafiline"

2
lang/fa/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "خیابان‌ها"
msgid "satellite"
msgstr "ماهواره"
msgid "esri_satellite"
msgstr "ماهواره ESRI"
msgid "topographic"
msgstr "توپوگرافی"

2
lang/fi/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Kadut"
msgid "satellite"
msgstr "Satelliitti"
msgid "esri_satellite"
msgstr "ESRI Satelliitti"
msgid "topographic"
msgstr "Topografinen"

2
lang/fr/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Rues"
msgid "satellite"
msgstr "Satellite"
msgid "esri_satellite"
msgstr "Satellite ESRI"
msgid "topographic"
msgstr "Topographique"

2
lang/hi/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "सड़कें"
msgid "satellite"
msgstr "सैटेलाइट"
msgid "esri_satellite"
msgstr "ESRI सैटेलाइट"
msgid "topographic"
msgstr "टोपोग्राफिक"

2
lang/hr/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Ulice"
msgid "satellite"
msgstr "Satelit"
msgid "esri_satellite"
msgstr "ESRI Satelit"
msgid "topographic"
msgstr "Topografski"

2
lang/hu/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Utcák"
msgid "satellite"
msgstr "Műhold"
msgid "esri_satellite"
msgstr "ESRI Műhold"
msgid "topographic"
msgstr "Topográfiai"

2
lang/hy/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Փողոցներ"
msgid "satellite"
msgstr "Արհեստական արբանյակ"
msgid "esri_satellite"
msgstr "ESRI Արհեստական արբանյակ"
msgid "topographic"
msgstr "Տոպոգրաֆիկ"

2
lang/id/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Jalan"
msgid "satellite"
msgstr "Satelit"
msgid "esri_satellite"
msgstr "Satelit ESRI"
msgid "topographic"
msgstr "Topografi"

2
lang/it/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Strade"
msgid "satellite"
msgstr "Satellitare"
msgid "esri_satellite"
msgstr "Satellitare ESRI"
msgid "topographic"
msgstr "Topografico"

2
lang/iw/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "רחובות"
msgid "satellite"
msgstr "לוויין"
msgid "esri_satellite"
msgstr "לוויין ESRI"
msgid "topographic"
msgstr "טופוגרפי"

2
lang/ja/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "ストリート"
msgid "satellite"
msgstr "衛星"
msgid "esri_satellite"
msgstr "ESRI 衛星"
msgid "topographic"
msgstr "地形図"

2
lang/ko/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "거리"
msgid "satellite"
msgstr "위성"
msgid "esri_satellite"
msgstr "ESRI 위성"
msgid "topographic"
msgstr "지형도"

2
lang/lt/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Gatvės"
msgid "satellite"
msgstr "Palydovas"
msgid "esri_satellite"
msgstr "ESRI palydovas"
msgid "topographic"
msgstr "Topografinis"

2
lang/lv/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Ielas"
msgid "satellite"
msgstr "Satelīts"
msgid "esri_satellite"
msgstr "ESRI satelīts"
msgid "topographic"
msgstr "Topogrāfiskais"

2
lang/nl/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Straten"
msgid "satellite"
msgstr "Satelliet"
msgid "esri_satellite"
msgstr "ESRI Satelliet"
msgid "topographic"
msgstr "Topografisch"

2
lang/no/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Gater"
msgid "satellite"
msgstr "Satellitt"
msgid "esri_satellite"
msgstr "ESRI Satellitt"
msgid "topographic"
msgstr "Topografisk"

2
lang/pl/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Ulice"
msgid "satellite"
msgstr "Satelita"
msgid "esri_satellite"
msgstr "Esri Satelita"
msgid "topographic"
msgstr "Topograficzna"

2
lang/pt/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Ruas"
msgid "satellite"
msgstr "Satélite"
msgid "esri_satellite"
msgstr "Satélite ESRI"
msgid "topographic"
msgstr "Topográfico"

2
lang/ro/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Străzi"
msgid "satellite"
msgstr "Satelit"
msgid "esri_satellite"
msgstr "Satelit ESRI"
msgid "topographic"
msgstr "Topografic"

2
lang/ru/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Улицы"
msgid "satellite"
msgstr "Спутник"
msgid "esri_satellite"
msgstr "Спутник ESRI"
msgid "topographic"
msgstr "Топографическая"

2
lang/sk/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Ulice"
msgid "satellite"
msgstr "Satelit"
msgid "esri_satellite"
msgstr "ESRI Satelit"
msgid "topographic"
msgstr "Topografické"

2
lang/sl/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Ulice"
msgid "satellite"
msgstr "Satelit"
msgid "esri_satellite"
msgstr "ESRI satelit"
msgid "topographic"
msgstr "Topografsko"

2
lang/sr/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Улице"
msgid "satellite"
msgstr "Сателит"
msgid "esri_satellite"
msgstr "ESRI сателит"
msgid "topographic"
msgstr "Топографска"

2
lang/sv/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Gator"
msgid "satellite"
msgstr "Satellit"
msgid "esri_satellite"
msgstr "ESRI Satellit"
msgid "topographic"
msgstr "Topografisk"

2
lang/sw/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Mitaa"
msgid "satellite"
msgstr "Setilaiti"
msgid "esri_satellite"
msgstr "Setilaiti ya ESRI"
msgid "topographic"
msgstr "Topografia"

2
lang/th/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "ถนน"
msgid "satellite"
msgstr "ดาวเทียม"
msgid "esri_satellite"
msgstr "ดาวเทียม ESRI"
msgid "topographic"
msgstr "ภูมิประเทศ"

2
lang/tl/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Mga Kalye"
msgid "satellite"
msgstr "Satelite"
msgid "esri_satellite"
msgstr "ESRI Satelite"
msgid "topographic"
msgstr "Topograpiko"

2
lang/tr/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Sokaklar"
msgid "satellite"
msgstr "Uydu"
msgid "esri_satellite"
msgstr "ESRI Uydu"
msgid "topographic"
msgstr "Topografik"

2
lang/uk/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Вулиці"
msgid "satellite"
msgstr "Супутник"
msgid "esri_satellite"
msgstr "Супутник ESRI"
msgid "topographic"
msgstr "Топографічна"

2
lang/vi/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "Đường phố"
msgid "satellite"
msgstr "Vệ tinh"
msgid "esri_satellite"
msgstr "Vệ tinh ESRI"
msgid "topographic"
msgstr "Địa hình"

2
lang/zh-CN/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "街道"
msgid "satellite"
msgstr "卫星"
msgid "esri_satellite"
msgstr "ESRI 卫星"
msgid "topographic"
msgstr "地形图"

2
lang/zh-TW/LC_MESSAGES/default.po
View file

@ -184,8 +184,6 @@ msgstr "街道"
msgid "satellite"
msgstr "衛星"
msgid "esri_satellite"
msgstr "ESRI 衛星"
msgid "topographic"
msgstr "地形"

64
static/css/style-map.css
View file

@ -1,3 +1,28 @@
/* Unable to find ... message */
.message {
position: absolute;
bottom: 20px;
left: 50%;
transform: translateX(-50%);
padding: 10px;
background-color: var(--search-bg);
border: 1px solid var(--border);
border-radius: 5px;
box-shadow: 0 0 10px var(--box-shadow);
z-index: 1000;
width: auto;
max-width: 80%;
text-align: center;
color: var(--text-color);
}
/* Map container */
#map {
height: calc(100% - 65px);
width: 100%;
top: 65px;
}
.leaflet-control-layers-toggle {
background-color: var(--button) !important;
border: 1px solid var(--border) !important;
@ -35,10 +60,26 @@
}
.leaflet-bar a,
.leaflet-bar a:focus,
.leaflet-bar a:active,
.leaflet-bar a:hover {
background-color: var(--button) !important;
border: 1px solid var(--border) !important;
color: var(--fg) !important;
box-shadow: 0 2px 12px rgba(0,0,0,0.24) !important;
transition: background-color 0.2s;
}
.leaflet-control-layers-toggle,
.leaflet-control-layers-expanded {
background-color: var(--button) !important;
border: 1px solid var(--border) !important;
color: var(--fg) !important;
}
.leaflet-bar a:hover,
.leaflet-bar a:focus {
background-color: var(--search-select) !important;
}
.leaflet-popup-content-wrapper,
@ -86,25 +127,8 @@
text-shadow: 1px 1px 2px var(--border) !important;
}
/* Ensuring dark theme compliance */
@media (prefers-color-scheme: dark) {
.leaflet-control-locate,
.leaflet-control-layers-toggle,
.leaflet-bar a,
.leaflet-bar a:hover,
.leaflet-popup-content-wrapper,
.leaflet-popup-tip,
.leaflet-control-attribution,
.leaflet-control-scale,
.leaflet-control-scale-line {
background-color: var(--button) !important;
border: 1px solid var(--border) !important;
color: var(--fg) !important;
text-shadow: 1px 1px 2px var(--background-color) !important;
}
.leaflet-control-attribution a {
color: var(--link) !important;
@media only screen and (max-width: 880px) {
#map {
top: 130px !important;
}
}

71
static/css/style.css
View file

@ -843,50 +843,6 @@ p {
margin-left: 175px;
}
/* MAP */
.message {
position: absolute;
bottom: 20px;
left: 50%;
transform: translateX(-50%);
padding: 10px;
background-color: var(--search-bg);
border: 1px solid var(--border);
border-radius: 5px;
box-shadow: 0 0 10px var(--box-shadow);
z-index: 1000;
width: auto;
max-width: 80%;
text-align: center;
color: var(--text-color);
}
/* Map container */
#map {
height: calc(100% - 60px);
width: 100%;
top: 60px;
}
/* Leaflet control buttons */
.leaflet-control-locate {
background-color: var(--button) !important;
border: 1px solid var(--border) !important;
color: var(--fg) !important;
}
/* Leaflet control buttons */
.leaflet-control-locate {
background-color: var(--button) !important;
border: 1px solid var(--border) !important;
color: var(--fg) !important;
}
/* Leaflet attribution control */
/* Leaflet scale control */
/* Favicon styling */
.result_header {
display: flex;
@ -911,8 +867,6 @@ p {
box-shadow: 0 0 2px rgba(0, 0, 0, 0.4);
}
/* Result link styling */
/* Result item spacing */
.result_item {
margin-bottom: 1.5rem;
@ -966,13 +920,6 @@ p {
gap: 4px;
}
/*
.result-path::before {
content: "›";
margin: 0 4px;
opacity: 0.6;
} */
body,
h1,
p,
@ -1312,21 +1259,7 @@ button {
}
.results_settings {
display: flex;
/* Enable flexbox */
flex-wrap: wrap;
/* Allow elements to wrap onto new lines when necessary */
}
}
/* Ensuring dark theme compliance */
@media (prefers-color-scheme: dark) {
.leaflet-control-locate {
background-color: var(--button) !important;
border: 1px solid var(--border) !important;
color: var(--fg) !important;
text-shadow: 1px 1px 2px var(--background-color) !important;
/* Dark theme shadow adjustment */
display: flex; /* Enable flexbox */
flex-wrap: wrap; /* Allow elements to wrap onto new lines when necessary */
}
}

44
templates/map.html
View file

@ -171,43 +171,57 @@
{{ if .Found }}
<script>
document.addEventListener('DOMContentLoaded', function () {
var map = L.map('map').setView([{{ .Latitude }}, {{ .Longitude }}], 13); // Set view to found coordinates
var map = L.map('map').setView([{{ .Latitude }}, {{ .Longitude }}], 13);
// Base layers
// Streets
var streets = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
maxZoom: 19,
maxZoom: 20,
attribution: '© OpenStreetMap contributors'
});
var satellite = L.tileLayer('https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', {
// Satellite (correct cords order is: {z}/{y}/{x})
var satellite = L.tileLayer(
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
maxZoom: 19,
attribution: '© OpenStreetMap contributors'
});
var esriSat = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{x}/{y}', {
maxZoom: 19,
attribution: 'Tiles © Esri'
});
attribution: 'Tiles © Esri — Source: Esri, Earthstar Geographics, Maxar, GeoEye, CNES/Airbus DS, USDA, USGS, AeroGRID, IGN, and the GIS User Community'
}
);
// Topographic
var topo = L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', {
maxZoom: 17,
attribution: '© OpenTopoMap contributors'
attribution: '© <a href="https://opentopomap.org">OpenTopoMap</a> contributors'
});
var baseMaps = {
"{{ translate "streets" }}": streets,
"{{ translate "satellite" }}": satellite,
"{{ translate "esri_satellite" }}": esriSat,
"{{ translate "topographic" }}": topo
};
streets.addTo(map); // Add default layer
streets.addTo(map);
// Layer control
L.control.layers(baseMaps).addTo(map);
// SVG Marker
var svgIcon = L.divIcon({
className: "",
html: `
<svg width="32" height="48" viewBox="0 0 32 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<ellipse cx="16" cy="17" rx="13" ry="13" fill="var(--blue)"/>
<path d="M16 48c8-13 13-18 13-31a13 13 0 1 0-26 0c0 13 5 18 13 31z" fill="var(--blue)" stroke="var(--border)" stroke-width="2"/>
<circle cx="16" cy="17" r="6" fill="var(--border)" />
</svg>
`,
iconSize: [32, 48],
iconAnchor: [16, 47],
popupAnchor: [0, -40],
});
// Marker with passed coordinates
L.marker([{{ .Latitude }}, {{ .Longitude }}]).addTo(map)
L.marker([{{ .Latitude }}, {{ .Longitude }}], {icon: svgIcon})
.addTo(map)
.bindPopup('{{ .Query }}');
// Add scale control