v8.1.0

Dr-Mx · Apr 23, 2024 · 4d210da · 4d210da
1 parent 8ff4508
commit 4d210da
Show file tree

Hide file tree

Showing 37 changed files with 402 additions and 335 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## v8.1.0
+
+**Date:** 23/04/2024
+
+Updated
+ - fontawesome 6.5.2
+ - L.Control.Locate.min.js 0.81.0
+
+Site changes
+ - Tidy up map change feed
+ - Tutorial modals better positioning
+ - Map icons for public bookcases and chess tables
+ - Confirm dialogue shows url when navigating to external website
+ - Opening hours show sunset/sunrise times properly now
+ - Create a generic website parser for popups
+ - More of the usual bug fixes and code improvements
+
+
 ## v8.0.0
 
 **Date:** 17/02/2024

diff --git a/README.md b/README.md
@@ -6,17 +6,23 @@
 
 Searchable OpenStreetMap data showing POIs, walking directions, overlays, history and other information for the town of Bexhill-on-Sea, UK
 
-![Cover image of Bexhill-OSM](https://bexhill-osm.org.uk/assets/img/og-image.jpg)
+## Video Demonstration
+
+https://github.com/Dr-Mx/bexhill-osm/assets/20068052/219ff558-a94b-46af-8f66-8eb8652f461c
 
 ## Features
-- Mobile and desktop friendly
-- Light/dark theme support
-- Map display
-  - Switch between metric and imperial
-  - Adjust overlay opacity
-  - Set map layer offset
-- Local caching of OSM API requests
-- Detailed POI markers through Overpass API
+~ Mobile and desktop friendly
+
+~ Light/dark theme support
+<details><summary>Map display options</summary>
+
+- Switch between metric and imperial
+- Adjust overlay opacity
+- Set map layer offset
+</details>
+
+<details><summary>Detailed POI markers through Overpass API</summary>
+
   - Bookmark favourite POIs
   - Facility icons
     - Wheelchair (key:wheelchair)
@@ -46,37 +52,50 @@ Searchable OpenStreetMap data showing POIs, walking directions, overlays, histor
   - Multiple spherical panorama support using Wikimedia Commons (key:wikimedia_commons:pano)
   - Fallback to main Overpass server on failure
   - Area outlines
-- Find an address by searching (Nominatim > Overpass)
-- Query any feature on map by clicking (Nominatim > Overpass)
-- Manually select groups of POIs from list or using a keyword
-- POI result list with current opening_hours / collection_times state
-- Detailed walking directions with Mapbox API
-- Geolocate user
-- Mapillary/Google street spherical panorama support
-- History Tour articles that link to various overlays on the map
-- Direct link to edit an element on OSM or edit Wikidata
-- Share any current map state with dynamic permalink
-- OpenWeatherMap API
-- Development tools
+</details>
+
+~ Find an address by searching (Nominatim > Overpass)
+
+~ Query any feature on map by clicking (Nominatim > Overpass)
+
+~ Manually select groups of POIs from list or using a keyword
+
+~ POI result list with current opening_hours / collection_times state
+
+~ Detailed walking directions with Mapbox API
+
+~ Geolocate user
+
+~ Mapillary/Google street spherical panorama support
+
+~ History Tour articles that link to various overlays on the map
+
+~ Direct link to edit an element on OSM or edit Wikidata
+
+~ Share any current map state with dynamic url
+
+~ OpenWeatherMap API
+
+<details><summary>Development tools</summary>
+
   - Display OSM notes
   - Export current query to Overpass Turbo
   - Download all data within map bounds
   - Custom OverpassAPI queries
   - Query OSM attic data from a certain date
   - Output debug info to console
+</details>
 
-## Demo
+## Futher Reading on the Project
 
-https://github.com/Dr-Mx/bexhill-osm/assets/20068052/219ff558-a94b-46af-8f66-8eb8652f461c
+~ https://wiki.openstreetmap.org/wiki/Bexhill-on-Sea
 
-## Futher Reading on the Project
+~ https://taginfo.openstreetmap.org/projects/bexhillosm
+
+~ https://osmuk.org/case-studies/bexhill-osm-celebrating-local-pride/
 
-- https://wiki.openstreetmap.org/wiki/Bexhill-on-Sea
-- https://taginfo.openstreetmap.org/projects/bexhillosm
-- https://osmuk.org/case-studies/bexhill-osm-celebrating-local-pride/
-- https://blog.opencagedata.com/post/openstreetmap-in-bexhill-uk
+~ https://blog.opencagedata.com/post/openstreetmap-in-bexhill-uk
 
 ## Attribution
 
-Originally forked from:
- - https://github.com/humitos/osm-pois (Humitos)
+Originally forked from https://github.com/humitos/osm-pois (Humitos)
diff --git a/web/.htaccess b/web/.htaccess
@@ -11,7 +11,7 @@ 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.xml
-Redirect /manorhouse /?t=tour&g=manorHouse&u=manor&O=os1955
+Redirect /manorhouse /?t=tour&g=manorHouse&u=manor&o=os1955
 Redirect /millifest /?t=none&g=milligan
 Redirect /ww2 /?m=general&t=tour&g=bombmap&u=ww2
 Redirect /xmas /?t=none&g=xmas

diff --git a/web/assets/css/plugins/leaflet-sidebar.css b/web/assets/css/plugins/leaflet-sidebar.css
@@ -43,7 +43,7 @@
 @media (min-width: 1024px) {
 	.sidebar.collapsed .sidebar-tabs {
 		background-color: transparent !important;
-		backdrop-filter: blur(7px);
+		backdrop-filter: blur(1px) saturate(40%);
 		transition: background-color 400ms ease-out; } }
 .sidebar-left {
 	left: 0; }

diff --git a/web/assets/css/site.css b/web/assets/css/site.css
@@ -238,32 +238,28 @@ input[type=text], input[type=date], input[type=number] {
 }
 #home-new-feed li {
 	font-family: monospace;
+	margin: 2px 0;
 }
 #home-new-feed .fa-ul {
 	margin-left: 1.5em;
 }
-#home-new-feed a:link, #home-new-feed a:hover, #home-new-feed a:visited {
+#home-new-feed a:hover, #home-new-feed a:link, #home-new-feed a:visited {
 	color: inherit;
 }
-#home-new-feed li .co{
-	font-family: monospace;
+#home-new-feed li:hover, #home-osm-feed li:hover .comment {
+	color: var(--text-color);
 }
 #home-osm-feed {
 	display: none;
 }
 #home-osm-feed li .comment {
 	display: block;
-	width: 70%;
+	width: 80%;
 	text-overflow: ellipsis;
 	overflow-x: hidden;
 	text-align: left;
 	white-space: nowrap;
-	opacity: 0.75;
-}
-#home-osm-feed li:hover .comment {
-	width: 100%;
-	white-space: normal;
-	opacity: 1;
+	opacity: 75%;
 }
 footer {
 	position: absolute;
@@ -507,7 +503,7 @@ h3 {
 	padding: 15px;
 	min-height: 20px;
 }
-@media (max-height: 350px) {
+@media (max-height: 350px), (max-width: 375px) {
 	.leaflet-control-zoom {
 		display: none;
 	}
@@ -1213,6 +1209,11 @@ input:indeterminate + .slider::before {
 		display: none !important;
 	}
 }
+@media (max-width: 511px) {
+	.popup-img-item {
+		max-height: 150px !important;
+	}
+}
 .leaflet-control-layers {
 	border-radius: 10px;
 }
@@ -1310,7 +1311,6 @@ a.control-layers-title {
 .popup-fhrs > a > img {
 	white-space: nowrap;
 	border-radius: 5px;
-	border: 1px solid #000000;
 	filter: saturate(50%);
 }
 .popup-body {
@@ -1369,6 +1369,7 @@ a.control-layers-title {
 	text-align: right;
 	color: #666666;
 	font-style: italic;
+	opacity: 60%;
 }
 .popup-openhrs .popup-tag-value {
 	width: 100%;
@@ -1466,6 +1467,7 @@ a.control-layers-title {
 	justify-content: center;
 	text-align: center;
 	font-size: 6pt;
+	margin-left: 2px;
 }
 .popup-img-attrib, .popup-img-attrib a, .popup-navigate {
 	color: #808080;

diff --git a/web/assets/data/taginfo.json b/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": "20240121T200000Z",
+	"data_updated": "20240420T200000Z",
     "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.",
@@ -13,71 +13,64 @@
     },
     "tags": [{
             "key": "dog",
-            "description": "Displays an icon in an elements popup, showing dog friendly establishments."
+            "description": "Dog friendly establishments, displayed as an icon in a map popup"
         }, {
             "key": "drinking_water:refill",
-            "description": "Displays an icon in an elements popup, showing where the public can refill water bottles."
+            "description": "Where the public can refill water bottles, displayed as an icon in a map popup."
         }, {
             "key": "shop",
 			"value": "vacant",
-            "description": "Keeps track of empty shops for display on the map."
+            "description": "Keeps track of empty shops, displayed as a map marker."
         }, {
             "key": "wikimedia_commons",
-            "description": "Link to a photo, displayed in an elements popup."
+            "description": "A related photo, displayed in a map popup."
         }, {
             "key": "wikimedia_commons:1",
-            "description": "Links to multiple photos when separated by semicolons, displayed in an elements popup."
+            "description": "Multiple related photos when separated by semicolons, displayed in a map popup."
         }, {
             "key": "wikimedia_commons:pano",
-            "description": "Links to a 360 panoramic image, or multiple panoramas when separated by semicolons, linked in an elements popup."
+            "description": "A related 360 panoramic image, or multiple panoramas when separated by semicolons, linked in a map popup."
         }, {
             "key": "wikimedia_commons:video",
-            "description": "Links to a video, or multiple videos when separated by semicolons, linked in an elements popup."
+            "description": "A related video, or multiple videos when separated by semicolons, linked in a map popup."
         }, {
             "key": "image",
-            "description": "Direct url link to a photo, displayed in an elements popup."
+            "description": "Full URL to a related photo, displayed in a map popup."
         }, {
             "key": "image:1",
-            "description": "Direct url links to multiple photos when separated by semicolons, displayed in an elements popup."
+            "description": "Full URL to multiple related photos when separated by semicolons, displayed in a map popup."
         }, {
             "key": "image:source",
-            "description": "Attribution for 'image' tag, for displaying under the image."
+            "description": "Attribution for 'image' tag, for displaying under the image in a map popup."
         }, {
             "key": "ref:planningapp",
-            "description": "Planning reference number from Rother District Council, linked in an elements popup."
+            "description": "Planning reference number from Rother District Council, linked in a map popup."
         }, {
             "key": "ref:historicplanningapp",
-            "description": "Historic planning reference number from Rother District Council, linked in an elements popup."
+            "description": "Historic planning reference number from Rother District Council, linked in a map popup."
         }, {
             "key": "ref:esher",
-            "description": "East Sussex Historic Environment Record reference, linked in an elements popup."
+            "description": "East Sussex Historic Environment Record reference, linked in a map popup."
         }, {
             "key": "ref:publicsculpturesofsussex",
-            "description": "Public Sculptures of Sussex object ID, linked in an elements popup."
+            "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 an elements popup."
+            "description": "Imperial War Museum: War Memorials Register reference, linked in a map popup."
         }, {
             "key": "url:bexhillhistorytrail",
-            "description": "URL path to an article on The Bexhill History Trail website, linked in an elements popup."
+            "description": "URL path to an article on The Bexhill History Trail website, linked in a map popup."
         }, {
             "key": "url:bexhillnature",
-            "description": "URL path to an article on Bexhill Nature website, linked in an elements popup."
-        }, {
-            "key": "website:booking",
-            "description": "Full URL to accommodation on Booking.com, linked in an elements popup."
-        }, {
-            "key": "website:orders",
-            "description": "Full URL to online food ordering for restaurants, linked in an elements popup."
+            "description": "URL path to an article on Bexhill Nature website, linked in a map popup."
         }, {
             "key": "naptan:AtcoCode",
-			"description": "Used to access real-time information on bus-stops, displayed in a table."
+			"description": "Used to access real-time information on bus-stops, displayed in a map popup."
         }, {
             "key": "fhrs:id",
-			"description": "Used to access information on food hygiene ratings, shown in an elements popup."
+			"description": "Used to access information on food hygiene ratings, displayed in a map popup."
         }, {
-            "key": "builder",
-			"description": "Displays the person who was responsible for constructing the building, shown in an elements popup."
+            "key": "manufacturer"
         }, {
             "key": "architect"
         }, {
@@ -106,12 +99,18 @@
             "key": "outdoor_seating"
         }, {
             "key": "beer_garden"
+        }, {
+            "key": "membership"
         }, {
             "key": "reservation"
         }, {
             "key": "opening_hours"
         }, {
             "key": "collection_times"
+        }, {
+            "key": "website:booking"
+        }, {
+            "key": "website:orders"
         }
     ]
 }
diff --git a/web/assets/font/fontawesome/LICENSE.txt b/web/assets/font/fontawesome/LICENSE.txt
@@ -23,7 +23,7 @@ as SVG and JS file types.
 In the Font Awesome Free download, the SIL OFL license applies to all icons
 packaged as web and desktop font files.
 
-Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com)
+Copyright (c) 2024 Fonticons, Inc. (https://fontawesome.com)
 with Reserved Font Name: "Font Awesome".
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
@@ -123,7 +123,7 @@ OTHER DEALINGS IN THE FONT SOFTWARE.
 In the Font Awesome Free download, the MIT license applies to all non-font and
 non-icon files.
 
-Copyright 2023 Fonticons, Inc.
+Copyright 2024 Fonticons, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in the