X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2d0dcbd9d08e38eb2cf5f24248518c6992fd3734..a0660c009c554b19c77297aa1afb38291485adef:/app/assets/javascripts/leaflet.layers.js diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index 2534a91c2..b12c0c89d 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -1,57 +1,56 @@ -L.OSM.layers = function(options) { +L.OSM.layers = function (options) { var control = L.control(options); control.onAdd = function (map) { var layers = options.layers; - var $container = $('
') - .attr('class', 'control-layers'); + var $container = $("
") + .attr("class", "control-layers"); - var button = $('') - .attr('class', 'control-button') - .attr('href', '#') - .attr('title', I18n.t('javascripts.map.layers.title')) - .html('') - .on('click', toggle) + var button = $("") + .attr("class", "control-button") + .attr("href", "#") + .attr("title", I18n.t("javascripts.map.layers.title")) + .html("") + .on("click", toggle) .appendTo($container); - var $ui = $('
') - .attr('class', 'layers-ui'); + var $ui = $("
") + .attr("class", "layers-ui"); - $('
') - .attr('class', 'sidebar_heading') + $("
") + .attr("class", "sidebar_heading") .appendTo($ui) .append( - $('') - .text(I18n.t('javascripts.close')) - .attr('class', 'sidebar_close') - .attr('href', '#') - .bind('click', toggle)) + $("") + .text(I18n.t("javascripts.close")) + .attr("class", "icon close") + .bind("click", toggle)) .append( - $('

') - .text(I18n.t('javascripts.map.layers.header'))); + $("

") + .text(I18n.t("javascripts.map.layers.header"))); - var baseSection = $('
') - .attr('class', 'section base-layers') + var baseSection = $("
") + .attr("class", "section base-layers") .appendTo($ui); - list = $('
    ') + var baseLayers = $("
      ") .appendTo(baseSection); - layers.forEach(function(layer) { - var item = $('
    • ') - .appendTo(list); + layers.forEach(function (layer) { + var item = $("
    • ") + .appendTo(baseLayers); if (map.hasLayer(layer)) { - item.addClass('active'); + item.addClass("active"); } - var div = $('
      ') + var div = $("
      ") .appendTo(item); - map.whenReady(function() { - var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false}) - .addLayer(new layer.constructor()); + map.whenReady(function () { + var miniMap = L.map(div[0], { attributionControl: false, zoomControl: false, keyboard: false }) + .addLayer(new layer.constructor({ apikey: layer.options.apikey })); miniMap.dragging.disable(); miniMap.touchZoom.disable(); @@ -59,17 +58,17 @@ L.OSM.layers = function(options) { miniMap.scrollWheelZoom.disable(); $ui - .on('show', shown) - .on('hide', hide); + .on("show", shown) + .on("hide", hide); function shown() { miniMap.invalidateSize(); - setView({animate: false}); - map.on('moveend', moved); + setView({ animate: false }); + map.on("moveend", moved); } function hide() { - map.off('moveend', moved); + map.off("moveend", moved); } function moved() { @@ -81,74 +80,103 @@ L.OSM.layers = function(options) { } }); - var label = $('