v8.3.0

CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v8.3.0
+
+**Date:** 30/11/2024
+
+Updated
+ - fontawesome 6.7.1
+
+Site changes
+ - Adjust brightness rather than invert map tiles for darkmode
+ - FHRS ratings use a compact FontAwesome style instead of PNG's
+ - Check if OverPass server supports attic data
+ - Better localStorage variable naming
+ - Xmas updates
+ - More of the usual bug fixes and code improvements
+
+
 ## v8.2.0
 
 **Date:** 20/07/2024

README.md

@@ -15,14 +15,14 @@ https://github.com/Dr-Mx/bexhill-osm/assets/20068052/219ff558-a94b-46af-8f66-8eb
 ~ Mobile and desktop friendly
 
 ~ Light/dark theme support
-<details><summary>Map display options</summary>
+<details><summary>Map display options (click for more)</summary>
 
 - Switch between metric and imperial
 - Adjust overlay opacity
 - Set map layer offset
 </details>
 
-<details><summary>Detailed POI markers through Overpass API</summary>
+<details><summary>Detailed POI markers through Overpass API  (click for more)</summary>
 
 - Bookmark favourite POIs
 - Facility icons
@@ -81,7 +81,7 @@ https://github.com/Dr-Mx/bexhill-osm/assets/20068052/219ff558-a94b-46af-8f66-8eb
 
 ~ OpenWeatherMap API
 
-<details><summary>Development tools</summary>
+<details><summary>Development tools (click for more)</summary>
 
 - Display OSM notes
 - Export current query to Overpass Turbo

web/.htaccess

@@ -11,10 +11,10 @@ RewriteRule ^(.*)$ https://%1/$1 [R=301,L]
 Redirect /ext /?m=general&t=none#13/50.8470/0.4670
 Redirect /scarecrow /?m=general&t=none&g=scarecrow
 Redirect /streetnames /tour/itemStreetNames/streetnames.html
-Redirect /manorhouse /?t=tour&g=manorHouse&u=manor&o=os1955
+Redirect /manorhouse /?t=tour&m=osmtopo&g=manorHouse&u=manor
 Redirect /millifest /?t=none&g=milligan
 Redirect /ww2 /?m=general&t=tour&g=bombmap&u=ww2
-Redirect /xmas /?t=none&g=xmas
+Redirect /xmas /?m=bosm&t=none&g=xmas
 
 # php -- BEGIN cPanel-generated handler, do not edit
 # This domain inherits the “PHP” package.

web/assets/css/dark-theme.css

@@ -1,15 +1,15 @@
 :root {
-	--text-color: #bbbbbb;
+	--text-color: #cccccc;
 	--hover-color: #999999;
 	--bg-color: #2d2d2d;
-	--bg-color2: rgba(50, 50, 50, 0.9);
+	--bg-color2: rgba(25, 30, 45, 0.85);
 	--scr-thumb: #555555;
 	--scr-track: #2d2d2d;
 	--scroll-shadow: 0, 0, 0;
 	--scroll-shadow-popup: 0, 0, 0;
 }
 body {
-	background-color: #111111;
+	background-color: #333333;
 }
 .spinner svg circle {
 	fill: rgba(0, 0, 0, 0.75);
@@ -26,18 +26,18 @@ body {
 }
 .sidebar-tabs, footer, #home-box, #holiday-xmas-msg, .sidebar-anchor, input:not([type="range"]), hr, select, button, .leaflet-control-geocoder input, .slider::before,
 .leaflet-control-geocoder, .leaflet-contextmenu, #modal-head, .leaflet-container a.leaflet-popup-close-button, .leaflet-control-geocoder-selected, .fancybox-bg,
-#pois-results-list tr:hover, .pois-checkbox-selected, .pois-checkbox > label:hover, .leaflet-touch .leaflet-bar:not(#control-ww2, #control-opacity), #walking a img {
+#pois-results-list tr:hover, .pois-checkbox-selected, .pois-checkbox > label:hover, .leaflet-touch .leaflet-bar:not(#control-ww2, #control-opacity) {
 	background-color: var(--bg-color) !important;
 }
 #modal, #control-opacity, .leaflet-bar > a, .leaflet-bar button, .leaflet-popup-content-wrapper, .leaflet-popup-tip, .sidebar-content, .leaflet-control-layers-expanded, .leaflet-control-layers,
 .leaflet-control-geocoder, .leaflet-control-geocoder-alternatives, .leaflet-control-geocoder-alternatives li:hover, .leaflet-tooltip, .popup-img-attrib, .popup-navigate-background {
 	background-color: var(--bg-color2) !important;
 }
 .leaflet-control-layers-list input + span:before {
-	color: #444444;
+	color: var(--scr-thumb);
 }
 #home-weather, #home-new-feed ul {
-	color: #688c81;
+	color: #a5bdb6;
 }
 .leaflet-bar a, .leaflet-bar a:hover, .settings-label {
 	border-bottom: 1px solid var(--bg-color);
@@ -57,8 +57,8 @@ input[type=range] {
 .theme-scroll {
 	scrollbar-color: var(--scr-thumb) var(--scr-track) !important;
 }
-.theme-invert {
-	filter: invert(90%) hue-rotate(180deg) contrast(80%);
+.leaflet-tile-pane {
+	filter: brightness(0.8) contrast(1.1);
 }
 .sidebar-header-text, .sidebar-close {
 	color: #dddddd;
@@ -76,6 +76,9 @@ input[type=range]:hover::-moz-range-thumb { background-color: var(--hover-color)
 #pois-results-list tr, .popup-header, .leaflet-control-geocoder-alternatives li:not(:last-child) {
 	border-bottom: 2px solid var(--bg-color) !important;
 }
+#walking a img {
+	background-color: var(--text-color);
+}
 .leaflet-control-scale-line, .pois-result-selected {
 	background-color: rgba(0, 0, 0, 0.5);
 }
@@ -90,10 +93,10 @@ input[type=range]:hover::-moz-range-thumb { background-color: var(--hover-color)
 	border-color: #666666;
 }
 button:disabled, button:disabled:hover, button:disabled::after, button:disabled:hover::after {
-	color: #555555 !important;
+	color: var(--scr-thumb) !important;
 }
 input:not([type=range]), select, #sidebar button:not(.tutorial-button), .leaflet-tooltip {
-	border: 1px solid #333 !important;
+	border: 1px solid var(--scr-thumb) !important;
 }
 .leaflet-control-geocoder input, .leaflet-control-geocoder-alternatives a, .fancybox-button, .tutorial-button {
 	border: none !important;
@@ -105,16 +108,19 @@ input:not([type=range]), select, #sidebar button:not(.tutorial-button), .leaflet
 	background: none repeat scroll 0 0 #000000;
 }
 .sidebar-tabs > ul > li:hover, .slider {
-	background-color: #444444;
+	background-color: var(--scr-thumb);
 }
 .slider:hover {
 	background-color: #666666;
 }
 .popup-header {
 	background-color: rgba(12, 12, 13, 0.5) !important;
 }
-.popup-fhrs > a > img {
-	opacity: 75%;
+.popup-fhrs .fa-stack {
+	border: 4px solid #222222;
+}
+.popup-tag-icon {
+	color: #777777;
 }
 .leaflet-container a.leaflet-popup-close-button {
 	border: 3px solid #333333;
@@ -146,10 +152,8 @@ input:not([type=range]), select, #sidebar button:not(.tutorial-button), .leaflet
 .sidebar-close:hover { color: #bbbbbb; }
 .sidebar-notif { border-color: var(--bg-color); }
 .xmasMapTree { filter: drop-shadow(0px 10px 9px #000000); }
-.circleMarker { fill: #000000; }
-.pois-results-circleMarker { color: #000000; }
 .popup-xmas .leaflet-popup-content-wrapper, .leaflet-tooltip.popup-xmas, #holiday-xmas-msg {
-	background-blend-mode: lighten;
+	background-blend-mode: difference;
 }
 
 .theme-scroll::-webkit-scrollbar {
@@ -164,5 +168,5 @@ input:not([type=range]), select, #sidebar button:not(.tutorial-button), .leaflet
 	background-color: var(--bg-color);
 }
 .popup-comment, .comment, figcaption {
-	color: #888888;
+	color: var(--hover-color);
 }

web/assets/css/plugins/leaflet-sidebar.css

@@ -55,7 +55,7 @@
 	bottom: 0;
 	height: 100%;
 	background-color: #e5e5e5;
-	background-image: linear-gradient(to right, rgba(0, 0, 0, 0.15), transparent); }
+	background-image: linear-gradient(to right, rgba(0, 0, 64, 0.15), transparent); }
 .sidebar-left .sidebar-tabs {
 	left: 0; }
 .sidebar-tabs, .sidebar-tabs > ul {
@@ -102,7 +102,7 @@
 	position: absolute;
 	top: 0;
 	bottom: 0;
-	background-color: rgba(240, 240, 240, 0.8);
+	background-color: rgba(240, 240, 245, 0.8);
 	overflow: hidden;
 	backdrop-filter: blur(7px); }
 .sidebar-left .sidebar-content {

web/assets/css/site.css

@@ -106,14 +106,14 @@ input[type=text], input[type=date], input[type=number] {
 	position: absolute;
 	width: 20px;
 	height: 15px;
-	font-size: 7pt;
+	font-size: 8pt;
 	font-weight: bold;
 	color: #ffffff;
 	line-height: 15px;
 	background-color: var(--second-color);
 	border-radius: 10px 0 0 10px;
 	right: 0;
-	margin-top: 29px;
+	margin-top: 28px;
 	border: 1px solid #dddddd;
 	display: none;
 	z-index: 1;
@@ -615,7 +615,7 @@ button.tutorial-button:nth-of-type(2) {
 	width: 145px;
 	text-align: center;
 	border-radius: 10px;
-	background-color: rgba(240, 240, 240, 0.8);
+	background-color: rgba(240, 240, 245, 0.8);
 	margin-top: 30px;
 	backdrop-filter: blur(7px);
 }
@@ -1004,14 +1004,16 @@ select:hover:enabled, button:hover:enabled:not(.fancybox-button) {
 	cursor: zoom-in;
 }
 .tooltip-thennow {
+	min-width: 200px;
 	text-align: center;
 	padding: 0;
 }
 .tooltip-thennow img {
 	width: 100%;
-	min-width: 150px;
+	height: 125px;
 	filter: grayscale(1) sepia(0.3);
 	border-radius: 10px 10px 0 0;
+	object-fit: cover;
 }
 .tooltip-thennow span {
 	padding: 0 5px;
@@ -1209,9 +1211,6 @@ input:indeterminate + .slider::before {
 	.popup-img-item {
 		max-height: 175px !important;
 	}
-	.popup-fhrs > a > img {
-		height: 38px;
-	}
 	#btnPoiResultsNext {
 		display: none !important;
 	}
@@ -1236,7 +1235,7 @@ input:indeterminate + .slider::before {
 	box-shadow: 0 1px 5px rgb(0 0 0 / 40%) !important;
 }
 .leaflet-control-layers-expanded, #modal {
-	background-color: rgba(240, 240, 240, 0.8);
+	background-color: rgba(240, 240, 245, 0.8);
 	border: none !important;
 	backdrop-filter: blur(7px);
 }
@@ -1280,11 +1279,12 @@ a.control-layers-title {
 	color: #333333;
 }
 .popup-header-button {
+	top: -2px;
 	float: right;
 	position: relative;
 	color: var(--main-color);
 	padding-left: 5px;
-	top: -2px;
+	padding-bottom: 4px;
 }
 .popup-bookmark > .fa-solid {
 	color: goldenrod;
@@ -1311,15 +1311,18 @@ a.control-layers-title {
 }
 .popup-fhrs {
 	position: relative;
+	top: -2px;
 	float: right;
 	clear: right;
-	padding: 2px 0 0 2px;
 }
-.popup-fhrs > a > img {
-	white-space: nowrap;
-	border-radius: 5px;
-	filter: saturate(50%);
+.popup-fhrs .fa-stack {
+	background-color: #84bd00;
+	border: 4px solid #ddd;
+	border-radius: 10px;
+	width: 2em;
 }
+.popup-fhrs .fa-stack .fa-circle { color: black; }
+.popup-fhrs .fa-stack .fanum { color: white; }
 .popup-body {
 	min-height: 5px;
 }
@@ -1356,6 +1359,7 @@ a.control-layers-title {
 	max-height: var(--popup-tag-long-height);
 	text-align: justify;
 	padding-right: 3px;
+	border-radius: 0 0 0 5px;
 }
 .popup-tag-long .popup-tag-icon {
 	position: sticky;
@@ -1459,13 +1463,13 @@ a.control-layers-title {
 }
 .popup-img-attrib {
 	position: sticky;
-	bottom: 0;
+	bottom: -1px;
 	background-color: rgba(255, 255, 255, 0.75);
 	backdrop-filter: blur(5px);
 	transition: padding-right 200ms ease-in-out;
 }
 .popup-img-attrib a, .popup-img-attrib span {
-	height: 25px;
+	height: 26px;
 	line-height: 10px;
 	display: flex;
 	align-items: center;

web/assets/data/cron.sh

@@ -1,15 +1,15 @@
 #!/bin/sh
 # Cron Jobs, executed daily
 
-# Mapillary sequences
+# ARCHIVED - Mapillary sequences
 # /usr/bin/wget -O /home/bexhillo/public_html/assets/data/panoramas.geojson "https://a.mapillary.com/v3/sequences?bbox=0.3724,50.8025,0.529,50.8785&usernames=bexhill_osm&client_id=dm4wZ3R0VEl0ano1aVdiZXpEdkUwZzplNTdhOTY2N2ZkNjgxZDE3"
 
 # Metadata badges for info page
 # Email
 # /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-email.svg "https://img.shields.io/static/v1?logo=data:image/svg+xml;base64,PCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjwhLS0gVXBsb2FkZWQgdG86IFNWRyBSZXBvLCB3d3cuc3ZncmVwby5jb20sIFRyYW5zZm9ybWVkIGJ5OiBTVkcgUmVwbyBNaXhlciBUb29scyAtLT4KPHN2ZyBmaWxsPSIjZmZmZmZmIiBoZWlnaHQ9IjgwMHB4IiB3aWR0aD0iODAwcHgiIHZlcnNpb249IjEuMSIgaWQ9IkNhcGFfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmlld0JveD0iMCAwIDQ5MCA0OTAiIHhtbDpzcGFjZT0icHJlc2VydmUiIHN0cm9rZT0iI2ZmZmZmZiI+Cg08ZyBpZD0iU1ZHUmVwb19iZ0NhcnJpZXIiIHN0cm9rZS13aWR0aD0iMCIvPgoNPGcgaWQ9IlNWR1JlcG9fdHJhY2VyQ2FycmllciIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cg08ZyBpZD0iU1ZHUmVwb19pY29uQ2FycmllciI+IDxnPiA8Zz4gPGc+IDxwYXRoIGQ9Ik0yOTUuMiwyNTcuOEwyNTEuNCwyOTVjLTMuNSwyLjktOC42LDIuOS0xMiwwbC00My44LTM3LjFMMTYuNyw0MDkuMWg0NTYuNkwyOTUuMiwyNTcuOHoiLz4gPHBvbHlnb24gcG9pbnRzPSIwLDkyLjIgMCwzOTcuOCAxODAuMSwyNDUgIi8+IDxwb2x5Z29uIHBvaW50cz0iMTYuNyw4MC45IDI0NSwyNzQuNiA0NzMuMyw4MC45ICIvPiA8cG9seWdvbiBwb2ludHM9IjMwOS45LDI0NSA0OTAsMzk3LjggNDkwLDkyLjIgIi8+IDwvZz4gPC9nPiA8L2c+IDwvZz4KDTwvc3ZnPg==&color=%23a04900&style=flat&label=email&labelColor=rgba(0,0,0,0.4)&[email protected]"
 # Twitter
 # /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-twitter.svg "https://img.shields.io/twitter/follow/BexhillOSM?logo=x&logoColor=white&labelColor=rgba(0,0,0,0.4)&color=black&label=X-twitter&style=flat"
-# /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-twitter.svg "https://img.shields.io/static/v1?logo=x&logoColor=white&labelColor=rgba(0,0,0,0.4)&color=black&label=X-twitter&style=flat&message=303"
+# /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-twitter.svg "https://img.shields.io/static/v1?logo=x&logoColor=white&labelColor=rgba(0,0,0,0.4)&color=black&label=X-twitter&style=flat&message=310"
 # YouTube
 /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-youtube.svg "https://img.shields.io/youtube/channel/subscribers/UCS3phqTevP6eHysdqvoU1_w?logo=youtube&logoColor=red&labelColor=rgba(0,0,0,0.4)&label=YouTube&color=red&style=flat"
 # /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-youtube.svg "https://img.shields.io/static/v1?logo=youtube&logoColor=red&labelColor=rgba(0,0,0,0.4)&label=YouTube&color=red&style=flat&message=103"
@@ -18,6 +18,6 @@
 # Wikimedia Commons
 /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-wikimedia.svg "https://img.shields.io/badge/dynamic/json?logo=wikimediacommons&logoColor=%2301639a&style=flat&labelColor=rgba(0,0,0,0.4)&color=%2301639a&label=Wikimedia%20Commons&query=%24.counts.6.count&url=https%3A%2F%2Fxtools.wmflabs.org%2Fapi%2Fuser%2Fpages_count%2Fcommons.wikimedia%2FDr-Mx%2F6"
 # Internet Archive
-/usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-archive.svg "https://img.shields.io/badge/dynamic/json?logo=internetarchive&logoColor=white&style=flat&labelColor=rgba(0,0,0,0.4)&color=black&label=Internet%20Archive&query=%24.response.numFound&url=https%3A%2F%2Farchive.org%2Fadvancedsearch.php%3Fq%3Duploader%253A%28Dr-Mx%29%26fl%3Dname%26rows%3D%26output%3Djson"
+/usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-archive.svg "https://img.shields.io/badge/dynamic/json?logo=internetarchive&logoColor=white&style=flat&labelColor=rgba(0,0,0,0.4)&color=black&label=Internet%20Archive&query=%24.response.numFound&url=https%3A%2F%2Farchive.org%2Fadvancedsearch.php%3Fq%3Duploader%253A%28Dr-Mx%29%26fl%3Dname%26rows%3D0%26output%3Djson"
 # Github
 # /usr/bin/wget -O /home/bexhillo/public_html/assets/img/info-archive.svg "https://img.shields.io/github/license/Dr-Mx/Bexhill-OSM?logo=github&logoColor=white&color=%23a04900&label=Github&labelColor=rgba(0,0,0,0.4)&style=flat"

web/assets/data/taginfo.json

@@ -1,7 +1,7 @@
 {
     "data_format": 1,
     "data_url": "https://bexhill-osm.org.uk/assets/data/taginfo.json",
-	"data_updated": "20240420T200000Z",
+	"data_updated": "20241018T200000Z",
     "project": {
         "name": "Bexhill OpenStreetMap",
         "description": "A highly detailed map of Bexhill-on-Sea, England. Discover art, shops, walks, history and a wealth of other information.",
@@ -51,9 +51,6 @@
         }, {
             "key": "ref:esher",
             "description": "East Sussex Historic Environment Record reference, linked in a map popup."
-        }, {
-            "key": "ref:publicsculpturesofsussex",
-            "description": "Public Sculptures of Sussex object ID, linked in a map popup."
         }, {
             "key": "ref:iwm",
             "description": "Imperial War Museum: War Memorials Register reference, linked in a map popup."