From 1f5b9d912441b2dfdfdcb1e5816b97e4c0ad64c7 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sun, 26 Sep 2021 22:49:39 +0100
Subject: [PATCH] Change to clearer pin

Former-commit-id: 99b8e400d190b35ec4a4bbf8e50a9f1ce79ee455 [formerly 777b6671ee11523c1357cd608b8faed1cdc3ea0f] [formerly 43f0876c98e33349a7fee953655edee8b2ec444d] [formerly 0be72d7996822f97875dbccd6ae79e48b5cd8084 [formerly 706a30d8fc9ed0d5c47817841eab112336a6c490 [formerly 4ef208b649df4f259ac64b65777693613fc98122]]]
Former-commit-id: 443a864a292dd1bca12d74e0000fd68cec55e2a1 [formerly a098eb16317b23568bbcf8b1c2a147922d7c1de4 [formerly b5c76482381719fa24dda845888fc2f16868ddbc]]
Former-commit-id: 684f366f6e01525ad6f0927d1498fbbd956f57d3 [formerly 410f4ac858f952eb12d1f2d6736360a396faabf7]
Former-commit-id: dbfe9c7e94edd581d4efdb2d8511feb1f8caf7c2
---
 pwabuilder-sw.js                  |   2 +-
 www/img/icons/map_marker-50px.png | Bin 0 -> 2446 bytes
 www/index.html                    |   6 +++---
 www/js/app.js                     |   4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 www/img/icons/map_marker-50px.png

diff --git a/pwabuilder-sw.js b/pwabuilder-sw.js
index 7a05579f..aed5a6de 100644
--- a/pwabuilder-sw.js
+++ b/pwabuilder-sw.js
@@ -54,7 +54,7 @@ let precacheFiles = [
   "www/img/icons/wikivoyage-90-white.png",
   "www/img/icons/wikivoyage-black-32.png",
   "www/img/icons/wikivoyage-white-32.png",
-  "www/img/icons/map_marker-18px.png",
+  "www/img/icons/map_marker-30px.png",
   "www/img/spinner.gif",
   "www/index.html",
   "www/article.html",
diff --git a/www/img/icons/map_marker-50px.png b/www/img/icons/map_marker-50px.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe1d5fafae3adbf6ab160800c2bbd3300fcb89b7
GIT binary patch
literal 2446
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
M07*qoM6N<$f?sOF;{X5v

literal 0
HcmV?d00001

diff --git a/www/index.html b/www/index.html
index e2105470..89976e65 100644
--- a/www/index.html
+++ b/www/index.html
@@ -313,7 +313,7 @@
                         <a href="#searchSyntax">Title search</a>). <b><i>Note that this app cannot (yet) do full text search of the contents of all articles in a ZIM.</i></b>
                     </p>
                     <p>
-                        On some Wikivoyage (English and German) pages you will see map pins: <img src="img/icons/map_marker-18px.png" />. On Windows 10/11, you can
+                        On some Wikivoyage (English and German) pages you will see map pins: <img src="img/icons/map_marker-30px.png" width="18px" />. On Windows 10/11, you can
                         tap this icon to open the <b>Maps app</b> at the selected location. In the UWP and PWA versions of this app, this will work offline if you have downloaded
                         the map for the relevant country or region in the Settings for <b>Offline Maps</b>. In Configuration, you can change this action so that the pin opens
                         an <b>online</b> OpenStreetMap centred on the map pin instead. 
@@ -874,10 +874,10 @@
                                             <span class="checkmark"></span>
                                             <b>Open all headings</b> (<i>for WikiMedia ZIMs</i>: sets the state of collapsible headings on article load)
                                         </label>
-                                        <label class="checkbox">
+                                        <label class="checkbox" title="By default, this app will use the Windows Maps app when you click on a Wikivoyage map pin (download offline maps in Windows Settings -> Offline maps). If you prefer to use OpenStreetMap (online), then check this box. Map pins are currently only supported in English and German Wikivoyage ZIMs.">
                                             <input type="checkbox" name="useOSM" id="useOSMCheck">
                                             <span class="checkmark"></span>
-                                            <b>Open Wikivoyage map pins with online OpenSteetMap instead of offline Maps app</b> (<i>for Wikivoyage English and German ZIMs</i>)
+                                            <b>Use online OpenStreetMap for map pins instead of offline Windows Maps</b> (for English and German Wikivoyage)
                                         </label>
                                     </div> 
                                 </div>
diff --git a/www/js/app.js b/www/js/app.js
index 490316f6..c1267deb 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -3720,7 +3720,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
                 if (/openstreetmap/.test(params.mapsURI)) {
                     html = '<a href="' + params.mapsURI + '?mlat=' + latitude + '&mlon=' + longitude + '#map=18/' + latitude + '/' + longitude + '">\r\n';
                 }
-                html += '<img alt="Map marker" title="Diesen Ort auf einer Karte zeigen" src="app:///www/img/icons/map_marker-18px.png" style="position:relative !important;top:-5px !important;margin-top:5px !important" />\r\n</a>' + href;
+                html += '<img alt="Map marker" title="Diesen Ort auf einer Karte zeigen" src="app:///www/img/icons/map_marker-30px.png" width="18px" style="position:relative !important;top:-5px !important;margin-top:5px !important" />\r\n</a>' + href;
                 return html;
             });
 
@@ -3737,7 +3737,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
                     html = hrefAttr + params.mapsURI + '?mlat=' + latitude + '&mlon=' + longitude + '#map=18/' + latitude + '/' + longitude + 
                         p4.replace(/style=["']\s?background:[^"']+["']/i, '');
                 }
-                html += '<img alt="Map marker" title="Show this place on a map" src="app:///www/img/icons/map_marker-18px.png" style="position:relative !important;top:-5px !important;" />' + p6 + id;
+                html += '<img alt="Map marker" title="Show this place on a map" src="app:///www/img/icons/map_marker-30px.png" width="18px" style="position:relative !important;top:-5px !important;" />' + p6 + id;
                 return html;
             });