From 211782ea57304bcaf2e9d05e8d07fd708b4210c5 Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Tue, 23 Jan 2024 13:17:30 +0100 Subject: [PATCH 1/4] Replace Mapbox-based MakiMarkers with local book icon (#637) Mapbox is no longer free, new free icon is from https://mappity.org --- app/views/tags/items_map.scala.html | 7 +++++-- public/javascripts/images/marker-icon-book.png | Bin 0 -> 2822 bytes 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 public/javascripts/images/marker-icon-book.png diff --git a/app/views/tags/items_map.scala.html b/app/views/tags/items_map.scala.html index 85aeaa37..bf06be15 100644 --- a/app/views/tags/items_map.scala.html +++ b/app/views/tags/items_map.scala.html @@ -17,7 +17,6 @@ - @**@ @@ -90,7 +89,11 @@ var lat = @string((json \\ "lat").head) var lon = @string((json \\ "lon").head) var latlng@(id) = L.latLng(lat, lon); - var icon@(id) = L.MakiMarkers.icon({icon: "library", color: "#FF333B", size: "m"}); + var icon@(id) = L.icon({ + iconUrl: '@controllers.routes.Assets.at("javascripts/images/marker-icon-book.png")', + iconSize: [30, 30], + popupAnchor: [0, -15] + }); var marker@(id) = L.marker([lat, lon],{ title: "@ownerName (@key)", icon: icon@(id) diff --git a/public/javascripts/images/marker-icon-book.png b/public/javascripts/images/marker-icon-book.png new file mode 100644 index 0000000000000000000000000000000000000000..97f57e85b421c3b701e18938cfb3eb867281362d GIT binary patch literal 2822 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 Y17%9jZM!u8YybcN07*qoM6N<$g5N`OfdBvi literal 0 HcmV?d00001 From 4c1c404e11e819a00113850d152d1b00ecfd8679 Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Tue, 23 Jan 2024 13:34:51 +0100 Subject: [PATCH 2/4] Fix marker positions on items map (#637) --- app/views/tags/items_map.scala.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/tags/items_map.scala.html b/app/views/tags/items_map.scala.html index bf06be15..a4735b65 100644 --- a/app/views/tags/items_map.scala.html +++ b/app/views/tags/items_map.scala.html @@ -92,7 +92,8 @@ var icon@(id) = L.icon({ iconUrl: '@controllers.routes.Assets.at("javascripts/images/marker-icon-book.png")', iconSize: [30, 30], - popupAnchor: [0, -15] + iconAnchor: [15, 30], + popupAnchor: [0, -30] }); var marker@(id) = L.marker([lat, lon],{ title: "@ownerName (@key)", From e654eb01e98a4c7ea3866a2c35377cb7ba3c4f9a Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Thu, 25 Jan 2024 14:37:45 +0100 Subject: [PATCH 3/4] Update marker icon for items map (#637) Modifed color to `#ee1921` and 80% opacity, based on https://pixabay.com/vectors/google-map-marker-red-peg-309740/ --- app/views/tags/items_map.scala.html | 6 +++--- public/javascripts/images/marker-icon-book.png | Bin 2822 -> 0 bytes public/javascripts/images/marker-icon-red.png | Bin 0 -> 30151 bytes 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 public/javascripts/images/marker-icon-book.png create mode 100644 public/javascripts/images/marker-icon-red.png diff --git a/app/views/tags/items_map.scala.html b/app/views/tags/items_map.scala.html index a4735b65..8c25361c 100644 --- a/app/views/tags/items_map.scala.html +++ b/app/views/tags/items_map.scala.html @@ -90,9 +90,9 @@ var lon = @string((json \\ "lon").head) var latlng@(id) = L.latLng(lat, lon); var icon@(id) = L.icon({ - iconUrl: '@controllers.routes.Assets.at("javascripts/images/marker-icon-book.png")', - iconSize: [30, 30], - iconAnchor: [15, 30], + iconUrl: '@controllers.routes.Assets.at("javascripts/images/marker-icon-red.png")', + iconSize: [20, 30], + iconAnchor: [10, 30], popupAnchor: [0, -30] }); var marker@(id) = L.marker([lat, lon],{ diff --git a/public/javascripts/images/marker-icon-book.png b/public/javascripts/images/marker-icon-book.png deleted file mode 100644 index 97f57e85b421c3b701e18938cfb3eb867281362d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2822 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 Y17%9jZM!u8YybcN07*qoM6N<$g5N`OfdBvi diff --git a/public/javascripts/images/marker-icon-red.png b/public/javascripts/images/marker-icon-red.png new file mode 100644 index 0000000000000000000000000000000000000000..49076928391908aa89788acdd31e204cad4d57dd GIT binary patch literal 30151 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 F{|B}+Ua9~9 literal 0 HcmV?d00001 From 935ee7702de47e5b8335cddaf97950648a6b131e Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Thu, 25 Jan 2024 14:43:05 +0100 Subject: [PATCH 4/4] Increase zoom level when selecting items map marker (#637) --- app/views/tags/items_map.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/tags/items_map.scala.html b/app/views/tags/items_map.scala.html index 8c25361c..f00b369f 100644 --- a/app/views/tags/items_map.scala.html +++ b/app/views/tags/items_map.scala.html @@ -114,7 +114,7 @@ zoomDetails@(id)(); } function zoomDetails@(id)() { - map.setView(latlng@(id), 16); + map.setView(latlng@(id), 17); marker@(id).openPopup(); } function bindPopup@(id)(content) {