Update to Leaflet 0.7.5

diff --git a/Vendorfile b/Vendorfile
index e2502ffce48506446f3391bad37d4a49b7f7c6f7..3793a7ba8bab35d80f111b35b16382c27a12b7e6 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -11,13 +11,13 @@ folder 'vendor/assets' do
   end
 
   folder 'leaflet' do
-    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.4/leaflet-src.js'
-    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.4/leaflet.css'
+    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.5/leaflet-src.js'
+    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.css'
 
     [ 'layers.png', 'layers-2x.png',
       'marker-icon.png', 'marker-icon-2x.png',
       'marker-shadow.png' ].each do |image|
-      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.4/images/#{image}"
+      file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.5/images/#{image}"
     end
 
     from 'git://github.com/kajic/leaflet-locationfilter.git' do

diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
index 346fab996cb763958cbcd73fc7ecd7b17bc424cc..ac0cd174df7fac89d74525d1b06dc79b38af7964 100644 (file)
--- a/vendor/assets/leaflet/leaflet.css
+++ b/vendor/assets/leaflet/leaflet.css
@@ -1,12 +1,16 @@
 /* required styles */\r
 \r
-.leaflet-pane,\r
+.leaflet-map-pane,\r
 .leaflet-tile,\r
 .leaflet-marker-icon,\r
 .leaflet-marker-shadow,\r
+.leaflet-tile-pane,\r
 .leaflet-tile-container,\r
-.leaflet-map-pane svg,\r
-.leaflet-map-pane canvas,\r
+.leaflet-overlay-pane,\r
+.leaflet-shadow-pane,\r
+.leaflet-marker-pane,\r
+.leaflet-popup-pane,\r
+.leaflet-overlay-pane svg,\r
 .leaflet-zoom-box,\r
 .leaflet-image-layer,\r
 .leaflet-layer {\r
@@ -17,7 +21,6 @@
 .leaflet-container {\r
        overflow: hidden;\r
        -ms-touch-action: none;\r
-       touch-action: none;\r
        }\r
 .leaflet-tile,\r
 .leaflet-marker-icon,\r
@@ -25,30 +28,20 @@
        -webkit-user-select: none;\r
           -moz-user-select: none;\r
                user-select: none;\r
-         -webkit-user-drag: none;\r
-       }\r
-/* Safari renders non-retina tile on retina better with this, but Chrome is worse */\r
-.leaflet-safari .leaflet-tile {\r
-       image-rendering: -webkit-optimize-contrast;\r
-       }\r
-/* hack that prevents hw layers "stretching" when loading new tiles */\r
-.leaflet-safari .leaflet-tile-container {\r
-       width: 1600px;\r
-       height: 1600px;\r
-       -webkit-transform-origin: 0 0;\r
+       -webkit-user-drag: none;\r
        }\r
 .leaflet-marker-icon,\r
 .leaflet-marker-shadow {\r
        display: block;\r
        }\r
-/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */\r
-/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */\r
-.leaflet-container .leaflet-overlay-pane svg,\r
-.leaflet-container .leaflet-marker-pane img,\r
-.leaflet-container .leaflet-tile-pane img,\r
-.leaflet-container img.leaflet-image-layer {\r
+/* map is broken in FF if you have max-width: 100% on tiles */\r
+.leaflet-container img {\r
        max-width: none !important;\r
        }\r
+/* stupid Android 2 doesn't understand "max-width: none" properly */\r
+.leaflet-container img.leaflet-image-layer {\r
+       max-width: 15000px !important;\r
+       }\r
 .leaflet-tile {\r
        filter: inherit;\r
        visibility: hidden;\r
@@ -59,25 +52,18 @@
 .leaflet-zoom-box {\r
        width: 0;\r
        height: 0;\r
-       -moz-box-sizing: border-box;\r
-            box-sizing: border-box;\r
-       z-index: 800;\r
        }\r
 /* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */\r
 .leaflet-overlay-pane svg {\r
        -moz-user-select: none;\r
        }\r
 \r
-.leaflet-pane         { z-index: 400; }\r
-\r
-.leaflet-tile-pane    { z-index: 200; }\r
-.leaflet-overlay-pane { z-index: 400; }\r
-.leaflet-shadow-pane  { z-index: 500; }\r
-.leaflet-marker-pane  { z-index: 600; }\r
-.leaflet-popup-pane   { z-index: 700; }\r
-\r
-.leaflet-map-pane canvas { z-index: 100; }\r
-.leaflet-map-pane svg    { z-index: 200; }\r
+.leaflet-tile-pane    { z-index: 2; }\r
+.leaflet-objects-pane { z-index: 3; }\r
+.leaflet-overlay-pane { z-index: 4; }\r
+.leaflet-shadow-pane  { z-index: 5; }\r
+.leaflet-marker-pane  { z-index: 6; }\r
+.leaflet-popup-pane   { z-index: 7; }\r
 \r
 .leaflet-vml-shape {\r
        width: 1px;\r
@@ -94,7 +80,7 @@
 \r
 .leaflet-control {\r
        position: relative;\r
-       z-index: 800;\r
+       z-index: 7;\r
        pointer-events: auto;\r
        }\r
 .leaflet-top,\r
@@ -138,9 +124,7 @@
 \r
 /* zoom and fade animations */\r
 \r
-.leaflet-fade-anim .leaflet-tile {\r
-       will-change: opacity;\r
-       }\r
+.leaflet-fade-anim .leaflet-tile,\r
 .leaflet-fade-anim .leaflet-popup {\r
        opacity: 0;\r
        -webkit-transition: opacity 0.2s linear;\r
@@ -148,17 +132,11 @@
             -o-transition: opacity 0.2s linear;\r
                transition: opacity 0.2s linear;\r
        }\r
+.leaflet-fade-anim .leaflet-tile-loaded,\r
 .leaflet-fade-anim .leaflet-map-pane .leaflet-popup {\r
        opacity: 1;\r
        }\r
-.leaflet-zoom-animated {\r
-       -webkit-transform-origin: 0 0;\r
-           -ms-transform-origin: 0 0;\r
-               transform-origin: 0 0;\r
-       }\r
-.leaflet-zoom-anim .leaflet-zoom-animated {\r
-       will-change: transform;\r
-       }\r
+\r
 .leaflet-zoom-anim .leaflet-zoom-animated {\r
        -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);\r
           -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);\r
@@ -166,7 +144,8 @@
                transition:         transform 0.25s cubic-bezier(0,0,0.25,1);\r
        }\r
 .leaflet-zoom-anim .leaflet-tile,\r
-.leaflet-pan-anim .leaflet-tile {\r
+.leaflet-pan-anim .leaflet-tile,\r
+.leaflet-touching .leaflet-zoom-animated {\r
        -webkit-transition: none;\r
           -moz-transition: none;\r
             -o-transition: none;\r
@@ -180,24 +159,19 @@
 \r
 /* cursors */\r
 \r
-.leaflet-interactive {\r
+.leaflet-clickable {\r
        cursor: pointer;\r
        }\r
-.leaflet-grab {\r
+.leaflet-container {\r
        cursor: -webkit-grab;\r
        cursor:    -moz-grab;\r
        }\r
-.leaflet-crosshair,\r
-.leaflet-crosshair .leaflet-interactive {\r
-       cursor: crosshair;\r
-       }\r
 .leaflet-popup-pane,\r
 .leaflet-control {\r
        cursor: auto;\r
        }\r
-.leaflet-dragging .leaflet-grab,\r
-.leaflet-dragging .leaflet-grab .leaflet-interactive,\r
-.leaflet-dragging .leaflet-marker-draggable {\r
+.leaflet-dragging .leaflet-container,\r
+.leaflet-dragging .leaflet-clickable {\r
        cursor: move;\r
        cursor: -webkit-grabbing;\r
        cursor:    -moz-grabbing;\r
@@ -329,10 +303,6 @@
        color: #333;\r
        background: #fff;\r
        }\r
-.leaflet-control-layers-scrollbar {\r
-       overflow-y: scroll;\r
-       padding-right: 5px;\r
-       }\r
 .leaflet-control-layers-selector {\r
        margin-top: 2px;\r
        position: relative;\r
@@ -452,7 +422,7 @@
 .leaflet-popup-content-wrapper,\r
 .leaflet-popup-tip {\r
        background: white;\r
-       color: #333;\r
+\r
        box-shadow: 0 3px 14px rgba(0,0,0,0.4);\r
        }\r
 .leaflet-container a.leaflet-popup-close-button {\r
@@ -460,7 +430,6 @@
        top: 0;\r
        right: 0;\r
        padding: 4px 4px 0 0;\r
-       border: none;\r
        text-align: center;\r
        width: 18px;\r
        height: 14px;\r

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index aecf2677ba664db88dab18925a9771c7aedffaf0..bc92d749f58eecc3079f2348290edc7224cd302c 100644 (file)
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
-L.version = '0.7.4';
+L.version = '0.7.5';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -3537,12 +3537,8 @@ L.Marker = L.Class.extend({
 
        update: function () {
                if (this._icon) {
-                       var pos = this._map.latLngToLayerPoint(this._latlng).round();
-                       L.Util.requestAnimFrame(function () {
-                               this._setPos(pos);
-                       }, this);
+                       this._setPos(this._map.latLngToLayerPoint(this._latlng).round());
                }
-
                return this;
        },
 
@@ -3565,7 +3561,7 @@ L.Marker = L.Class.extend({
                        if (options.title) {
                                icon.title = options.title;
                        }
-                       
+
                        if (options.alt) {
                                icon.alt = options.alt;
                        }