Clean OSM.formatHash calls

Author: hlfan

app/assets/javascripts/fixthemap.js

@@ -142,10 +142,7 @@ OSM.History = function (map) {
 
   function setPaginationMapHashes() {
     $("#sidebar .pagination a").each(function () {
-      $(this).prop("hash", OSM.formatHash({
-        center: map.getCenter(),
-        zoom: map.getZoom()
-      }));
+      $(this).prop("hash", OSM.formatHash(map));
     });
   }
 

app/assets/javascripts/index/history.js

@@ -1,18 +1,9 @@
 $(function () {
-  const params = new URLSearchParams(location.search);
-
-  if (params.has("lat") && params.has("lon")) {
-    let url = "/edit";
-
-    if (params.has("editor")) url += "?editor=" + params.get("editor");
-    if (!params.has("zoom")) params.set("zoom", 17);
-    url += OSM.formatHash(params);
-
-    $(".start-mapping").attr("href", url);
-  } else {
-    $(".start-mapping").on("click", function (e) {
+  const mappingBtn = $(".start-mapping");
+  if (!mappingBtn.attr("href").includes("#map=")) {
+    mappingBtn.on("click", function (e) {
       e.preventDefault();
-      $(".start-mapping").addClass("loading");
+      mappingBtn.addClass("loading");
 
       if (navigator.geolocation) {
         navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit);

app/assets/javascripts/welcome.js

@@ -1,7 +1,3 @@
-<% content_for :head do %>
- <%= javascript_include_tag "fixthemap" %>
-<% end %>
-
 <% content_for :heading do %>
   <h1><%= t ".title" %></h1>
 <% end %>
@@ -22,7 +18,9 @@
   <div class='col-sm'>
     <h3 class='fs-5'><%= t "site.welcome.add_a_note.title" %></h3>
     <p><%= t "site.welcome.add_a_note.para_1" %></p>
-    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1",
+    <p><%= map_hash = "#map=#{params[:zoom].to_i || 17}/#{params[:lat].to_f}/#{params[:lon].to_f}" if params[:lat].present? && params[:lon].present?
+           t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1",
+                                                                                :href => "#{new_note_path}#{map_hash || ''}",
                                                                                 :title => t("javascripts.site.createnote_tooltip")) %></p>
   </div>
 </div>

app/views/site/fixthemap.html.erb

@@ -81,7 +81,9 @@
 <% if params[:oauth_return_url] %>
   <a class="btn btn-primary" href="<%= params[:oauth_return_url] %>"><%= t ".continue_authorization" %></a>
 <% else %>
-  <a class="btn btn-primary start-mapping" href="<%= edit_path %>"><%= t ".start_mapping" %></a>
+  <%= map_hash = "#map=#{params[:zoom].to_i || 17}/#{params[:lat].to_f}/#{params[:lon].to_f}" if params[:lat].present? && params[:lon].present?
+      editor_query = "?editor=#{params[:editor].to_s.split(/\W/)[0]}" if params[:editor].present?
+      link_to t(".start_mapping"), "#{edit_path}#{editor_query || ''}#{map_hash || ''}", :class => "btn btn-primary start-mapping" %>
 <% end %>
 </div>