leaflet-js 0.6.beta4 → 0.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (226) hide show
  1. checksums.yaml +6 -14
  2. data/CHANGELOG.rdoc +3 -0
  3. data/leaflet-js.gemspec +2 -2
  4. data/lib/leaflet.draw/CHANGELOG.md +45 -0
  5. data/lib/leaflet.draw/README.md +70 -23
  6. data/lib/leaflet.draw/build/deps.js +1 -0
  7. data/lib/leaflet.draw/dist/images/spritesheet-2x.png +0 -0
  8. data/lib/leaflet.draw/dist/images/spritesheet.png +0 -0
  9. data/lib/leaflet.draw/dist/leaflet.draw-src.js +489 -136
  10. data/lib/leaflet.draw/dist/leaflet.draw.css +34 -2
  11. data/lib/leaflet.draw/dist/leaflet.draw.ie.css +5 -0
  12. data/lib/leaflet.draw/dist/leaflet.draw.js +2 -2
  13. data/lib/leaflet.draw/examples/basic.html +14 -7
  14. data/lib/leaflet.draw/examples/libs/images/layers-2x.png +0 -0
  15. data/lib/leaflet.draw/examples/libs/images/layers.png +0 -0
  16. data/lib/leaflet.draw/examples/libs/images/marker-icon-2x.png +0 -0
  17. data/lib/leaflet.draw/examples/libs/leaflet-src.js +1129 -608
  18. data/lib/leaflet.draw/examples/libs/leaflet.css +85 -66
  19. data/lib/leaflet.draw/package.json +2 -2
  20. data/lib/leaflet.draw/spec/suites/DrawControlSpec.js +1 -1
  21. data/lib/leaflet.draw/spec/suites/GeometryUtilSpec.js +25 -0
  22. data/lib/leaflet.draw/spec/suites/LatLngUtilSpec.js +9 -0
  23. data/lib/leaflet.draw/src/Control.Draw.js +1 -0
  24. data/lib/leaflet.draw/src/Leaflet.draw.js +89 -1
  25. data/lib/leaflet.draw/src/Toolbar.js +2 -6
  26. data/lib/leaflet.draw/src/Tooltip.js +20 -7
  27. data/lib/leaflet.draw/src/draw/DrawToolbar.js +26 -22
  28. data/lib/leaflet.draw/src/draw/handler/Draw.Circle.js +11 -6
  29. data/lib/leaflet.draw/src/draw/handler/Draw.Feature.js +6 -2
  30. data/lib/leaflet.draw/src/draw/handler/Draw.Marker.js +7 -2
  31. data/lib/leaflet.draw/src/draw/handler/Draw.Polygon.js +29 -7
  32. data/lib/leaflet.draw/src/draw/handler/Draw.Polyline.js +44 -21
  33. data/lib/leaflet.draw/src/draw/handler/Draw.Rectangle.js +3 -3
  34. data/lib/leaflet.draw/src/draw/handler/Draw.SimpleShape.js +14 -1
  35. data/lib/leaflet.draw/src/edit/EditToolbar.js +86 -16
  36. data/lib/leaflet.draw/src/edit/handler/Edit.Poly.js +10 -7
  37. data/lib/leaflet.draw/src/edit/handler/Edit.SimpleShape.js +1 -2
  38. data/lib/leaflet.draw/src/edit/handler/EditToolbar.Delete.js +15 -3
  39. data/lib/leaflet.draw/src/edit/handler/EditToolbar.Edit.js +56 -38
  40. data/lib/leaflet.draw/src/ext/GeometryUtil.js +68 -0
  41. data/lib/leaflet.draw/src/images/spritesheet.svg +41 -0
  42. data/lib/leaflet.label/CHANGELOG.md +32 -0
  43. data/lib/leaflet.label/README.md +21 -4
  44. data/lib/leaflet.label/build/build.js +2 -2
  45. data/lib/leaflet.label/build/deps.js +2 -0
  46. data/lib/leaflet.label/build/hintrc.js +4 -0
  47. data/lib/leaflet.label/dist/leaflet.label-src.js +266 -83
  48. data/lib/leaflet.label/dist/leaflet.label.css +23 -4
  49. data/lib/leaflet.label/dist/leaflet.label.js +1 -1
  50. data/lib/leaflet.label/example/label.html +6 -3
  51. data/lib/leaflet.label/libs/leaflet/images/layers-2x.png +0 -0
  52. data/lib/leaflet.label/libs/leaflet/images/layers.png +0 -0
  53. data/lib/leaflet.label/libs/leaflet/images/marker-icon-2x.png +0 -0
  54. data/lib/leaflet.label/libs/leaflet/leaflet-src.js +1129 -608
  55. data/lib/leaflet.label/libs/leaflet/leaflet.css +85 -66
  56. data/lib/leaflet.label/libs/leaflet/leaflet.js +6 -5
  57. data/lib/leaflet.label/package.json +19 -0
  58. data/lib/leaflet.label/src/BaseMarkerMethods.js +129 -0
  59. data/lib/leaflet.label/src/CircleMarker.Label.js +7 -0
  60. data/lib/leaflet.label/src/Label.js +161 -37
  61. data/lib/leaflet.label/src/Leaflet.label.js +1 -1
  62. data/lib/leaflet.label/src/Map.Label.js +0 -2
  63. data/lib/leaflet.label/src/Marker.Label.js +15 -120
  64. data/lib/leaflet.label/src/Path.Label.js +11 -11
  65. data/lib/leaflet/CHANGELOG.md +299 -31
  66. data/lib/leaflet/CONTRIBUTING.md +3 -3
  67. data/lib/leaflet/FAQ.md +138 -0
  68. data/lib/leaflet/Jakefile.js +24 -4
  69. data/lib/leaflet/PLUGIN-GUIDE.md +127 -0
  70. data/lib/leaflet/README.md +10 -6
  71. data/lib/leaflet/build/build.html +3 -19
  72. data/lib/leaflet/build/build.js +21 -51
  73. data/lib/leaflet/build/deps.js +10 -7
  74. data/lib/leaflet/build/hintrc.js +6 -4
  75. data/lib/leaflet/debug/hacks/jitter.html +0 -1
  76. data/lib/leaflet/debug/map/canvas.html +11 -12
  77. data/lib/leaflet/debug/map/controls.html +3 -4
  78. data/lib/leaflet/debug/map/geolocation.html +0 -1
  79. data/lib/leaflet/debug/map/iframe.html +11 -0
  80. data/lib/leaflet/debug/map/image-overlay.html +0 -1
  81. data/lib/leaflet/debug/map/map-mobile.html +0 -1
  82. data/lib/leaflet/debug/map/map.html +1 -2
  83. data/lib/leaflet/debug/map/max-bounds.html +2 -1
  84. data/lib/leaflet/debug/map/opacity.html +223 -0
  85. data/lib/leaflet/debug/map/scroll.html +6 -1
  86. data/lib/leaflet/debug/map/simple-proj.html +0 -1
  87. data/lib/leaflet/debug/map/wms-marble.html +4 -5
  88. data/lib/leaflet/debug/map/wms.html +0 -1
  89. data/lib/leaflet/debug/map/zoomlevels.html +0 -1
  90. data/lib/leaflet/debug/tests/add_remove_layers.html +5 -6
  91. data/lib/leaflet/debug/tests/bringtoback.html +0 -1
  92. data/lib/leaflet/debug/tests/canvasloop.html +47 -0
  93. data/lib/leaflet/debug/tests/click_on_canvas.html +0 -1
  94. data/lib/leaflet/debug/tests/dragging_and_copyworldjump.html +61 -0
  95. data/lib/leaflet/debug/tests/opacity.html +0 -1
  96. data/lib/leaflet/debug/tests/popupcontextmenuclicks.html +59 -0
  97. data/lib/leaflet/debug/tests/remove_while_dragging.html +4 -5
  98. data/lib/leaflet/debug/tests/removetilewhilepan.html +0 -1
  99. data/lib/leaflet/debug/tests/reuse_popups.html +0 -1
  100. data/lib/leaflet/debug/tests/rtl.html +42 -0
  101. data/lib/leaflet/debug/tests/rtl2.html +27 -0
  102. data/lib/leaflet/debug/tests/set_icon_reuse_dom.html +43 -0
  103. data/lib/leaflet/debug/tests/svg_clicks.html +3 -4
  104. data/lib/leaflet/debug/vector/bounds-extend.html +0 -1
  105. data/lib/leaflet/debug/vector/feature-group-bounds.html +0 -1
  106. data/lib/leaflet/debug/vector/geojson.html +0 -1
  107. data/lib/leaflet/debug/vector/rectangle.html +0 -1
  108. data/lib/leaflet/debug/vector/touchzoomemu.html +2 -3
  109. data/lib/leaflet/debug/vector/vector-bounds.html +0 -1
  110. data/lib/leaflet/debug/vector/vector-canvas.html +0 -1
  111. data/lib/leaflet/debug/vector/vector-mobile.html +0 -1
  112. data/lib/leaflet/debug/vector/vector-simple.html +0 -1
  113. data/lib/leaflet/debug/vector/vector.html +0 -1
  114. data/lib/leaflet/dist/images/layers-2x.png +0 -0
  115. data/lib/leaflet/dist/images/layers.png +0 -0
  116. data/lib/leaflet/dist/leaflet.css +85 -66
  117. data/lib/leaflet/package.json +25 -20
  118. data/lib/leaflet/spec/after.js +1 -1
  119. data/lib/leaflet/spec/index.html +21 -13
  120. data/lib/leaflet/spec/karma.conf.js +51 -50
  121. data/lib/leaflet/spec/spec.hintrc.js +25 -0
  122. data/lib/leaflet/spec/suites/LeafletSpec.js +2 -2
  123. data/lib/leaflet/spec/suites/SpecHelper.js +37 -21
  124. data/lib/leaflet/spec/suites/control/Control.LayersSpec.js +1 -1
  125. data/lib/leaflet/spec/suites/core/ClassSpec.js +12 -12
  126. data/lib/leaflet/spec/suites/core/EventsSpec.js +74 -18
  127. data/lib/leaflet/spec/suites/core/UtilSpec.js +69 -25
  128. data/lib/leaflet/spec/suites/dom/DomEventSpec.js +16 -16
  129. data/lib/leaflet/spec/suites/dom/DomUtilSpec.js +9 -16
  130. data/lib/leaflet/spec/suites/dom/PosAnimationSpec.js +27 -0
  131. data/lib/leaflet/spec/suites/geo/CRSSpec.js +47 -0
  132. data/lib/leaflet/spec/suites/geo/LatLngBoundsSpec.js +22 -14
  133. data/lib/leaflet/spec/suites/geo/LatLngSpec.js +22 -8
  134. data/lib/leaflet/spec/suites/geo/ProjectionSpec.js +21 -20
  135. data/lib/leaflet/spec/suites/geometry/BoundsSpec.js +15 -15
  136. data/lib/leaflet/spec/suites/geometry/PointSpec.js +12 -12
  137. data/lib/leaflet/spec/suites/geometry/TransformationSpec.js +4 -4
  138. data/lib/leaflet/spec/suites/layer/FeatureGroupSpec.js +59 -9
  139. data/lib/leaflet/spec/suites/layer/GeoJSONSpec.js +213 -17
  140. data/lib/leaflet/spec/suites/layer/LayerGroupSpec.js +6 -6
  141. data/lib/leaflet/spec/suites/layer/PopupSpec.js +65 -5
  142. data/lib/leaflet/spec/suites/layer/TileLayerSpec.js +16 -15
  143. data/lib/leaflet/spec/suites/layer/marker/MarkerSpec.js +94 -0
  144. data/lib/leaflet/spec/suites/layer/vector/CircleMarkerSpec.js +7 -7
  145. data/lib/leaflet/spec/suites/layer/vector/PolygonSpec.js +38 -2
  146. data/lib/leaflet/spec/suites/layer/vector/PolylineGeometrySpec.js +4 -4
  147. data/lib/leaflet/spec/suites/layer/vector/PolylineSpec.js +2 -2
  148. data/lib/leaflet/spec/suites/map/MapSpec.js +318 -26
  149. data/lib/leaflet/spec/suites/map/handler/Map.DragSpec.js +38 -0
  150. data/lib/leaflet/src/Leaflet.js +2 -2
  151. data/lib/leaflet/src/control/Control.Attribution.js +6 -0
  152. data/lib/leaflet/src/control/Control.Layers.js +33 -24
  153. data/lib/leaflet/src/control/Control.Zoom.js +12 -4
  154. data/lib/leaflet/src/control/Control.js +10 -0
  155. data/lib/leaflet/src/copyright.js +2 -1
  156. data/lib/leaflet/src/core/Browser.js +11 -10
  157. data/lib/leaflet/src/core/Events.js +15 -11
  158. data/lib/leaflet/src/core/Util.js +19 -14
  159. data/lib/leaflet/src/dom/DomEvent.DoubleTap.js +13 -12
  160. data/lib/leaflet/src/dom/DomEvent.Pointer.js +155 -0
  161. data/lib/leaflet/src/dom/DomEvent.js +57 -19
  162. data/lib/leaflet/src/dom/DomUtil.js +89 -34
  163. data/lib/leaflet/src/dom/Draggable.js +26 -89
  164. data/lib/leaflet/src/dom/PosAnimation.js +13 -2
  165. data/lib/leaflet/src/geo/LatLng.js +16 -5
  166. data/lib/leaflet/src/geo/LatLngBounds.js +5 -2
  167. data/lib/leaflet/src/geo/crs/CRS.EPSG3395.js +2 -2
  168. data/lib/leaflet/src/geo/crs/CRS.js +5 -0
  169. data/lib/leaflet/src/geo/projection/Projection.Mercator.js +3 -3
  170. data/lib/leaflet/src/geometry/LineUtil.js +2 -2
  171. data/lib/leaflet/src/images/layers.svg +8 -0
  172. data/lib/leaflet/src/images/marker.svg +61 -1
  173. data/lib/leaflet/src/layer/FeatureGroup.js +24 -7
  174. data/lib/leaflet/src/layer/GeoJSON.js +97 -56
  175. data/lib/leaflet/src/layer/ImageOverlay.js +9 -0
  176. data/lib/leaflet/src/layer/LayerGroup.js +8 -3
  177. data/lib/leaflet/src/layer/Popup.js +56 -34
  178. data/lib/leaflet/src/layer/marker/DivIcon.js +4 -2
  179. data/lib/leaflet/src/layer/marker/Icon.Default.js +1 -1
  180. data/lib/leaflet/src/layer/marker/Icon.js +15 -18
  181. data/lib/leaflet/src/layer/marker/Marker.Drag.js +7 -5
  182. data/lib/leaflet/src/layer/marker/Marker.Popup.js +22 -5
  183. data/lib/leaflet/src/layer/marker/Marker.js +75 -32
  184. data/lib/leaflet/src/layer/tile/TileLayer.Anim.js +14 -26
  185. data/lib/leaflet/src/layer/tile/TileLayer.Canvas.js +7 -6
  186. data/lib/leaflet/src/layer/tile/TileLayer.WMS.js +14 -10
  187. data/lib/leaflet/src/layer/tile/TileLayer.js +53 -32
  188. data/lib/leaflet/src/layer/vector/CircleMarker.js +11 -0
  189. data/lib/leaflet/src/layer/vector/MultiPoly.js +10 -0
  190. data/lib/leaflet/src/layer/vector/Path.SVG.js +14 -3
  191. data/lib/leaflet/src/layer/vector/Path.VML.js +12 -2
  192. data/lib/leaflet/src/layer/vector/Path.js +7 -3
  193. data/lib/leaflet/src/layer/vector/Polygon.js +14 -3
  194. data/lib/leaflet/src/layer/vector/canvas/CircleMarker.Canvas.js +9 -0
  195. data/lib/leaflet/src/layer/vector/canvas/Path.Canvas.js +1 -0
  196. data/lib/leaflet/src/map/Map.js +192 -125
  197. data/lib/leaflet/src/map/anim/Map.PanAnimation.js +29 -19
  198. data/lib/leaflet/src/map/anim/Map.ZoomAnimation.js +21 -9
  199. data/lib/leaflet/src/map/ext/Map.Geolocation.js +11 -4
  200. data/lib/leaflet/src/map/handler/Map.BoxZoom.js +26 -12
  201. data/lib/leaflet/src/map/handler/Map.DoubleClickZoom.js +10 -3
  202. data/lib/leaflet/src/map/handler/Map.Drag.js +12 -6
  203. data/lib/leaflet/src/map/handler/Map.Keyboard.js +5 -2
  204. data/lib/leaflet/src/map/handler/Map.ScrollWheelZoom.js +7 -1
  205. data/lib/leaflet/src/map/handler/Map.Tap.js +107 -0
  206. data/lib/leaflet/src/map/handler/Map.TouchZoom.js +9 -3
  207. data/vendor/assets/images/layers-2x.png +0 -0
  208. data/vendor/assets/images/layers.png +0 -0
  209. data/vendor/assets/images/spritesheet-2x.png +0 -0
  210. data/vendor/assets/images/spritesheet.png +0 -0
  211. data/vendor/assets/javascripts/leaflet.draw.js +2 -4
  212. data/vendor/assets/javascripts/leaflet.js +3 -1
  213. data/vendor/assets/javascripts/leaflet.label.js +2 -0
  214. data/vendor/assets/stylesheets/leaflet.css.erb +337 -318
  215. data/vendor/assets/stylesheets/leaflet.draw.css.erb +35 -3
  216. data/vendor/assets/stylesheets/leaflet.draw.ie.css +5 -0
  217. data/vendor/assets/stylesheets/leaflet.label.css +23 -4
  218. metadata +40 -14
  219. data/lib/leaflet.draw/examples/libs/leaflet.ie.css +0 -51
  220. data/lib/leaflet.label/libs/leaflet/leaflet.ie.css +0 -51
  221. data/lib/leaflet/dist/leaflet-src.js +0 -8579
  222. data/lib/leaflet/dist/leaflet.ie.css +0 -51
  223. data/lib/leaflet/dist/leaflet.js +0 -8
  224. data/lib/leaflet/spec/happen.js +0 -93
  225. data/lib/leaflet/src/dom/DomEvent.MsTouch.js +0 -146
  226. data/vendor/assets/stylesheets/leaflet.ie.css +0 -51
@@ -3,7 +3,8 @@
3
3
  */
4
4
 
5
5
  L.Map.mergeOptions({
6
- touchZoom: L.Browser.touch && !L.Browser.android23
6
+ touchZoom: L.Browser.touch && !L.Browser.android23,
7
+ bounceAtZoomLimits: true
7
8
  });
8
9
 
9
10
  L.Map.TouchZoom = L.Handler.extend({
@@ -56,6 +57,11 @@ L.Map.TouchZoom = L.Handler.extend({
56
57
 
57
58
  if (this._scale === 1) { return; }
58
59
 
60
+ if (!map.options.bounceAtZoomLimits) {
61
+ if ((map.getZoom() === map.getMinZoom() && this._scale < 1) ||
62
+ (map.getZoom() === map.getMaxZoom() && this._scale > 1)) { return; }
63
+ }
64
+
59
65
  if (!this._moved) {
60
66
  L.DomUtil.addClass(map._mapPane, 'leaflet-touching');
61
67
 
@@ -79,7 +85,7 @@ L.Map.TouchZoom = L.Handler.extend({
79
85
  center = map.layerPointToLatLng(origin),
80
86
  zoom = map.getScaleZoom(this._scale);
81
87
 
82
- map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta, true);
88
+ map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
83
89
  },
84
90
 
85
91
  _onTouchEnd: function () {
@@ -109,7 +115,7 @@ L.Map.TouchZoom = L.Handler.extend({
109
115
  zoom = map._limitZoom(oldZoom + roundZoomDelta),
110
116
  scale = map.getZoomScale(zoom) / this._scale;
111
117
 
112
- map._animateZoom(center, zoom, origin, scale, null, true);
118
+ map._animateZoom(center, zoom, origin, scale);
113
119
  },
114
120
 
115
121
  _getScaleOrigin: function () {
Binary file
Binary file
Binary file
@@ -18,6 +18,7 @@
18
18
 
19
19
  // Extensions
20
20
  //=require ../../../lib/leaflet.draw/src/ext/LatLngUtil.js
21
+ //=require ../../../lib/leaflet.draw/src/ext/GeometryUtil.js
21
22
  //=require ../../../lib/leaflet.draw/src/ext/LineUtil.Intersect.js
22
23
  //=require ../../../lib/leaflet.draw/src/ext/Polyline.Intersect.js
23
24
  //=require ../../../lib/leaflet.draw/src/ext/Polygon.Intersect.js
@@ -27,10 +28,7 @@
27
28
  //=require ../../../lib/leaflet.draw/src/Toolbar.js
28
29
  //=require ../../../lib/leaflet.draw/src/Tooltip.js
29
30
 
30
- // CommonUI
31
- //=require ../../../lib/leaflet.draw/src/draw/DrawToolbar.js
32
-
33
- // CommonUI
31
+ // DrawUI
34
32
  //=require ../../../lib/leaflet.draw/src/draw/DrawToolbar.js
35
33
 
36
34
  // EditUI
@@ -89,6 +89,7 @@
89
89
  //=require ../../../lib/leaflet/src/layer/vector/canvas/Polyline.Canvas.js
90
90
  //=require ../../../lib/leaflet/src/layer/vector/canvas/Polygon.Canvas.js
91
91
  //=require ../../../lib/leaflet/src/layer/vector/canvas/Circle.Canvas.js
92
+ //=require ../../../lib/leaflet/src/layer/vector/canvas/CircleMarker.Canvas.js
92
93
 
93
94
  // GeoJSON
94
95
  //=require ../../../lib/leaflet/src/layer/GeoJSON.js
@@ -105,8 +106,9 @@
105
106
 
106
107
  // TouchZoom
107
108
  //=require ../../../lib/leaflet/src/dom/DomEvent.DoubleTap.js
108
- //=require ../../../lib/leaflet/src/dom/DomEvent.MsTouch.js
109
+ //=require ../../../lib/leaflet/src/dom/DomEvent.Pointer.js
109
110
  //=require ../../../lib/leaflet/src/map/handler/Map.TouchZoom.js
111
+ //=require ../../../lib/leaflet/src/map/handler/Map.Tap.js
110
112
 
111
113
  // BoxZoom
112
114
  //=require ../../../lib/leaflet/src/map/handler/Map.BoxZoom.js
@@ -3,7 +3,9 @@
3
3
 
4
4
  // Label
5
5
  //=require ../../../lib/leaflet.label/src/Label.js
6
+ //=require ../../../lib/leaflet.label/src/BaseMarkerMethods.js
6
7
  //=require ../../../lib/leaflet.label/src/Marker.Label.js
8
+ //=require ../../../lib/leaflet.label/src/CircleMarker.Label.js
7
9
  //=require ../../../lib/leaflet.label/src/Path.Label.js
8
10
  //=require ../../../lib/leaflet.label/src/Map.Label.js
9
11
  //=require ../../../lib/leaflet.label/src/FeatureGroup.Label.js
@@ -14,45 +14,49 @@
14
14
  .leaflet-zoom-box,
15
15
  .leaflet-image-layer,
16
16
  .leaflet-layer {
17
- position: absolute;
18
- left: 0;
19
- top: 0;
20
- }
17
+ position: absolute;
18
+ left: 0;
19
+ top: 0;
20
+ }
21
21
  .leaflet-container {
22
- overflow: hidden;
23
- -ms-touch-action: none;
24
- }
22
+ overflow: hidden;
23
+ -ms-touch-action: none;
24
+ }
25
25
  .leaflet-tile,
26
26
  .leaflet-marker-icon,
27
27
  .leaflet-marker-shadow {
28
- -webkit-user-select: none;
29
- -moz-user-select: none;
30
- user-select: none;
31
- -webkit-user-drag: none;
32
- }
28
+ -webkit-user-select: none;
29
+ -moz-user-select: none;
30
+ user-select: none;
31
+ -webkit-user-drag: none;
32
+ }
33
33
  .leaflet-marker-icon,
34
34
  .leaflet-marker-shadow {
35
- display: block;
36
- }
37
- /* map is broken in FF if you have max-width: 100% on tiles */
35
+ display: block;
36
+ }
37
+ /* map is broken in FF if you have max-width: 100% on tiles */
38
38
  .leaflet-container img {
39
- max-width: none !important;
40
- }
41
- /* stupid Android 2 doesn't understand "max-width: none" properly */
39
+ max-width: none !important;
40
+ }
41
+ /* stupid Android 2 doesn't understand "max-width: none" properly */
42
42
  .leaflet-container img.leaflet-image-layer {
43
- max-width: 15000px !important;
44
- }
43
+ max-width: 15000px !important;
44
+ }
45
45
  .leaflet-tile {
46
- filter: inherit;
47
- visibility: hidden;
48
- }
46
+ filter: inherit;
47
+ visibility: hidden;
48
+ }
49
49
  .leaflet-tile-loaded {
50
- visibility: inherit;
51
- }
50
+ visibility: inherit;
51
+ }
52
52
  .leaflet-zoom-box {
53
- width: 0;
54
- height: 0;
55
- }
53
+ width: 0;
54
+ height: 0;
55
+ }
56
+ /* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
57
+ .leaflet-overlay-pane svg {
58
+ -moz-user-select: none;
59
+ }
56
60
 
57
61
  .leaflet-tile-pane { z-index: 2; }
58
62
  .leaflet-objects-pane { z-index: 3; }
@@ -61,399 +65,414 @@
61
65
  .leaflet-marker-pane { z-index: 6; }
62
66
  .leaflet-popup-pane { z-index: 7; }
63
67
 
68
+ .leaflet-vml-shape {
69
+ width: 1px;
70
+ height: 1px;
71
+ }
72
+ .lvml {
73
+ behavior: url(#default#VML);
74
+ display: inline-block;
75
+ position: absolute;
76
+ }
64
77
 
65
- /* control positioning */
78
+
79
+ /* control positioning */
66
80
 
67
81
  .leaflet-control {
68
- position: relative;
69
- z-index: 7;
70
- pointer-events: auto;
71
- }
82
+ position: relative;
83
+ z-index: 7;
84
+ pointer-events: auto;
85
+ }
72
86
  .leaflet-top,
73
87
  .leaflet-bottom {
74
- position: absolute;
75
- z-index: 1000;
76
- pointer-events: none;
77
- }
88
+ position: absolute;
89
+ z-index: 1000;
90
+ pointer-events: none;
91
+ }
78
92
  .leaflet-top {
79
- top: 0;
80
- }
93
+ top: 0;
94
+ }
81
95
  .leaflet-right {
82
- right: 0;
83
- }
96
+ right: 0;
97
+ }
84
98
  .leaflet-bottom {
85
- bottom: 0;
86
- }
99
+ bottom: 0;
100
+ }
87
101
  .leaflet-left {
88
- left: 0;
89
- }
102
+ left: 0;
103
+ }
90
104
  .leaflet-control {
91
- float: left;
92
- clear: both;
93
- }
105
+ float: left;
106
+ clear: both;
107
+ }
94
108
  .leaflet-right .leaflet-control {
95
- float: right;
96
- }
109
+ float: right;
110
+ }
97
111
  .leaflet-top .leaflet-control {
98
- margin-top: 10px;
99
- }
112
+ margin-top: 10px;
113
+ }
100
114
  .leaflet-bottom .leaflet-control {
101
- margin-bottom: 10px;
102
- }
115
+ margin-bottom: 10px;
116
+ }
103
117
  .leaflet-left .leaflet-control {
104
- margin-left: 10px;
105
- }
118
+ margin-left: 10px;
119
+ }
106
120
  .leaflet-right .leaflet-control {
107
- margin-right: 10px;
108
- }
121
+ margin-right: 10px;
122
+ }
109
123
 
110
124
 
111
- /* zoom and fade animations */
125
+ /* zoom and fade animations */
112
126
 
113
127
  .leaflet-fade-anim .leaflet-tile,
114
128
  .leaflet-fade-anim .leaflet-popup {
115
- opacity: 0;
116
- -webkit-transition: opacity 0.2s linear;
117
- -moz-transition: opacity 0.2s linear;
118
- -o-transition: opacity 0.2s linear;
119
- transition: opacity 0.2s linear;
120
- }
129
+ opacity: 0;
130
+ -webkit-transition: opacity 0.2s linear;
131
+ -moz-transition: opacity 0.2s linear;
132
+ -o-transition: opacity 0.2s linear;
133
+ transition: opacity 0.2s linear;
134
+ }
121
135
  .leaflet-fade-anim .leaflet-tile-loaded,
122
136
  .leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
123
- opacity: 1;
124
- }
137
+ opacity: 1;
138
+ }
125
139
 
126
140
  .leaflet-zoom-anim .leaflet-zoom-animated {
127
- -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
128
- -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
129
- -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1);
130
- transition: transform 0.25s cubic-bezier(0,0,0.25,1);
131
- }
141
+ -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
142
+ -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
143
+ -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1);
144
+ transition: transform 0.25s cubic-bezier(0,0,0.25,1);
145
+ }
132
146
  .leaflet-zoom-anim .leaflet-tile,
133
147
  .leaflet-pan-anim .leaflet-tile,
134
148
  .leaflet-touching .leaflet-zoom-animated {
135
- -webkit-transition: none;
136
- -moz-transition: none;
137
- -o-transition: none;
138
- transition: none;
139
- }
149
+ -webkit-transition: none;
150
+ -moz-transition: none;
151
+ -o-transition: none;
152
+ transition: none;
153
+ }
140
154
 
141
155
  .leaflet-zoom-anim .leaflet-zoom-hide {
142
- visibility: hidden;
143
- }
156
+ visibility: hidden;
157
+ }
144
158
 
145
159
 
146
- /* cursors */
160
+ /* cursors */
147
161
 
148
162
  .leaflet-clickable {
149
- cursor: pointer;
150
- }
163
+ cursor: pointer;
164
+ }
151
165
  .leaflet-container {
152
- cursor: -webkit-grab;
153
- cursor: -moz-grab;
154
- }
166
+ cursor: -webkit-grab;
167
+ cursor: -moz-grab;
168
+ }
155
169
  .leaflet-popup-pane,
156
170
  .leaflet-control {
157
- cursor: auto;
158
- }
159
- .leaflet-dragging,
160
- .leaflet-dragging .leaflet-clickable,
161
- .leaflet-dragging .leaflet-container {
162
- cursor: move;
163
- cursor: -webkit-grabbing;
164
- cursor: -moz-grabbing;
165
- }
171
+ cursor: auto;
172
+ }
173
+ .leaflet-dragging .leaflet-container,
174
+ .leaflet-dragging .leaflet-clickable {
175
+ cursor: move;
176
+ cursor: -webkit-grabbing;
177
+ cursor: -moz-grabbing;
178
+ }
166
179
 
167
180
 
168
- /* visual tweaks */
181
+ /* visual tweaks */
169
182
 
170
183
  .leaflet-container {
171
- background: #ddd;
172
- outline: 0;
173
- }
184
+ background: #ddd;
185
+ outline: 0;
186
+ }
174
187
  .leaflet-container a {
175
- color: #0078A8;
176
- }
188
+ color: #0078A8;
189
+ }
177
190
  .leaflet-container a.leaflet-active {
178
- outline: 2px solid orange;
179
- }
191
+ outline: 2px solid orange;
192
+ }
180
193
  .leaflet-zoom-box {
181
- border: 2px dotted #05f;
182
- background: white;
183
- opacity: 0.5;
184
- }
194
+ border: 2px dotted #38f;
195
+ background: rgba(255,255,255,0.5);
196
+ }
185
197
 
186
198
 
187
- /* general typography */
199
+ /* general typography */
188
200
  .leaflet-container {
189
- font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
190
- }
201
+ font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
202
+ }
191
203
 
192
204
 
193
- /* general toolbar styles */
205
+ /* general toolbar styles */
194
206
 
195
207
  .leaflet-bar {
196
- box-shadow: 0 1px 7px rgba(0,0,0,0.65);
197
- -webkit-border-radius: 4px;
198
- border-radius: 4px;
199
- }
200
- .leaflet-bar a {
201
- background-color: #fff;
202
- border-bottom: 1px solid #ccc;
203
- width: 26px;
204
- height: 26px;
205
- line-height: 26px;
206
- display: block;
207
- text-align: center;
208
- text-decoration: none;
209
- color: black;
210
- }
208
+ box-shadow: 0 1px 5px rgba(0,0,0,0.65);
209
+ border-radius: 4px;
210
+ }
211
+ .leaflet-bar a,
212
+ .leaflet-bar a:hover {
213
+ background-color: #fff;
214
+ border-bottom: 1px solid #ccc;
215
+ width: 26px;
216
+ height: 26px;
217
+ line-height: 26px;
218
+ display: block;
219
+ text-align: center;
220
+ text-decoration: none;
221
+ color: black;
222
+ }
211
223
  .leaflet-bar a,
212
224
  .leaflet-control-layers-toggle {
213
- background-position: 50% 50%;
214
- background-repeat: no-repeat;
215
- display: block;
216
- }
225
+ background-position: 50% 50%;
226
+ background-repeat: no-repeat;
227
+ display: block;
228
+ }
217
229
  .leaflet-bar a:hover {
218
- background-color: #f4f4f4;
219
- }
230
+ background-color: #f4f4f4;
231
+ }
220
232
  .leaflet-bar a:first-child {
221
- -webkit-border-top-left-radius: 4px;
222
- border-top-left-radius: 4px;
223
- -webkit-border-top-right-radius: 4px;
224
- border-top-right-radius: 4px;
225
- }
233
+ border-top-left-radius: 4px;
234
+ border-top-right-radius: 4px;
235
+ }
226
236
  .leaflet-bar a:last-child {
227
- -webkit-border-bottom-left-radius: 4px;
228
- border-bottom-left-radius: 4px;
229
- -webkit-border-bottom-right-radius: 4px;
230
- border-bottom-right-radius: 4px;
231
- border-bottom: none;
232
- }
237
+ border-bottom-left-radius: 4px;
238
+ border-bottom-right-radius: 4px;
239
+ border-bottom: none;
240
+ }
233
241
  .leaflet-bar a.leaflet-disabled {
234
- cursor: default;
235
- background-color: #f4f4f4;
236
- color: #bbb;
237
- }
242
+ cursor: default;
243
+ background-color: #f4f4f4;
244
+ color: #bbb;
245
+ }
238
246
 
239
- .leaflet-touch .leaflet-bar {
240
- -webkit-border-radius: 10px;
241
- border-radius: 10px;
242
- }
243
247
  .leaflet-touch .leaflet-bar a {
244
- width: 30px;
245
- height: 30px;
246
- }
247
- .leaflet-touch .leaflet-bar a:first-child {
248
- -webkit-border-top-left-radius: 7px;
249
- border-top-left-radius: 7px;
250
- -webkit-border-top-right-radius: 7px;
251
- border-top-right-radius: 7px;
252
- }
253
- .leaflet-touch .leaflet-bar a:last-child {
254
- -webkit-border-bottom-left-radius: 7px;
255
- border-bottom-left-radius: 7px;
256
- -webkit-border-bottom-right-radius: 7px;
257
- border-bottom-right-radius: 7px;
258
- border-bottom: none;
259
- }
260
-
261
-
262
- /* zoom control */
263
-
264
- .leaflet-control-zoom-in {
265
- font: bold 18px 'Lucida Console', Monaco, monospace;
266
- }
248
+ width: 30px;
249
+ height: 30px;
250
+ line-height: 30px;
251
+ }
252
+
253
+
254
+ /* zoom control */
255
+
256
+ .leaflet-control-zoom-in,
267
257
  .leaflet-control-zoom-out {
268
- font: bold 22px 'Lucida Console', Monaco, monospace;
269
- }
258
+ font: bold 18px 'Lucida Console', Monaco, monospace;
259
+ text-indent: 1px;
260
+ }
261
+ .leaflet-control-zoom-out {
262
+ font-size: 20px;
263
+ }
270
264
 
271
265
  .leaflet-touch .leaflet-control-zoom-in {
272
- font-size: 22px;
273
- line-height: 30px;
274
- }
266
+ font-size: 22px;
267
+ }
275
268
  .leaflet-touch .leaflet-control-zoom-out {
276
- font-size: 28px;
277
- line-height: 30px;
278
- }
269
+ font-size: 24px;
270
+ }
279
271
 
280
272
 
281
- /* layers control */
273
+ /* layers control */
282
274
 
283
275
  .leaflet-control-layers {
284
- box-shadow: 0 1px 7px rgba(0,0,0,0.4);
285
- background: #f8f8f9;
286
- -webkit-border-radius: 8px;
287
- border-radius: 8px;
288
- }
276
+ box-shadow: 0 1px 5px rgba(0,0,0,0.4);
277
+ background: #fff;
278
+ border-radius: 5px;
279
+ }
289
280
  .leaflet-control-layers-toggle {
290
- background-image: url(<%= asset_path 'layers.png' %>);
291
- width: 36px;
292
- height: 36px;
293
- }
281
+ background-image: url(<%= asset_path 'layers.png' %>);
282
+ width: 36px;
283
+ height: 36px;
284
+ }
285
+ .leaflet-retina .leaflet-control-layers-toggle {
286
+ background-image: url(<%= asset_path 'layers-2x.png' %>);
287
+ background-size: 26px 26px;
288
+ }
294
289
  .leaflet-touch .leaflet-control-layers-toggle {
295
- width: 44px;
296
- height: 44px;
297
- }
290
+ width: 44px;
291
+ height: 44px;
292
+ }
298
293
  .leaflet-control-layers .leaflet-control-layers-list,
299
294
  .leaflet-control-layers-expanded .leaflet-control-layers-toggle {
300
- display: none;
301
- }
295
+ display: none;
296
+ }
302
297
  .leaflet-control-layers-expanded .leaflet-control-layers-list {
303
- display: block;
304
- position: relative;
305
- }
298
+ display: block;
299
+ position: relative;
300
+ }
306
301
  .leaflet-control-layers-expanded {
307
- padding: 6px 10px 6px 6px;
308
- color: #333;
309
- background: #fff;
310
- }
302
+ padding: 6px 10px 6px 6px;
303
+ color: #333;
304
+ background: #fff;
305
+ }
311
306
  .leaflet-control-layers-selector {
312
- margin-top: 2px;
313
- position: relative;
314
- top: 1px;
315
- }
307
+ margin-top: 2px;
308
+ position: relative;
309
+ top: 1px;
310
+ }
316
311
  .leaflet-control-layers label {
317
- display: block;
318
- }
312
+ display: block;
313
+ }
319
314
  .leaflet-control-layers-separator {
320
- height: 0;
321
- border-top: 1px solid #ddd;
322
- margin: 5px -10px 5px -6px;
323
- }
315
+ height: 0;
316
+ border-top: 1px solid #ddd;
317
+ margin: 5px -10px 5px -6px;
318
+ }
324
319
 
325
320
 
326
- /* attribution and scale controls */
321
+ /* attribution and scale controls */
327
322
 
328
323
  .leaflet-container .leaflet-control-attribution {
329
- background-color: rgba(255, 255, 255, 0.7);
330
- box-shadow: 0 0 5px #bbb;
331
- margin: 0;
332
- }
324
+ background: #fff;
325
+ background: rgba(255, 255, 255, 0.7);
326
+ margin: 0;
327
+ }
333
328
  .leaflet-control-attribution,
334
329
  .leaflet-control-scale-line {
335
- padding: 0 5px;
336
- color: #333;
337
- }
330
+ padding: 0 5px;
331
+ color: #333;
332
+ }
333
+ .leaflet-control-attribution a {
334
+ text-decoration: none;
335
+ }
336
+ .leaflet-control-attribution a:hover {
337
+ text-decoration: underline;
338
+ }
338
339
  .leaflet-container .leaflet-control-attribution,
339
340
  .leaflet-container .leaflet-control-scale {
340
- font-size: 11px;
341
- }
341
+ font-size: 11px;
342
+ }
342
343
  .leaflet-left .leaflet-control-scale {
343
- margin-left: 5px;
344
- }
344
+ margin-left: 5px;
345
+ }
345
346
  .leaflet-bottom .leaflet-control-scale {
346
- margin-bottom: 5px;
347
- }
347
+ margin-bottom: 5px;
348
+ }
348
349
  .leaflet-control-scale-line {
349
- border: 2px solid #777;
350
- border-top: none;
351
- color: black;
352
- line-height: 1.1;
353
- padding: 2px 5px 1px;
354
- font-size: 11px;
355
- text-shadow: 1px 1px 1px #fff;
356
- background-color: rgba(255, 255, 255, 0.5);
357
- box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.2);
358
- white-space: nowrap;
359
- overflow: hidden;
360
- }
350
+ border: 2px solid #777;
351
+ border-top: none;
352
+ line-height: 1.1;
353
+ padding: 2px 5px 1px;
354
+ font-size: 11px;
355
+ white-space: nowrap;
356
+ overflow: hidden;
357
+ -moz-box-sizing: content-box;
358
+ box-sizing: content-box;
359
+
360
+ background: #fff;
361
+ background: rgba(255, 255, 255, 0.5);
362
+ }
361
363
  .leaflet-control-scale-line:not(:first-child) {
362
- border-top: 2px solid #777;
363
- border-bottom: none;
364
- margin-top: -2px;
365
- box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
366
- }
364
+ border-top: 2px solid #777;
365
+ border-bottom: none;
366
+ margin-top: -2px;
367
+ }
367
368
  .leaflet-control-scale-line:not(:first-child):not(:last-child) {
368
- border-bottom: 2px solid #777;
369
- }
369
+ border-bottom: 2px solid #777;
370
+ }
370
371
 
371
372
  .leaflet-touch .leaflet-control-attribution,
372
373
  .leaflet-touch .leaflet-control-layers,
373
- .leaflet-touch .leaflet-control-zoom {
374
- box-shadow: none;
375
- }
374
+ .leaflet-touch .leaflet-bar {
375
+ box-shadow: none;
376
+ }
376
377
  .leaflet-touch .leaflet-control-layers,
377
- .leaflet-touch .leaflet-control-zoom {
378
- border: 4px solid rgba(0,0,0,0.3);
379
- }
378
+ .leaflet-touch .leaflet-bar {
379
+ border: 2px solid rgba(0,0,0,0.2);
380
+ background-clip: padding-box;
381
+ }
380
382
 
381
383
 
382
- /* popup */
384
+ /* popup */
383
385
 
384
386
  .leaflet-popup {
385
- position: absolute;
386
- text-align: center;
387
- }
387
+ position: absolute;
388
+ text-align: center;
389
+ }
388
390
  .leaflet-popup-content-wrapper {
389
- padding: 1px;
390
- text-align: left;
391
- -webkit-border-radius: 20px;
392
- border-radius: 20px;
393
- }
391
+ padding: 1px;
392
+ text-align: left;
393
+ border-radius: 12px;
394
+ }
394
395
  .leaflet-popup-content {
395
- margin: 14px 20px;
396
- line-height: 1.4;
397
- }
396
+ margin: 13px 19px;
397
+ line-height: 1.4;
398
+ }
398
399
  .leaflet-popup-content p {
399
- margin: 18px 0;
400
- }
400
+ margin: 18px 0;
401
+ }
401
402
  .leaflet-popup-tip-container {
402
- margin: 0 auto;
403
- width: 40px;
404
- height: 20px;
405
- position: relative;
406
- overflow: hidden;
407
- }
403
+ margin: 0 auto;
404
+ width: 40px;
405
+ height: 20px;
406
+ position: relative;
407
+ overflow: hidden;
408
+ }
409
+ .leaflet-popup-tip {
410
+ width: 17px;
411
+ height: 17px;
412
+ padding: 1px;
413
+
414
+ margin: -10px auto 0;
415
+
416
+ -webkit-transform: rotate(45deg);
417
+ -moz-transform: rotate(45deg);
418
+ -ms-transform: rotate(45deg);
419
+ -o-transform: rotate(45deg);
420
+ transform: rotate(45deg);
421
+ }
422
+ .leaflet-popup-content-wrapper,
408
423
  .leaflet-popup-tip {
409
- width: 15px;
410
- height: 15px;
411
- padding: 1px;
412
-
413
- margin: -8px auto 0;
414
-
415
- -webkit-transform: rotate(45deg);
416
- -moz-transform: rotate(45deg);
417
- -ms-transform: rotate(45deg);
418
- -o-transform: rotate(45deg);
419
- transform: rotate(45deg);
420
- }
421
- .leaflet-popup-content-wrapper, .leaflet-popup-tip {
422
- background: white;
423
-
424
- box-shadow: 0 3px 14px rgba(0,0,0,0.4);
425
- }
424
+ background: white;
425
+
426
+ box-shadow: 0 3px 14px rgba(0,0,0,0.4);
427
+ }
426
428
  .leaflet-container a.leaflet-popup-close-button {
427
- position: absolute;
428
- top: 0;
429
- right: 0;
430
- padding: 4px 5px 0 0;
431
- text-align: center;
432
- width: 18px;
433
- height: 14px;
434
- font: 16px/14px Tahoma, Verdana, sans-serif;
435
- color: #c3c3c3;
436
- text-decoration: none;
437
- font-weight: bold;
438
- background: transparent;
439
- }
429
+ position: absolute;
430
+ top: 0;
431
+ right: 0;
432
+ padding: 4px 4px 0 0;
433
+ text-align: center;
434
+ width: 18px;
435
+ height: 14px;
436
+ font: 16px/14px Tahoma, Verdana, sans-serif;
437
+ color: #c3c3c3;
438
+ text-decoration: none;
439
+ font-weight: bold;
440
+ background: transparent;
441
+ }
440
442
  .leaflet-container a.leaflet-popup-close-button:hover {
441
- color: #999;
442
- }
443
+ color: #999;
444
+ }
443
445
  .leaflet-popup-scrolled {
444
- overflow: auto;
445
- border-bottom: 1px solid #ddd;
446
- border-top: 1px solid #ddd;
447
- }
448
-
449
-
450
- /* div icon */
446
+ overflow: auto;
447
+ border-bottom: 1px solid #ddd;
448
+ border-top: 1px solid #ddd;
449
+ }
450
+
451
+ .leaflet-oldie .leaflet-popup-content-wrapper {
452
+ zoom: 1;
453
+ }
454
+ .leaflet-oldie .leaflet-popup-tip {
455
+ width: 24px;
456
+ margin: 0 auto;
457
+
458
+ -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
459
+ filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
460
+ }
461
+ .leaflet-oldie .leaflet-popup-tip-container {
462
+ margin-top: -1px;
463
+ }
464
+
465
+ .leaflet-oldie .leaflet-control-zoom,
466
+ .leaflet-oldie .leaflet-control-layers,
467
+ .leaflet-oldie .leaflet-popup-content-wrapper,
468
+ .leaflet-oldie .leaflet-popup-tip {
469
+ border: 1px solid #999;
470
+ }
471
+
472
+
473
+ /* div icon */
451
474
 
452
475
  .leaflet-div-icon {
453
- background: #fff;
454
- border: 1px solid #666;
455
- }
456
- .leaflet-editing-icon {
457
- -webkit-border-radius: 2px;
458
- border-radius: 2px;
459
- }
476
+ background: #fff;
477
+ border: 1px solid #666;
478
+ }