<p></p>
<p><b>@tomhughes</b> requested changes on this pull request.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4042#discussion_r1966812213">config/settings.yml</a>:</p>
<pre style='color:#555'>> @@ -107,6 +107,8 @@ attachments_dir: ":rails_root/public/attachments"
#logstash_path: ""
# List of memcache servers to use for caching
#memcache_servers: []
+# URL of Maptiler API for vector maps
+maptiler_url: "https://api.maptiler.com/"
</pre>
<p dir="auto">Does this actually need to be a setting? The other layers are all hard coded and in fact this is hard coded in the javascript, just not when setting the security policy.</p>
<p dir="auto">What we should have in here is a commented out setting for <code class="notranslate">maptiler_key</code> though, as we already do for the other map layers that need a key.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4042#discussion_r1966817127">app/assets/javascripts/leaflet.map.js</a>:</p>
<pre style='color:#555'>> + openmaptiles_url: "https://openmaptiles.org/",
+ maptiler_url: "https://www.maptiler.com/"
+ });
+
+ var terms = $("<a>", {
+ href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
+ text: I18n.t("javascripts.map.website_and_api_terms")
+ }).prop("outerHTML");
+
+ this.baseLayers.push(new L.OpenMapTiles({
+ attribution: copyright + ". " + openmaptiles_link + ". " + terms,
+ code: "V",
+ keyid: "openmaptiles_osm",
+ name: I18n.t("javascripts.map.base.openmaptiles_osm")
+ }));
+ }
</pre>
<p dir="auto">This should, if at all possible, be done in <code class="notranslate">config/layers.yml</code> rather than hand coding it - if we need to add new keys to that file and code here to handle them that's fine but all layers are supposed to be defined there now.</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4042#discussion_r1966817311">config/locales/en.yml</a>:</p>
<pre style='color:#555'>> @@ -3316,7 +3318,7 @@ en:
title: "Creating New Redaction"
show:
description: "Description:"
- heading: "Showing Redaction \"%{title}\""
+ heading: 'Showing Redaction "%{title}"'
</pre>
<p dir="auto">Why has this changed?</p>
<hr>
<p>In <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4042#discussion_r1966816765">app/assets/javascripts/leaflet.map.js</a>:</p>
<pre style='color:#555'>> @@ -9,6 +13,35 @@ L.extend(L.LatLngBounds.prototype, {
}
});
+if (OSM.MAPTILER_KEY) {
+ maplibregl.setRTLTextPlugin("https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.3/mapbox-gl-rtl-text.js", true);
</pre>
<p dir="auto">To answer the question from that comment, you modify <code class="notranslate">app/assets/config/manifest.js</code> and add:</p>
<div class="highlight highlight-source-js" dir="auto"><pre class="notranslate"><span class="pl-c">//= link @mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.js</span></pre></div>
<p dir="auto">then add to <code class="notranslate">app/assets/javascripts/osm.js.erb</code> something like:</p>
<div class="highlight highlight-source-js" dir="auto"><pre class="notranslate"><span class="pl-c1">RTL_TEXT_PLUGIN</span>: <span class="pl-c1"><</span><span class="pl-c1">%=</span> <span class="pl-en">javascript_path</span><span class="pl-kos">(</span><span class="pl-s">"@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.js"</span><span class="pl-kos">)</span><span class="pl-kos">.</span><span class="pl-c1">to_json</span> <span class="pl-c1">%</span><span class="pl-c1">></span><span class="pl-kos">,</span></pre></div>
<p dir="auto">and then you can use <code class="notranslate">OSM.RTL_TEXT_PLUGIN</code> here in place of the mapbox URL string.</p>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4042#pullrequestreview-2635631099">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLLNZBN5QWLHDPALYID2RHUORAVCNFSM6AAAAAAYLUCIYKVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDMMZVGYZTCMBZHE">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLL3LTXR3GUQ5WL775D2RHUORA5CNFSM6AAAAAAYLUCIYKWGG33NNVSW45C7OR4XAZNRKB2WY3CSMVYXKZLTORJGK5TJMV32UY3PNVWWK3TUL5UWJTU5DCE7W.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/4042/review/2635631099</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/4042#pullrequestreview-2635631099",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/4042#pullrequestreview-2635631099",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>