Merge tooltip fixes/tests

diff --combined app/assets/javascripts/leaflet.layers.js
index faca07e3c18d0297b686160e2fd139a5a64c6605,2633d103794d6e6af8396545b49f7568be3900ae..d762696a18e556b4ffa5fb2548733ae9bd512251
--- 1/app/assets/javascripts/leaflet.layers.js
--- 2/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@@ -1,35 -1,9 +1,9 @@@
  L.OSM.layers = function (options) {
-   var control = L.control(options);
+   var control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
  
-   control.onAdd = function (map) {
+   control.onAddPane = function (map, button, $ui, toggle) {
      var layers = options.layers;
  
-     var $container = $("<div>")
-       .attr("class", "control-layers");
- 
-     var button = $("<a>")
-       .attr("class", "control-button")
-       .attr("href", "#")
-       .attr("title", I18n.t("javascripts.map.layers.title"))
-       .html("<span class=\"icon layers\"></span>")
-       .on("click", toggle)
-       .appendTo($container);
- 
-     var $ui = $("<div>")
-       .attr("class", "layers-ui");
- 
-     $("<div>")
-       .attr("class", "sidebar_heading")
-       .appendTo($ui)
-       .append(
-         $("<span>")
-           .text(I18n.t("javascripts.close"))
-           .attr("class", "icon close")
-           .bind("click", toggle))
-       .append(
-         $("<h4>")
-           .text(I18n.t("javascripts.map.layers.header")));
- 
      var baseSection = $("<div>")
        .attr("class", "section base-layers")
        .appendTo($ui);
@@@ -171,8 -145,7 +145,7 @@@
            }
  
            $(item).attr("class", disabled ? "disabled" : "");
-           // item.attr("data-bs-original-title", disabled ? // has additional bug when zooming out from enabled state
-           item.attr("data-original-title", disabled ?
 -          item.attr("data-bs-original-title", disabled ?
++          item.attr("data-bs-original-title", disabled ? // has additional bug when zooming out from enabled state
              I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
          });
        };
@@@ -181,17 -154,6 +154,6 @@@
        addOverlay(map.dataLayer, "data", OSM.MAX_REQUEST_AREA);
        addOverlay(map.gpsLayer, "gps", Number.POSITIVE_INFINITY);
      }
- 
-     options.sidebar.addPane($ui);
- 
-     function toggle(e) {
-       e.stopPropagation();
-       e.preventDefault();
-       options.sidebar.togglePane($ui, button);
-       $(".leaflet-control .control-button").tooltip("hide");
-     }
- 
-     return $container[0];
    };
  
    return control;

diff --combined test/system/site_test.rb
index 6dd8550d1795ba1132bc70d9198ae4277b9f86e6,a08f7f344cd55672a935b85fc7b5af00e53f4f93..2809feb93bc3a2f16d4566109ce4d7c713dbfcb9
--- 1/test/system/site_test.rb
--- 2/test/system/site_test.rb
+++ b/test/system/site_test.rb
@@@ -38,17 -38,34 +38,28 @@@ class SiteTest < ApplicationSystemTestC
      tooltip.assert_text "not available"
    end
  
 -  test "tooltip shows for query button when zoomed out" do
 -    visit "/#map=10/0/0"
+   test "tooltip shows for query button when zoomed in" do
+     visit "/#map=14/0/0"
+ 
+     assert_no_selector ".tooltip"
+     button = find ".control-query .control-button"
+     button.hover
+     tooltip = find ".tooltip"
+     tooltip.assert_text "Query features"
+     tooltip.assert_no_text "Zoom in"
+   end
+ 
-       visit "/#map=1/1/1"
 +  [
 +    "#edit_tab",
 +    ".control-note .control-button",
 +    ".control-query .control-button"
 +  ].each do |selector|
 +    test "tooltips on low zoom levels for disabled control '#{selector}'" do
++      visit "/#map=10/0/0"
  
 -    assert_no_selector ".tooltip"
 -    button = find ".control-query .control-button"
 -    button.hover
 -    tooltip = find ".tooltip"
 -    tooltip.assert_text "Zoom in to query features"
 -  end
 -
 -  test "tooltip shows for edit button when zoomed out" do
 -    visit "/#map=11/0/0"
 -
 -    assert_no_selector ".tooltip"
 -    button = find "#edit_tab"
 -    button.hover
 -    tooltip = find ".tooltip"
 -    tooltip.assert_text "Zoom in to edit the map"
 +      assert_no_selector ".tooltip"
 +      find(selector).hover
 +      assert_selector ".tooltip", :text => "Zoom in"
 +    end
    end
  end