From 95c7286c3e12d69428db71cd8ded2499dbb185aa Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Sat, 1 Aug 2026 06:40:37 +0200
Subject: [PATCH] Set map share link targets from the template

---
 app/assets/javascripts/leaflet.map.js | 12 ------------
 app/views/directions/show.html.erb    |  3 ++-
 app/views/share_panes/show.html.erb   |  9 +++++----
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 17221a531..1087f20e7 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -147,8 +147,6 @@ L.OSM.Map = L.Map.extend({
     }
 
     return {
-      protocol: location.protocol,
-      hostname: OSM.SERVER_URL,
       pathname: "/",
       search,
       hash: OSM.formatHash(this)
@@ -166,8 +164,6 @@ L.OSM.Map = L.Map.extend({
           // and drops the last 4 bits of the full 64 bit Morton code.
           c1 = interlace(x >>> 17, y >>> 17),
           c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff);
-    const protocol = location.protocol,
-          hostname = location.hostname.replace(/^www\.openstreetmap\.org/i, "osm.org");
     let pathname = "/go/";
 
     for (let i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
@@ -211,17 +207,12 @@ L.OSM.Map = L.Map.extend({
     }
 
     return {
-      protocol,
-      hostname,
       pathname,
       search
     };
   },
 
   getEmbedUrl: function (marker) {
-    const protocol = OSM.SERVER_PROTOCOL + ":",
-          hostname = OSM.SERVER_URL,
-          pathname = "/export/embed.html";
     const search = new URLSearchParams({
       bbox: this.getBounds().toBBoxString(),
       layer: this.getMapBaseLayerId()
@@ -233,9 +224,6 @@ L.OSM.Map = L.Map.extend({
     }
 
     return {
-      protocol,
-      hostname,
-      pathname,
       search
     };
   },
diff --git a/app/views/directions/show.html.erb b/app/views/directions/show.html.erb
index a9043560c..53ea12a19 100644
--- a/app/views/directions/show.html.erb
+++ b/app/views/directions/show.html.erb
@@ -61,7 +61,8 @@
   </div>
 
   <p class="text-center">
-    <%= tag.a t(".download"), :id => "directions_route_download", :download => "#{t('.filename')}.geojson" %>
+    <% file_content_placeholder = 'data:application/geo+json,{"type":"FeatureCollection","features":[]}' %>
+    <%= tag.a t(".download"), :id => "directions_route_download", :href => file_content_placeholder, :download => "#{t('.filename')}.geojson" %>
   </p>
 
   <p class="text-center">
diff --git a/app/views/share_panes/show.html.erb b/app/views/share_panes/show.html.erb
index 06c530d6d..814bfee82 100644
--- a/app/views/share_panes/show.html.erb
+++ b/app/views/share_panes/show.html.erb
@@ -5,11 +5,12 @@
       <%= label_tag "link_marker", t(".include_marker"), :class => "form-check-label" %>
       <%= check_box_tag "link_marker", nil, :class => "form-check-input" %>
     </div>
+    <% short_link_origin = "#{Settings.server_protocol}://#{Settings.server_url.sub(/\Awww\.openstreetmap\.org/i, 'osm.org')}" %>
     <div class="btn-group btn-group-sm mb-2 nav nav-pills" id="nav-tab" role="tablist">
-      <a class="btn btn-primary flex-grow-0 active" id="long_link" data-bs-toggle="tab" data-bs-target="#nav-long-link" type="button" role="tab" aria-controls="nav-long-link" aria-selected="true"><%= t ".long_link" %></a>
-      <a class="btn btn-primary flex-grow-0" id="short_link" data-bs-toggle="tab" data-bs-target="#nav-short-link" type="button" role="tab" aria-controls="nav-short-link" aria-selected="false"><%= t ".short_link" %></a>
+      <a class="btn btn-primary flex-grow-0 active" id="long_link" href="/" data-bs-toggle="tab" data-bs-target="#nav-long-link" type="button" role="tab" aria-controls="nav-long-link" aria-selected="true"><%= t ".long_link" %></a>
+      <a class="btn btn-primary flex-grow-0" id="short_link" href="<%= short_link_origin %>" data-bs-toggle="tab" data-bs-target="#nav-short-link" type="button" role="tab" aria-controls="nav-short-link" aria-selected="false"><%= t ".short_link" %></a>
       <span class="btn-group btn-group-sm" tabindex="0" data-bs-title="<%= t ".embed_html_disabled" %>" data-bs-toggle="tooltip">
-        <a class="btn btn-primary" id="embed_link" data-bs-toggle="tab" data-bs-target="#nav-embed" type="button" role="tab" aria-controls="nav-embed" aria-selected="false"><%= t ".embed" %></a>
+        <a class="btn btn-primary" id="embed_link" href="<%= export_embed_path %>" data-bs-toggle="tab" data-bs-target="#nav-embed" type="button" role="tab" aria-controls="nav-embed" aria-selected="false"><%= t ".embed" %></a>
       </span>
     </div>
     <div class="tab-content" id="nav-tabContent">
@@ -28,7 +29,7 @@
 </div>
 <div class="share-geo-uri p-3 border-bottom border-secondary-subtle">
   <h4><%= t ".geo_uri" %></h4>
-  <div><a id="geo_uri"></a></div>
+  <div><a id="geo_uri" href="geo:?q=+"><%# populated dynamically %></a></div>
 </div>
 <div class="share-image p-3">
   <h4><%= t ".image" %></h4>
-- 
2.47.3