Add clearer close action, refactor base layer code

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index fc426e883551b150652133bbba912dd13fd1411a..f5022683b8050fec55c3c346664e835996c566a0 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -126,13 +126,14 @@ function getShortUrl(map) {
 
 function getUrl(map) {
   var center = map.getCenter(),
-      zoom = map.getZoom();
+      zoom = map.getZoom(),
+      toZoom = zoomPrecision(zoom);
 
   return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
           'http://openstreetmap.org/?' : '/?') +
         querystring.stringify({
-            lat: center.lat,
-            lon: center.lng,
+            lat: toZoom(center.lat),
+            lon: toZoom(center.lng),
             zoom: zoom,
             layers: map.getLayersCode()
         });

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 2baab4d4b10f82a5025104ee49992f6f6c67cd68..1f624f125f60c5a61471c6d59a8fe2b03a453a30 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -38,7 +38,7 @@ function initializeExport(map) {
 
     openSidebar();
 
-    if (getMapBaseLayerId(map) == "mapnik") {
+    if (map.getMapBaseLayerId() == "mapnik") {
       $("#format_mapnik").prop("checked", true);
     }
 
@@ -186,7 +186,7 @@ function initializeExport(map) {
 
     function htmlUrlChanged() {
       var bounds = getBounds();
-      var layerName = getMapBaseLayerId(map);
+      var layerName = map.getMapBaseLayerId();
 
       var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBoxString() + "&layer=" + layerName;
       var markerUrl = "";

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index cf54b2ded5aa7e361a405375765b2ac2102f3df7..5aae3d1c25c1efe53b03793ed78abc8a3d561cab 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -18,6 +18,12 @@ L.OSM.key = function (options) {
 
     $('<section>')
       .appendTo($ui)
+      .append(
+          $('<a>')
+            .html('&raquo;')
+            .attr('class', 'close-button')
+            .attr('href', '#')
+            .bind('click', toggle))
       .append(
       $('<h2>')
         .text(I18n.t('javascripts.key.title')));
@@ -47,7 +53,7 @@ L.OSM.key = function (options) {
     }
 
     function update() {
-      var layer = getMapBaseLayerId(map),
+      var layer = map.getMapBaseLayerId(),
         zoom = map.getZoom();
 
       $('.mapkey-table-entry').each(function () {

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 80613a5d937730353636a29e3f1b9d709f7985ef..57cd53d4dc840cf21384e9b4907b0edb4d1a8543 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -20,6 +20,12 @@ L.OSM.layers = function(options) {
 
     $('<section>')
        .appendTo($ui)
+       .append(
+          $('<a>')
+            .html('&raquo;')
+            .attr('class', 'close-button')
+            .attr('href', '#')
+            .bind('click', toggle))
        .append(
         $('<h2>')
           .text(I18n.t('javascripts.map.layers.header')));

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 773145bedfcb7257b7f14aefd6b14c08c90c4ce5..664aebaa5fb19ad47aa08e2bbc7f11f864246faf 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -18,6 +18,12 @@ L.OSM.share = function (options) {
 
     $('<section>')
       .appendTo($ui)
+      .append(
+          $('<a>')
+            .html('&raquo;')
+            .attr('class', 'close-button')
+            .attr('href', '#')
+            .bind('click', toggle))
       .append(
       $('<h2>')
         .text(I18n.t('javascripts.share.title')));

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 4ce15ec451246e52810eb92a0c9ecc980de14c45..dba6205fb926db87bbe8f06d82c4bf3555b08753 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -604,6 +604,15 @@ a.donate {
     margin:0;
   }
 
+  a.close-button {
+    float: right;
+    padding:5px;
+    font-size:20px;
+    line-height:15px;
+    color:#222;
+    border:1px solid #ddd;
+  }
+
   li {
     border-radius: 4px;
     overflow: hidden;
@@ -1268,7 +1277,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h1, h2 {
     font-size: 21px;
-    line-height: 1;
+    line-height: 1em;
   }
   small.deemphasize {
     float: left;