Merge remote-tracking branch 'openstreetmap/pull/1078'

diff --git a/Vendorfile b/Vendorfile
index 3793a7ba8bab35d80f111b35b16382c27a12b7e6..a9ec0a671f6388bb45a496bb74c1fd78398b4e14 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.5/leaflet-src.js'
-    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.css'
+    file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet-src.js'
+    file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet/v0.7.7/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.5/images/#{image}"
+      file "images/#{image}", "http://cdn.leafletjs.com/leaflet/v0.7.7/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 ac0cd174df7fac89d74525d1b06dc79b38af7964..dea175f0f0fe3cf0c55fd63b158a25bcd4a03397 100644 (file)
--- a/vendor/assets/leaflet/leaflet.css
+++ b/vendor/assets/leaflet/leaflet.css
@@ -1,478 +1,479 @@
-/* required styles */\r
-\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-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
-       position: absolute;\r
-       left: 0;\r
-       top: 0;\r
-       }\r
-.leaflet-container {\r
-       overflow: hidden;\r
-       -ms-touch-action: none;\r
-       }\r
-.leaflet-tile,\r
-.leaflet-marker-icon,\r
-.leaflet-marker-shadow {\r
-       -webkit-user-select: none;\r
-          -moz-user-select: none;\r
-               user-select: none;\r
-       -webkit-user-drag: none;\r
-       }\r
-.leaflet-marker-icon,\r
-.leaflet-marker-shadow {\r
-       display: block;\r
-       }\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
-       }\r
-.leaflet-tile-loaded {\r
-       visibility: inherit;\r
-       }\r
-.leaflet-zoom-box {\r
-       width: 0;\r
-       height: 0;\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-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
-       height: 1px;\r
-       }\r
-.lvml {\r
-       behavior: url(#default#VML);\r
-       display: inline-block;\r
-       position: absolute;\r
-       }\r
-\r
-\r
-/* control positioning */\r
-\r
-.leaflet-control {\r
-       position: relative;\r
-       z-index: 7;\r
-       pointer-events: auto;\r
-       }\r
-.leaflet-top,\r
-.leaflet-bottom {\r
-       position: absolute;\r
-       z-index: 1000;\r
-       pointer-events: none;\r
-       }\r
-.leaflet-top {\r
-       top: 0;\r
-       }\r
-.leaflet-right {\r
-       right: 0;\r
-       }\r
-.leaflet-bottom {\r
-       bottom: 0;\r
-       }\r
-.leaflet-left {\r
-       left: 0;\r
-       }\r
-.leaflet-control {\r
-       float: left;\r
-       clear: both;\r
-       }\r
-.leaflet-right .leaflet-control {\r
-       float: right;\r
-       }\r
-.leaflet-top .leaflet-control {\r
-       margin-top: 10px;\r
-       }\r
-.leaflet-bottom .leaflet-control {\r
-       margin-bottom: 10px;\r
-       }\r
-.leaflet-left .leaflet-control {\r
-       margin-left: 10px;\r
-       }\r
-.leaflet-right .leaflet-control {\r
-       margin-right: 10px;\r
-       }\r
-\r
-\r
-/* zoom and fade animations */\r
-\r
-.leaflet-fade-anim .leaflet-tile,\r
-.leaflet-fade-anim .leaflet-popup {\r
-       opacity: 0;\r
-       -webkit-transition: opacity 0.2s linear;\r
-          -moz-transition: opacity 0.2s linear;\r
-            -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
-\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
-            -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);\r
-               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-touching .leaflet-zoom-animated {\r
-       -webkit-transition: none;\r
-          -moz-transition: none;\r
-            -o-transition: none;\r
-               transition: none;\r
-       }\r
-\r
-.leaflet-zoom-anim .leaflet-zoom-hide {\r
-       visibility: hidden;\r
-       }\r
-\r
-\r
-/* cursors */\r
-\r
-.leaflet-clickable {\r
-       cursor: pointer;\r
-       }\r
-.leaflet-container {\r
-       cursor: -webkit-grab;\r
-       cursor:    -moz-grab;\r
-       }\r
-.leaflet-popup-pane,\r
-.leaflet-control {\r
-       cursor: auto;\r
-       }\r
-.leaflet-dragging .leaflet-container,\r
-.leaflet-dragging .leaflet-clickable {\r
-       cursor: move;\r
-       cursor: -webkit-grabbing;\r
-       cursor:    -moz-grabbing;\r
-       }\r
-\r
-\r
-/* visual tweaks */\r
-\r
-.leaflet-container {\r
-       background: #ddd;\r
-       outline: 0;\r
-       }\r
-.leaflet-container a {\r
-       color: #0078A8;\r
-       }\r
-.leaflet-container a.leaflet-active {\r
-       outline: 2px solid orange;\r
-       }\r
-.leaflet-zoom-box {\r
-       border: 2px dotted #38f;\r
-       background: rgba(255,255,255,0.5);\r
-       }\r
-\r
-\r
-/* general typography */\r
-.leaflet-container {\r
-       font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;\r
-       }\r
-\r
-\r
-/* general toolbar styles */\r
-\r
-.leaflet-bar {\r
-       box-shadow: 0 1px 5px rgba(0,0,0,0.65);\r
-       border-radius: 4px;\r
-       }\r
-.leaflet-bar a,\r
-.leaflet-bar a:hover {\r
-       background-color: #fff;\r
-       border-bottom: 1px solid #ccc;\r
-       width: 26px;\r
-       height: 26px;\r
-       line-height: 26px;\r
-       display: block;\r
-       text-align: center;\r
-       text-decoration: none;\r
-       color: black;\r
-       }\r
-.leaflet-bar a,\r
-.leaflet-control-layers-toggle {\r
-       background-position: 50% 50%;\r
-       background-repeat: no-repeat;\r
-       display: block;\r
-       }\r
-.leaflet-bar a:hover {\r
-       background-color: #f4f4f4;\r
-       }\r
-.leaflet-bar a:first-child {\r
-       border-top-left-radius: 4px;\r
-       border-top-right-radius: 4px;\r
-       }\r
-.leaflet-bar a:last-child {\r
-       border-bottom-left-radius: 4px;\r
-       border-bottom-right-radius: 4px;\r
-       border-bottom: none;\r
-       }\r
-.leaflet-bar a.leaflet-disabled {\r
-       cursor: default;\r
-       background-color: #f4f4f4;\r
-       color: #bbb;\r
-       }\r
-\r
-.leaflet-touch .leaflet-bar a {\r
-       width: 30px;\r
-       height: 30px;\r
-       line-height: 30px;\r
-       }\r
-\r
-\r
-/* zoom control */\r
-\r
-.leaflet-control-zoom-in,\r
-.leaflet-control-zoom-out {\r
-       font: bold 18px 'Lucida Console', Monaco, monospace;\r
-       text-indent: 1px;\r
-       }\r
-.leaflet-control-zoom-out {\r
-       font-size: 20px;\r
-       }\r
-\r
-.leaflet-touch .leaflet-control-zoom-in {\r
-       font-size: 22px;\r
-       }\r
-.leaflet-touch .leaflet-control-zoom-out {\r
-       font-size: 24px;\r
-       }\r
-\r
-\r
-/* layers control */\r
-\r
-.leaflet-control-layers {\r
-       box-shadow: 0 1px 5px rgba(0,0,0,0.4);\r
-       background: #fff;\r
-       border-radius: 5px;\r
-       }\r
-.leaflet-control-layers-toggle {\r
-       background-image: url(images/layers.png);\r
-       width: 36px;\r
-       height: 36px;\r
-       }\r
-.leaflet-retina .leaflet-control-layers-toggle {\r
-       background-image: url(images/layers-2x.png);\r
-       background-size: 26px 26px;\r
-       }\r
-.leaflet-touch .leaflet-control-layers-toggle {\r
-       width: 44px;\r
-       height: 44px;\r
-       }\r
-.leaflet-control-layers .leaflet-control-layers-list,\r
-.leaflet-control-layers-expanded .leaflet-control-layers-toggle {\r
-       display: none;\r
-       }\r
-.leaflet-control-layers-expanded .leaflet-control-layers-list {\r
-       display: block;\r
-       position: relative;\r
-       }\r
-.leaflet-control-layers-expanded {\r
-       padding: 6px 10px 6px 6px;\r
-       color: #333;\r
-       background: #fff;\r
-       }\r
-.leaflet-control-layers-selector {\r
-       margin-top: 2px;\r
-       position: relative;\r
-       top: 1px;\r
-       }\r
-.leaflet-control-layers label {\r
-       display: block;\r
-       }\r
-.leaflet-control-layers-separator {\r
-       height: 0;\r
-       border-top: 1px solid #ddd;\r
-       margin: 5px -10px 5px -6px;\r
-       }\r
-\r
-\r
-/* attribution and scale controls */\r
-\r
-.leaflet-container .leaflet-control-attribution {\r
-       background: #fff;\r
-       background: rgba(255, 255, 255, 0.7);\r
-       margin: 0;\r
-       }\r
-.leaflet-control-attribution,\r
-.leaflet-control-scale-line {\r
-       padding: 0 5px;\r
-       color: #333;\r
-       }\r
-.leaflet-control-attribution a {\r
-       text-decoration: none;\r
-       }\r
-.leaflet-control-attribution a:hover {\r
-       text-decoration: underline;\r
-       }\r
-.leaflet-container .leaflet-control-attribution,\r
-.leaflet-container .leaflet-control-scale {\r
-       font-size: 11px;\r
-       }\r
-.leaflet-left .leaflet-control-scale {\r
-       margin-left: 5px;\r
-       }\r
-.leaflet-bottom .leaflet-control-scale {\r
-       margin-bottom: 5px;\r
-       }\r
-.leaflet-control-scale-line {\r
-       border: 2px solid #777;\r
-       border-top: none;\r
-       line-height: 1.1;\r
-       padding: 2px 5px 1px;\r
-       font-size: 11px;\r
-       white-space: nowrap;\r
-       overflow: hidden;\r
-       -moz-box-sizing: content-box;\r
-            box-sizing: content-box;\r
-\r
-       background: #fff;\r
-       background: rgba(255, 255, 255, 0.5);\r
-       }\r
-.leaflet-control-scale-line:not(:first-child) {\r
-       border-top: 2px solid #777;\r
-       border-bottom: none;\r
-       margin-top: -2px;\r
-       }\r
-.leaflet-control-scale-line:not(:first-child):not(:last-child) {\r
-       border-bottom: 2px solid #777;\r
-       }\r
-\r
-.leaflet-touch .leaflet-control-attribution,\r
-.leaflet-touch .leaflet-control-layers,\r
-.leaflet-touch .leaflet-bar {\r
-       box-shadow: none;\r
-       }\r
-.leaflet-touch .leaflet-control-layers,\r
-.leaflet-touch .leaflet-bar {\r
-       border: 2px solid rgba(0,0,0,0.2);\r
-       background-clip: padding-box;\r
-       }\r
-\r
-\r
-/* popup */\r
-\r
-.leaflet-popup {\r
-       position: absolute;\r
-       text-align: center;\r
-       }\r
-.leaflet-popup-content-wrapper {\r
-       padding: 1px;\r
-       text-align: left;\r
-       border-radius: 12px;\r
-       }\r
-.leaflet-popup-content {\r
-       margin: 13px 19px;\r
-       line-height: 1.4;\r
-       }\r
-.leaflet-popup-content p {\r
-       margin: 18px 0;\r
-       }\r
-.leaflet-popup-tip-container {\r
-       margin: 0 auto;\r
-       width: 40px;\r
-       height: 20px;\r
-       position: relative;\r
-       overflow: hidden;\r
-       }\r
-.leaflet-popup-tip {\r
-       width: 17px;\r
-       height: 17px;\r
-       padding: 1px;\r
-\r
-       margin: -10px auto 0;\r
-\r
-       -webkit-transform: rotate(45deg);\r
-          -moz-transform: rotate(45deg);\r
-           -ms-transform: rotate(45deg);\r
-            -o-transform: rotate(45deg);\r
-               transform: rotate(45deg);\r
-       }\r
-.leaflet-popup-content-wrapper,\r
-.leaflet-popup-tip {\r
-       background: white;\r
-\r
-       box-shadow: 0 3px 14px rgba(0,0,0,0.4);\r
-       }\r
-.leaflet-container a.leaflet-popup-close-button {\r
-       position: absolute;\r
-       top: 0;\r
-       right: 0;\r
-       padding: 4px 4px 0 0;\r
-       text-align: center;\r
-       width: 18px;\r
-       height: 14px;\r
-       font: 16px/14px Tahoma, Verdana, sans-serif;\r
-       color: #c3c3c3;\r
-       text-decoration: none;\r
-       font-weight: bold;\r
-       background: transparent;\r
-       }\r
-.leaflet-container a.leaflet-popup-close-button:hover {\r
-       color: #999;\r
-       }\r
-.leaflet-popup-scrolled {\r
-       overflow: auto;\r
-       border-bottom: 1px solid #ddd;\r
-       border-top: 1px solid #ddd;\r
-       }\r
-\r
-.leaflet-oldie .leaflet-popup-content-wrapper {\r
-       zoom: 1;\r
-       }\r
-.leaflet-oldie .leaflet-popup-tip {\r
-       width: 24px;\r
-       margin: 0 auto;\r
-\r
-       -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";\r
-       filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);\r
-       }\r
-.leaflet-oldie .leaflet-popup-tip-container {\r
-       margin-top: -1px;\r
-       }\r
-\r
-.leaflet-oldie .leaflet-control-zoom,\r
-.leaflet-oldie .leaflet-control-layers,\r
-.leaflet-oldie .leaflet-popup-content-wrapper,\r
-.leaflet-oldie .leaflet-popup-tip {\r
-       border: 1px solid #999;\r
-       }\r
-\r
-\r
-/* div icon */\r
-\r
-.leaflet-div-icon {\r
-       background: #fff;\r
-       border: 1px solid #666;\r
-       }\r
+/* required styles */
+
+.leaflet-map-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-pane,
+.leaflet-tile-container,
+.leaflet-overlay-pane,
+.leaflet-shadow-pane,
+.leaflet-marker-pane,
+.leaflet-popup-pane,
+.leaflet-overlay-pane svg,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+       position: absolute;
+       left: 0;
+       top: 0;
+       }
+.leaflet-container {
+       overflow: hidden;
+       -ms-touch-action: none;
+       touch-action: none;
+       }
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+       -webkit-user-select: none;
+          -moz-user-select: none;
+               user-select: none;
+       -webkit-user-drag: none;
+       }
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+       display: block;
+       }
+/* map is broken in FF if you have max-width: 100% on tiles */
+.leaflet-container img {
+       max-width: none !important;
+       }
+/* stupid Android 2 doesn't understand "max-width: none" properly */
+.leaflet-container img.leaflet-image-layer {
+       max-width: 15000px !important;
+       }
+.leaflet-tile {
+       filter: inherit;
+       visibility: hidden;
+       }
+.leaflet-tile-loaded {
+       visibility: inherit;
+       }
+.leaflet-zoom-box {
+       width: 0;
+       height: 0;
+       }
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+.leaflet-overlay-pane svg {
+       -moz-user-select: none;
+       }
+
+.leaflet-tile-pane    { z-index: 2; }
+.leaflet-objects-pane { z-index: 3; }
+.leaflet-overlay-pane { z-index: 4; }
+.leaflet-shadow-pane  { z-index: 5; }
+.leaflet-marker-pane  { z-index: 6; }
+.leaflet-popup-pane   { z-index: 7; }
+
+.leaflet-vml-shape {
+       width: 1px;
+       height: 1px;
+       }
+.lvml {
+       behavior: url(#default#VML);
+       display: inline-block;
+       position: absolute;
+       }
+
+
+/* control positioning */
+
+.leaflet-control {
+       position: relative;
+       z-index: 7;
+       pointer-events: auto;
+       }
+.leaflet-top,
+.leaflet-bottom {
+       position: absolute;
+       z-index: 1000;
+       pointer-events: none;
+       }
+.leaflet-top {
+       top: 0;
+       }
+.leaflet-right {
+       right: 0;
+       }
+.leaflet-bottom {
+       bottom: 0;
+       }
+.leaflet-left {
+       left: 0;
+       }
+.leaflet-control {
+       float: left;
+       clear: both;
+       }
+.leaflet-right .leaflet-control {
+       float: right;
+       }
+.leaflet-top .leaflet-control {
+       margin-top: 10px;
+       }
+.leaflet-bottom .leaflet-control {
+       margin-bottom: 10px;
+       }
+.leaflet-left .leaflet-control {
+       margin-left: 10px;
+       }
+.leaflet-right .leaflet-control {
+       margin-right: 10px;
+       }
+
+
+/* zoom and fade animations */
+
+.leaflet-fade-anim .leaflet-tile,
+.leaflet-fade-anim .leaflet-popup {
+       opacity: 0;
+       -webkit-transition: opacity 0.2s linear;
+          -moz-transition: opacity 0.2s linear;
+            -o-transition: opacity 0.2s linear;
+               transition: opacity 0.2s linear;
+       }
+.leaflet-fade-anim .leaflet-tile-loaded,
+.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
+       opacity: 1;
+       }
+
+.leaflet-zoom-anim .leaflet-zoom-animated {
+       -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
+          -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
+            -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
+               transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
+       }
+.leaflet-zoom-anim .leaflet-tile,
+.leaflet-pan-anim .leaflet-tile,
+.leaflet-touching .leaflet-zoom-animated {
+       -webkit-transition: none;
+          -moz-transition: none;
+            -o-transition: none;
+               transition: none;
+       }
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+       visibility: hidden;
+       }
+
+
+/* cursors */
+
+.leaflet-clickable {
+       cursor: pointer;
+       }
+.leaflet-container {
+       cursor: -webkit-grab;
+       cursor:    -moz-grab;
+       }
+.leaflet-popup-pane,
+.leaflet-control {
+       cursor: auto;
+       }
+.leaflet-dragging .leaflet-container,
+.leaflet-dragging .leaflet-clickable {
+       cursor: move;
+       cursor: -webkit-grabbing;
+       cursor:    -moz-grabbing;
+       }
+
+
+/* visual tweaks */
+
+.leaflet-container {
+       background: #ddd;
+       outline: 0;
+       }
+.leaflet-container a {
+       color: #0078A8;
+       }
+.leaflet-container a.leaflet-active {
+       outline: 2px solid orange;
+       }
+.leaflet-zoom-box {
+       border: 2px dotted #38f;
+       background: rgba(255,255,255,0.5);
+       }
+
+
+/* general typography */
+.leaflet-container {
+       font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+       }
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+       box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+       border-radius: 4px;
+       }
+.leaflet-bar a,
+.leaflet-bar a:hover {
+       background-color: #fff;
+       border-bottom: 1px solid #ccc;
+       width: 26px;
+       height: 26px;
+       line-height: 26px;
+       display: block;
+       text-align: center;
+       text-decoration: none;
+       color: black;
+       }
+.leaflet-bar a,
+.leaflet-control-layers-toggle {
+       background-position: 50% 50%;
+       background-repeat: no-repeat;
+       display: block;
+       }
+.leaflet-bar a:hover {
+       background-color: #f4f4f4;
+       }
+.leaflet-bar a:first-child {
+       border-top-left-radius: 4px;
+       border-top-right-radius: 4px;
+       }
+.leaflet-bar a:last-child {
+       border-bottom-left-radius: 4px;
+       border-bottom-right-radius: 4px;
+       border-bottom: none;
+       }
+.leaflet-bar a.leaflet-disabled {
+       cursor: default;
+       background-color: #f4f4f4;
+       color: #bbb;
+       }
+
+.leaflet-touch .leaflet-bar a {
+       width: 30px;
+       height: 30px;
+       line-height: 30px;
+       }
+
+
+/* zoom control */
+
+.leaflet-control-zoom-in,
+.leaflet-control-zoom-out {
+       font: bold 18px 'Lucida Console', Monaco, monospace;
+       text-indent: 1px;
+       }
+.leaflet-control-zoom-out {
+       font-size: 20px;
+       }
+
+.leaflet-touch .leaflet-control-zoom-in {
+       font-size: 22px;
+       }
+.leaflet-touch .leaflet-control-zoom-out {
+       font-size: 24px;
+       }
+
+
+/* layers control */
+
+.leaflet-control-layers {
+       box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+       background: #fff;
+       border-radius: 5px;
+       }
+.leaflet-control-layers-toggle {
+       background-image: url(images/layers.png);
+       width: 36px;
+       height: 36px;
+       }
+.leaflet-retina .leaflet-control-layers-toggle {
+       background-image: url(images/layers-2x.png);
+       background-size: 26px 26px;
+       }
+.leaflet-touch .leaflet-control-layers-toggle {
+       width: 44px;
+       height: 44px;
+       }
+.leaflet-control-layers .leaflet-control-layers-list,
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+       display: none;
+       }
+.leaflet-control-layers-expanded .leaflet-control-layers-list {
+       display: block;
+       position: relative;
+       }
+.leaflet-control-layers-expanded {
+       padding: 6px 10px 6px 6px;
+       color: #333;
+       background: #fff;
+       }
+.leaflet-control-layers-selector {
+       margin-top: 2px;
+       position: relative;
+       top: 1px;
+       }
+.leaflet-control-layers label {
+       display: block;
+       }
+.leaflet-control-layers-separator {
+       height: 0;
+       border-top: 1px solid #ddd;
+       margin: 5px -10px 5px -6px;
+       }
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+       background: #fff;
+       background: rgba(255, 255, 255, 0.7);
+       margin: 0;
+       }
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+       padding: 0 5px;
+       color: #333;
+       }
+.leaflet-control-attribution a {
+       text-decoration: none;
+       }
+.leaflet-control-attribution a:hover {
+       text-decoration: underline;
+       }
+.leaflet-container .leaflet-control-attribution,
+.leaflet-container .leaflet-control-scale {
+       font-size: 11px;
+       }
+.leaflet-left .leaflet-control-scale {
+       margin-left: 5px;
+       }
+.leaflet-bottom .leaflet-control-scale {
+       margin-bottom: 5px;
+       }
+.leaflet-control-scale-line {
+       border: 2px solid #777;
+       border-top: none;
+       line-height: 1.1;
+       padding: 2px 5px 1px;
+       font-size: 11px;
+       white-space: nowrap;
+       overflow: hidden;
+       -moz-box-sizing: content-box;
+            box-sizing: content-box;
+
+       background: #fff;
+       background: rgba(255, 255, 255, 0.5);
+       }
+.leaflet-control-scale-line:not(:first-child) {
+       border-top: 2px solid #777;
+       border-bottom: none;
+       margin-top: -2px;
+       }
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {
+       border-bottom: 2px solid #777;
+       }
+
+.leaflet-touch .leaflet-control-attribution,
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+       box-shadow: none;
+       }
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+       border: 2px solid rgba(0,0,0,0.2);
+       background-clip: padding-box;
+       }
+
+
+/* popup */
+
+.leaflet-popup {
+       position: absolute;
+       text-align: center;
+       }
+.leaflet-popup-content-wrapper {
+       padding: 1px;
+       text-align: left;
+       border-radius: 12px;
+       }
+.leaflet-popup-content {
+       margin: 13px 19px;
+       line-height: 1.4;
+       }
+.leaflet-popup-content p {
+       margin: 18px 0;
+       }
+.leaflet-popup-tip-container {
+       margin: 0 auto;
+       width: 40px;
+       height: 20px;
+       position: relative;
+       overflow: hidden;
+       }
+.leaflet-popup-tip {
+       width: 17px;
+       height: 17px;
+       padding: 1px;
+
+       margin: -10px auto 0;
+
+       -webkit-transform: rotate(45deg);
+          -moz-transform: rotate(45deg);
+           -ms-transform: rotate(45deg);
+            -o-transform: rotate(45deg);
+               transform: rotate(45deg);
+       }
+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip {
+       background: white;
+
+       box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+       }
+.leaflet-container a.leaflet-popup-close-button {
+       position: absolute;
+       top: 0;
+       right: 0;
+       padding: 4px 4px 0 0;
+       text-align: center;
+       width: 18px;
+       height: 14px;
+       font: 16px/14px Tahoma, Verdana, sans-serif;
+       color: #c3c3c3;
+       text-decoration: none;
+       font-weight: bold;
+       background: transparent;
+       }
+.leaflet-container a.leaflet-popup-close-button:hover {
+       color: #999;
+       }
+.leaflet-popup-scrolled {
+       overflow: auto;
+       border-bottom: 1px solid #ddd;
+       border-top: 1px solid #ddd;
+       }
+
+.leaflet-oldie .leaflet-popup-content-wrapper {
+       zoom: 1;
+       }
+.leaflet-oldie .leaflet-popup-tip {
+       width: 24px;
+       margin: 0 auto;
+
+       -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+       filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+       }
+.leaflet-oldie .leaflet-popup-tip-container {
+       margin-top: -1px;
+       }
+
+.leaflet-oldie .leaflet-control-zoom,
+.leaflet-oldie .leaflet-control-layers,
+.leaflet-oldie .leaflet-popup-content-wrapper,
+.leaflet-oldie .leaflet-popup-tip {
+       border: 1px solid #999;
+       }
+
+
+/* div icon */
+
+.leaflet-div-icon {
+       background: #fff;
+       border: 1px solid #666;
+       }

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index bc92d749f58eecc3079f2348290edc7224cd302c..d3d5635741c2dc68a16e0a3b72ed000ede34e3a4 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.5';
+L.version = '0.7.7';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -520,7 +520,7 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
 
            mobile = typeof orientation !== undefined + '',
            msPointer = !window.PointerEvent && window.MSPointerEvent,
-               pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) ||
+               pointer = (window.PointerEvent && window.navigator.pointerEnabled) ||
                                  msPointer,
            retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
                     ('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
@@ -4389,7 +4389,9 @@ L.FeatureGroup = L.LayerGroup.extend({
                        layer = this._layers[layer];
                }
 
-               layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+               if ('off' in layer) {
+                       layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+               }
 
                L.LayerGroup.prototype.removeLayer.call(this, layer);
 
@@ -4709,7 +4711,7 @@ L.Path = L.Path.extend({
        },
 
        _fireMouseEvent: function (e) {
-               if (!this.hasEventListeners(e.type)) { return; }
+               if (!this._map || !this.hasEventListeners(e.type)) { return; }
 
                var map = this._map,
                    containerPoint = map.mouseEventToContainerPoint(e),
@@ -7167,8 +7169,9 @@ L.extend(L.DomEvent, {
                    pointers = this._pointers;
 
                var cb = function (e) {
-
-                       L.DomEvent.preventDefault(e);
+                       if (e.pointerType !== 'mouse' && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
+                               L.DomEvent.preventDefault(e);
+                       }
 
                        var alreadyInArray = false;
                        for (var i = 0; i < pointers.length; i++) {
@@ -8939,11 +8942,13 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 
                L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
 
-               this._resetView(this._animateToCenter, this._animateToZoom, true, true);
+               L.Util.requestAnimFrame(function () {
+                       this._resetView(this._animateToCenter, this._animateToZoom, true, true);
 
-               if (L.Draggable) {
-                       L.Draggable._disabled = false;
-               }
+                       if (L.Draggable) {
+                               L.Draggable._disabled = false;
+                       }
+               }, this);
        }
 });