Only set QT_QPA_PLATFORM if phantomjs fails without it

[rails.git] / app / assets / javascripts / leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index c294f13ef2ef749065a4753e3a0e5f13a369a03b..a465e144993d8470a82c31f740fb09b273d8f5b2 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -49,7 +49,7 @@ L.OSM.layers = function(options) {
         .appendTo(item);
 
       map.whenReady(function() {
         .appendTo(item);
 
       map.whenReady(function() {

-        var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})
+        var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false, keyboard: false})

           .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
 
         miniMap.dragging.disable();
           .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
 
         miniMap.dragging.disable();


@@ -176,6 +176,7 @@ L.OSM.layers = function(options) {
 
       addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA);
       addOverlay(map.dataLayer, 'data', OSM.MAX_REQUEST_AREA);
 
       addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA);
       addOverlay(map.dataLayer, 'data', OSM.MAX_REQUEST_AREA);

+      addOverlay(map.gpsLayer, 'gps', Number.POSITIVE_INFINITY);

     }
 
     options.sidebar.addPane($ui);
     }
 
     options.sidebar.addPane($ui);