leaflet-js 0.7.9 → 0.8.dev2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (341) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.rdoc +0 -10
  3. data/Rakefile +3 -3
  4. data/leaflet-js.gemspec +7 -13
  5. data/lib/leaflet-js.rb +10 -2
  6. data/lib/leaflet.draw/BREAKINGCHANGES.md +54 -0
  7. data/lib/leaflet.draw/CHANGELOG.md +130 -0
  8. data/lib/leaflet.draw/Jakefile.js +48 -0
  9. data/lib/leaflet.draw/MIT-LICENCE.txt +20 -0
  10. data/lib/leaflet.draw/README.md +427 -0
  11. data/lib/leaflet.draw/TODO.md +62 -0
  12. data/lib/leaflet.draw/build/build.html +243 -0
  13. data/lib/leaflet.draw/build/build.js +187 -0
  14. data/lib/leaflet.draw/build/deps.js +76 -0
  15. data/lib/leaflet.draw/build/hintrc.js +39 -0
  16. data/lib/leaflet.draw/build/leaflet.draw-include.js +42 -0
  17. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/dist/images/spritesheet-2x.png +0 -0
  18. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/dist/images/spritesheet.png +0 -0
  19. data/lib/leaflet.draw/dist/leaflet.draw-src.js +2872 -0
  20. data/lib/leaflet.draw/dist/leaflet.draw.css +295 -0
  21. data/lib/leaflet.draw/dist/leaflet.draw.js +10 -0
  22. data/lib/leaflet.draw/examples/basic.html +113 -0
  23. data/lib/leaflet.draw/examples/edithandlers.html +66 -0
  24. data/{vendor/assets/Leaflet/dist → lib/leaflet.draw/examples/libs}/images/layers-2x.png +0 -0
  25. data/{vendor/assets/Leaflet/dist → lib/leaflet.draw/examples/libs}/images/layers.png +0 -0
  26. data/{vendor/assets/Leaflet/dist → lib/leaflet.draw/examples/libs}/images/marker-icon-2x.png +0 -0
  27. data/{vendor/assets/Leaflet/dist → lib/leaflet.draw/examples/libs}/images/marker-icon.png +0 -0
  28. data/lib/leaflet.draw/examples/libs/images/marker-icon@2x.png +0 -0
  29. data/{vendor/assets/Leaflet/dist → lib/leaflet.draw/examples/libs}/images/marker-shadow.png +0 -0
  30. data/lib/leaflet.draw/examples/libs/leaflet-src.js +9191 -0
  31. data/{vendor/assets/leaflet.css.erb → lib/leaflet.draw/examples/libs/leaflet.css} +2 -2
  32. data/lib/leaflet.draw/package.json +40 -0
  33. data/lib/leaflet.draw/spec/after.js +2 -0
  34. data/lib/leaflet.draw/spec/before.js +3 -0
  35. data/lib/leaflet.draw/spec/expect.js +1253 -0
  36. data/lib/leaflet.draw/spec/happen.js +93 -0
  37. data/lib/leaflet.draw/spec/index.html +38 -0
  38. data/lib/leaflet.draw/spec/karma.conf.js +72 -0
  39. data/lib/leaflet.draw/spec/sinon.js +4223 -0
  40. data/lib/leaflet.draw/spec/spec.hintrc.js +25 -0
  41. data/lib/leaflet.draw/spec/suites/DrawControlSpec.js +14 -0
  42. data/lib/leaflet.draw/spec/suites/GeometryUtilSpec.js +25 -0
  43. data/lib/leaflet.draw/spec/suites/LatLngUtilSpec.js +11 -0
  44. data/lib/leaflet.draw/spec/suites/SpecHelper.js +28 -0
  45. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/Control.Draw.js +9 -9
  46. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/Leaflet.draw.js +1 -2
  47. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/Toolbar.js +0 -0
  48. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/Tooltip.js +0 -0
  49. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/copyright.js +0 -0
  50. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/DrawToolbar.js +0 -4
  51. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.Circle.js +1 -1
  52. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.Feature.js +2 -2
  53. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.Marker.js +0 -0
  54. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.Polygon.js +0 -0
  55. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.Polyline.js +0 -0
  56. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.Rectangle.js +1 -19
  57. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/draw/handler/Draw.SimpleShape.js +1 -7
  58. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/EditToolbar.js +2 -9
  59. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/handler/Edit.Circle.js +0 -0
  60. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/handler/Edit.Poly.js +2 -14
  61. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/handler/Edit.Rectangle.js +0 -0
  62. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/handler/Edit.SimpleShape.js +3 -11
  63. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/handler/EditToolbar.Delete.js +1 -4
  64. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/edit/handler/EditToolbar.Edit.js +83 -17
  65. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/ext/GeometryUtil.js +1 -1
  66. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/ext/LatLngUtil.js +0 -0
  67. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/ext/LineUtil.Intersect.js +0 -0
  68. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/ext/Polygon.Intersect.js +0 -0
  69. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/ext/Polyline.Intersect.js +0 -0
  70. data/{vendor/assets/Leaflet.draw → lib/leaflet.draw}/src/images/spritesheet.svg +0 -0
  71. data/lib/leaflet.label/CHANGELOG.md +67 -0
  72. data/lib/leaflet.label/Jakefile.js +21 -0
  73. data/lib/leaflet.label/MIT-LICENCE.txt +20 -0
  74. data/lib/leaflet.label/README.md +103 -0
  75. data/lib/leaflet.label/build/build.js +155 -0
  76. data/lib/leaflet.label/build/deps.js +26 -0
  77. data/lib/leaflet.label/build/hint.js +30 -0
  78. data/lib/leaflet.label/build/hintrc.js +51 -0
  79. data/lib/leaflet.label/dist/images/death.png +0 -0
  80. data/lib/leaflet.label/dist/leaflet.label-src.js +542 -0
  81. data/{vendor/assets → lib/leaflet.label/dist}/leaflet.label.css +0 -0
  82. data/lib/leaflet.label/dist/leaflet.label.js +9 -0
  83. data/lib/leaflet.label/example/label.html +85 -0
  84. data/lib/leaflet.label/libs/leaflet/images/layers-2x.png +0 -0
  85. data/lib/leaflet.label/libs/leaflet/images/layers.png +0 -0
  86. data/lib/leaflet.label/libs/leaflet/images/marker-icon-2x.png +0 -0
  87. data/lib/leaflet.label/libs/leaflet/images/marker-icon.png +0 -0
  88. data/lib/leaflet.label/libs/leaflet/images/marker-icon@2x.png +0 -0
  89. data/lib/leaflet.label/libs/leaflet/images/marker-shadow.png +0 -0
  90. data/lib/leaflet.label/libs/leaflet/leaflet-src.js +9108 -0
  91. data/lib/leaflet.label/libs/leaflet/leaflet.css +478 -0
  92. data/lib/leaflet.label/libs/leaflet/leaflet.js +9 -0
  93. data/lib/leaflet.label/package.json +19 -0
  94. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/BaseMarkerMethods.js +0 -0
  95. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/CircleMarker.Label.js +0 -0
  96. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/FeatureGroup.Label.js +0 -0
  97. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/Label.js +2 -5
  98. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/Leaflet.label.js +1 -1
  99. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/Map.Label.js +0 -0
  100. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/Marker.Label.js +0 -0
  101. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/Path.Label.js +0 -0
  102. data/{vendor/assets/Leaflet.label → lib/leaflet.label}/src/copyright.js +0 -0
  103. data/lib/leaflet/CHANGELOG.md +1007 -0
  104. data/lib/leaflet/CONTRIBUTING.md +155 -0
  105. data/lib/leaflet/FAQ.md +138 -0
  106. data/lib/leaflet/Jakefile.js +56 -0
  107. data/lib/leaflet/LICENSE +23 -0
  108. data/lib/leaflet/PLUGIN-GUIDE.md +127 -0
  109. data/lib/leaflet/README.md +34 -0
  110. data/lib/leaflet/build/build.html +227 -0
  111. data/lib/leaflet/build/build.js +190 -0
  112. data/lib/leaflet/build/deps.js +258 -0
  113. data/lib/leaflet/build/hintrc.js +40 -0
  114. data/lib/leaflet/debug/css/mobile.css +6 -0
  115. data/lib/leaflet/debug/css/screen.css +5 -0
  116. data/lib/leaflet/debug/hacks/jitter.html +42 -0
  117. data/lib/leaflet/debug/leaflet-include.js +59 -0
  118. data/lib/leaflet/debug/map/canvas.html +49 -0
  119. data/lib/leaflet/debug/map/controls.html +49 -0
  120. data/lib/leaflet/debug/map/geolocation.html +34 -0
  121. data/lib/leaflet/debug/map/grid.html +45 -0
  122. data/lib/leaflet/debug/map/iframe.html +11 -0
  123. data/lib/leaflet/debug/map/image-overlay.html +43 -0
  124. data/lib/leaflet/debug/map/map-mobile.html +34 -0
  125. data/lib/leaflet/debug/map/map.html +61 -0
  126. data/lib/leaflet/debug/map/max-bounds.html +38 -0
  127. data/lib/leaflet/debug/map/opacity.html +223 -0
  128. data/lib/leaflet/debug/map/scroll.html +41 -0
  129. data/lib/leaflet/debug/map/simple-proj.html +59 -0
  130. data/lib/leaflet/debug/map/wms-marble.html +30 -0
  131. data/lib/leaflet/debug/map/wms.html +40 -0
  132. data/lib/leaflet/debug/map/zoomlevels.html +45 -0
  133. data/lib/leaflet/debug/tests/add_remove_layers.html +87 -0
  134. data/lib/leaflet/debug/tests/bringtoback.html +37 -0
  135. data/lib/leaflet/debug/tests/canvasloop.html +47 -0
  136. data/lib/leaflet/debug/tests/click_on_canvas.html +58 -0
  137. data/lib/leaflet/debug/tests/click_on_canvas_broken.html +49 -0
  138. data/lib/leaflet/debug/tests/dragging_and_copyworldjump.html +61 -0
  139. data/lib/leaflet/debug/tests/opacity.html +56 -0
  140. data/lib/leaflet/debug/tests/popupcontextmenuclicks.html +59 -0
  141. data/lib/leaflet/debug/tests/remove_while_dragging.html +28 -0
  142. data/lib/leaflet/debug/tests/removetilewhilepan.html +41 -0
  143. data/lib/leaflet/debug/tests/reuse_popups.html +40 -0
  144. data/lib/leaflet/debug/tests/rtl.html +42 -0
  145. data/lib/leaflet/debug/tests/rtl2.html +27 -0
  146. data/lib/leaflet/debug/tests/set_icon_reuse_dom.html +43 -0
  147. data/lib/leaflet/debug/tests/svg_clicks.html +54 -0
  148. data/lib/leaflet/debug/vector/bounds-extend.html +88 -0
  149. data/lib/leaflet/debug/vector/feature-group-bounds.html +90 -0
  150. data/lib/leaflet/debug/vector/geojson-sample.js +53 -0
  151. data/lib/leaflet/debug/vector/geojson.html +173 -0
  152. data/lib/leaflet/debug/vector/rectangle.html +53 -0
  153. data/lib/leaflet/debug/vector/route.js +1 -0
  154. data/lib/leaflet/debug/vector/touchzoomemu.html +194 -0
  155. data/lib/leaflet/debug/vector/us-states.js +54 -0
  156. data/lib/leaflet/debug/vector/vector-bounds.html +69 -0
  157. data/lib/leaflet/debug/vector/vector-canvas.html +92 -0
  158. data/lib/leaflet/debug/vector/vector-mobile.html +38 -0
  159. data/lib/leaflet/debug/vector/vector-simple.html +47 -0
  160. data/lib/leaflet/debug/vector/vector.html +37 -0
  161. data/lib/leaflet/debug/vector/vector2.html +58 -0
  162. data/lib/leaflet/dist/images/layers-2x.png +0 -0
  163. data/lib/leaflet/dist/images/layers.png +0 -0
  164. data/lib/leaflet/dist/images/marker-icon-2x.png +0 -0
  165. data/lib/leaflet/dist/images/marker-icon.png +0 -0
  166. data/lib/leaflet/dist/images/marker-shadow.png +0 -0
  167. data/lib/leaflet/dist/leaflet.css +494 -0
  168. data/lib/leaflet/package.json +28 -0
  169. data/lib/leaflet/spec/after.js +2 -0
  170. data/lib/leaflet/spec/expect.js +1253 -0
  171. data/lib/leaflet/spec/index.html +87 -0
  172. data/lib/leaflet/spec/karma.conf.js +68 -0
  173. data/lib/leaflet/spec/sinon.js +4223 -0
  174. data/lib/leaflet/spec/spec.hintrc.js +25 -0
  175. data/lib/leaflet/spec/suites/SpecHelper.js +42 -0
  176. data/lib/leaflet/spec/suites/control/Control.AttributionSpec.js +68 -0
  177. data/lib/leaflet/spec/suites/control/Control.LayersSpec.js +67 -0
  178. data/lib/leaflet/spec/suites/control/Control.ScaleSpec.js +6 -0
  179. data/lib/leaflet/spec/suites/core/ClassSpec.js +166 -0
  180. data/lib/leaflet/spec/suites/core/EventsSpec.js +416 -0
  181. data/lib/leaflet/spec/suites/core/UtilSpec.js +237 -0
  182. data/lib/leaflet/spec/suites/dom/DomEventSpec.js +102 -0
  183. data/lib/leaflet/spec/suites/dom/DomUtilSpec.js +59 -0
  184. data/lib/leaflet/spec/suites/dom/PosAnimationSpec.js +27 -0
  185. data/lib/leaflet/spec/suites/geo/CRSSpec.js +151 -0
  186. data/lib/leaflet/spec/suites/geo/LatLngBoundsSpec.js +144 -0
  187. data/lib/leaflet/spec/suites/geo/LatLngSpec.js +102 -0
  188. data/lib/leaflet/spec/suites/geo/ProjectionSpec.js +96 -0
  189. data/lib/leaflet/spec/suites/geometry/BoundsSpec.js +87 -0
  190. data/lib/leaflet/spec/suites/geometry/LineUtilSpec.js +75 -0
  191. data/lib/leaflet/spec/suites/geometry/PointSpec.js +104 -0
  192. data/lib/leaflet/spec/suites/geometry/PolyUtilSpec.js +27 -0
  193. data/lib/leaflet/spec/suites/geometry/TransformationSpec.js +31 -0
  194. data/lib/leaflet/spec/suites/layer/FeatureGroupSpec.js +86 -0
  195. data/lib/leaflet/spec/suites/layer/GeoJSONSpec.js +282 -0
  196. data/lib/leaflet/spec/suites/layer/LayerGroupSpec.js +71 -0
  197. data/lib/leaflet/spec/suites/layer/PopupSpec.js +119 -0
  198. data/lib/leaflet/spec/suites/layer/marker/MarkerSpec.js +117 -0
  199. data/lib/leaflet/spec/suites/layer/tile/GridLayerSpec.js +70 -0
  200. data/lib/leaflet/spec/suites/layer/tile/TileLayerSpec.js +88 -0
  201. data/lib/leaflet/spec/suites/layer/vector/CircleMarkerSpec.js +53 -0
  202. data/lib/leaflet/spec/suites/layer/vector/CircleSpec.js +18 -0
  203. data/lib/leaflet/spec/suites/layer/vector/PolygonSpec.js +96 -0
  204. data/lib/leaflet/spec/suites/layer/vector/PolylineGeometrySpec.js +35 -0
  205. data/lib/leaflet/spec/suites/layer/vector/PolylineSpec.js +55 -0
  206. data/lib/leaflet/spec/suites/map/MapSpec.js +553 -0
  207. data/lib/leaflet/spec/suites/map/handler/Map.DragSpec.js +38 -0
  208. data/{vendor/assets/Leaflet → lib/leaflet}/src/Leaflet.js +16 -11
  209. data/{vendor/assets/Leaflet → lib/leaflet}/src/control/Control.Attribution.js +1 -23
  210. data/{vendor/assets/Leaflet → lib/leaflet}/src/control/Control.Layers.js +42 -57
  211. data/lib/leaflet/src/control/Control.Scale.js +102 -0
  212. data/{vendor/assets/Leaflet → lib/leaflet}/src/control/Control.Zoom.js +11 -18
  213. data/{vendor/assets/Leaflet → lib/leaflet}/src/control/Control.js +7 -9
  214. data/lib/leaflet/src/copyright.js +4 -0
  215. data/lib/leaflet/src/core/Browser.js +65 -0
  216. data/{vendor/assets/Leaflet → lib/leaflet}/src/core/Class.js +8 -13
  217. data/lib/leaflet/src/core/Events.js +226 -0
  218. data/{vendor/assets/Leaflet → lib/leaflet}/src/core/Handler.js +0 -0
  219. data/lib/leaflet/src/core/Util.js +196 -0
  220. data/{vendor/assets/Leaflet → lib/leaflet}/src/dom/DomEvent.DoubleTap.js +20 -27
  221. data/lib/leaflet/src/dom/DomEvent.Pointer.js +107 -0
  222. data/{vendor/assets/Leaflet → lib/leaflet}/src/dom/DomEvent.js +70 -59
  223. data/lib/leaflet/src/dom/DomUtil.js +213 -0
  224. data/{vendor/assets/Leaflet → lib/leaflet}/src/dom/Draggable.js +10 -19
  225. data/{vendor/assets/Leaflet → lib/leaflet}/src/dom/PosAnimation.Timer.js +0 -0
  226. data/{vendor/assets/Leaflet → lib/leaflet}/src/dom/PosAnimation.js +4 -3
  227. data/lib/leaflet/src/geo/LatLng.js +67 -0
  228. data/{vendor/assets/Leaflet → lib/leaflet}/src/geo/LatLngBounds.js +0 -0
  229. data/lib/leaflet/src/geo/crs/CRS.EPSG3395.js +13 -0
  230. data/lib/leaflet/src/geo/crs/CRS.EPSG3857.js +17 -0
  231. data/{vendor/assets/Leaflet → lib/leaflet}/src/geo/crs/CRS.EPSG4326.js +2 -3
  232. data/lib/leaflet/src/geo/crs/CRS.Earth.js +19 -0
  233. data/{vendor/assets/Leaflet → lib/leaflet}/src/geo/crs/CRS.Simple.js +10 -1
  234. data/lib/leaflet/src/geo/crs/CRS.js +63 -0
  235. data/{vendor/assets/Leaflet → lib/leaflet}/src/geo/projection/Projection.LonLat.js +5 -1
  236. data/lib/leaflet/src/geo/projection/Projection.Mercator.js +43 -0
  237. data/lib/leaflet/src/geo/projection/Projection.SphericalMercator.js +31 -0
  238. data/{vendor/assets/Leaflet → lib/leaflet}/src/geometry/Bounds.js +0 -0
  239. data/{vendor/assets/Leaflet → lib/leaflet}/src/geometry/LineUtil.js +16 -5
  240. data/{vendor/assets/Leaflet → lib/leaflet}/src/geometry/Point.js +10 -0
  241. data/{vendor/assets/Leaflet → lib/leaflet}/src/geometry/PolyUtil.js +0 -0
  242. data/{vendor/assets/Leaflet → lib/leaflet}/src/geometry/Transformation.js +0 -0
  243. data/{vendor/assets/Leaflet → lib/leaflet}/src/images/layers.svg +0 -0
  244. data/lib/leaflet/src/images/logo.svg +85 -0
  245. data/{vendor/assets/Leaflet → lib/leaflet}/src/images/marker.svg +0 -0
  246. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/FeatureGroup.js +3 -20
  247. data/lib/leaflet/src/layer/GeoJSON.js +275 -0
  248. data/lib/leaflet/src/layer/ImageOverlay.js +123 -0
  249. data/lib/leaflet/src/layer/Layer.Popup.js +87 -0
  250. data/lib/leaflet/src/layer/Layer.js +150 -0
  251. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/LayerGroup.js +12 -14
  252. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/Popup.js +65 -83
  253. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/DivIcon.js +3 -8
  254. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Icon.Default.js +6 -12
  255. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Icon.js +8 -25
  256. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Marker.Drag.js +13 -11
  257. data/lib/leaflet/src/layer/marker/Marker.Popup.js +16 -0
  258. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Marker.js +52 -103
  259. data/lib/leaflet/src/layer/tile/GridLayer.js +536 -0
  260. data/lib/leaflet/src/layer/tile/TileLayer.WMS.js +79 -0
  261. data/lib/leaflet/src/layer/tile/TileLayer.js +148 -0
  262. data/lib/leaflet/src/layer/vector/Canvas.js +292 -0
  263. data/lib/leaflet/src/layer/vector/Circle.js +67 -0
  264. data/lib/leaflet/src/layer/vector/CircleMarker.js +72 -0
  265. data/lib/leaflet/src/layer/vector/Path.js +79 -0
  266. data/lib/leaflet/src/layer/vector/Polygon.js +75 -0
  267. data/lib/leaflet/src/layer/vector/Polyline.js +223 -0
  268. data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/vector/Rectangle.js +27 -27
  269. data/lib/leaflet/src/layer/vector/Renderer.js +75 -0
  270. data/lib/leaflet/src/layer/vector/SVG.VML.js +134 -0
  271. data/lib/leaflet/src/layer/vector/SVG.js +189 -0
  272. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/Map.js +83 -199
  273. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/anim/Map.PanAnimation.js +0 -0
  274. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/anim/Map.ZoomAnimation.js +30 -38
  275. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/ext/Map.Geolocation.js +8 -8
  276. data/lib/leaflet/src/map/handler/Map.BoxZoom.js +105 -0
  277. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/handler/Map.DoubleClickZoom.js +0 -0
  278. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/handler/Map.Drag.js +12 -10
  279. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/handler/Map.Keyboard.js +19 -17
  280. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/handler/Map.ScrollWheelZoom.js +10 -6
  281. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/handler/Map.Tap.js +8 -6
  282. data/{vendor/assets/Leaflet → lib/leaflet}/src/map/handler/Map.TouchZoom.js +16 -32
  283. data/vendor/assets/images/layers-2x.png +0 -0
  284. data/vendor/assets/images/layers.png +0 -0
  285. data/vendor/assets/images/marker-icon-2x.png +0 -0
  286. data/vendor/assets/images/marker-icon.png +0 -0
  287. data/vendor/assets/images/marker-shadow.png +0 -0
  288. data/vendor/assets/images/spritesheet-2x.png +0 -0
  289. data/vendor/assets/images/spritesheet.png +0 -0
  290. data/vendor/assets/{leaflet-js.js → javascripts/leaflet-js.js} +2 -2
  291. data/vendor/assets/javascripts/leaflet.draw.js +37 -0
  292. data/vendor/assets/javascripts/leaflet.js +149 -0
  293. data/vendor/assets/javascripts/leaflet.label.js +11 -0
  294. data/vendor/assets/{leaflet-js.css → stylesheets/leaflet-js.css} +0 -0
  295. data/vendor/assets/stylesheets/leaflet.css.erb +478 -0
  296. data/vendor/assets/{leaflet.draw.css.erb → stylesheets/leaflet.draw.css.erb} +2 -2
  297. data/vendor/assets/{leaflet.draw.ie.css → stylesheets/leaflet.draw.ie.css} +0 -0
  298. data/vendor/assets/stylesheets/leaflet.label.css +52 -0
  299. metadata +298 -137
  300. data/lib/leaflet-js/engine.rb +0 -7
  301. data/lib/leaflet-js/version.rb +0 -3
  302. data/vendor/assets/Leaflet.draw/src/edit/handler/Edit.Marker.js +0 -75
  303. data/vendor/assets/Leaflet/src/control/Control.Scale.js +0 -112
  304. data/vendor/assets/Leaflet/src/copyright.js +0 -5
  305. data/vendor/assets/Leaflet/src/core/Browser.js +0 -66
  306. data/vendor/assets/Leaflet/src/core/Events.js +0 -178
  307. data/vendor/assets/Leaflet/src/core/Util.js +0 -182
  308. data/vendor/assets/Leaflet/src/dom/DomEvent.Pointer.js +0 -156
  309. data/vendor/assets/Leaflet/src/dom/DomUtil.js +0 -289
  310. data/vendor/assets/Leaflet/src/geo/LatLng.js +0 -99
  311. data/vendor/assets/Leaflet/src/geo/crs/CRS.EPSG3395.js +0 -14
  312. data/vendor/assets/Leaflet/src/geo/crs/CRS.EPSG3857.js +0 -21
  313. data/vendor/assets/Leaflet/src/geo/crs/CRS.js +0 -32
  314. data/vendor/assets/Leaflet/src/geo/projection/Projection.Mercator.js +0 -56
  315. data/vendor/assets/Leaflet/src/geo/projection/Projection.SphericalMercator.js +0 -27
  316. data/vendor/assets/Leaflet/src/geo/projection/Projection.js +0 -5
  317. data/vendor/assets/Leaflet/src/layer/GeoJSON.js +0 -286
  318. data/vendor/assets/Leaflet/src/layer/ImageOverlay.js +0 -141
  319. data/vendor/assets/Leaflet/src/layer/marker/Marker.Popup.js +0 -90
  320. data/vendor/assets/Leaflet/src/layer/tile/TileLayer.Anim.js +0 -110
  321. data/vendor/assets/Leaflet/src/layer/tile/TileLayer.Canvas.js +0 -61
  322. data/vendor/assets/Leaflet/src/layer/tile/TileLayer.WMS.js +0 -87
  323. data/vendor/assets/Leaflet/src/layer/tile/TileLayer.js +0 -597
  324. data/vendor/assets/Leaflet/src/layer/vector/Circle.js +0 -98
  325. data/vendor/assets/Leaflet/src/layer/vector/CircleMarker.js +0 -45
  326. data/vendor/assets/Leaflet/src/layer/vector/MultiPoly.js +0 -57
  327. data/vendor/assets/Leaflet/src/layer/vector/Path.Popup.js +0 -65
  328. data/vendor/assets/Leaflet/src/layer/vector/Path.SVG.js +0 -230
  329. data/vendor/assets/Leaflet/src/layer/vector/Path.VML.js +0 -135
  330. data/vendor/assets/Leaflet/src/layer/vector/Path.js +0 -119
  331. data/vendor/assets/Leaflet/src/layer/vector/Polygon.js +0 -92
  332. data/vendor/assets/Leaflet/src/layer/vector/Polyline.js +0 -164
  333. data/vendor/assets/Leaflet/src/layer/vector/canvas/Circle.Canvas.js +0 -18
  334. data/vendor/assets/Leaflet/src/layer/vector/canvas/CircleMarker.Canvas.js +0 -9
  335. data/vendor/assets/Leaflet/src/layer/vector/canvas/Path.Canvas.js +0 -204
  336. data/vendor/assets/Leaflet/src/layer/vector/canvas/Polygon.Canvas.js +0 -37
  337. data/vendor/assets/Leaflet/src/layer/vector/canvas/Polyline.Canvas.js +0 -30
  338. data/vendor/assets/Leaflet/src/map/handler/Map.BoxZoom.js +0 -118
  339. data/vendor/assets/leaflet.draw.js +0 -38
  340. data/vendor/assets/leaflet.js +0 -155
  341. data/vendor/assets/leaflet.label.js +0 -11
@@ -1,597 +0,0 @@
1
- /*
2
- * L.TileLayer is used for standard xyz-numbered tile layers.
3
- */
4
-
5
- L.TileLayer = L.Class.extend({
6
- includes: L.Mixin.Events,
7
-
8
- options: {
9
- minZoom: 0,
10
- maxZoom: 18,
11
- tileSize: 256,
12
- subdomains: 'abc',
13
- errorTileUrl: '',
14
- attribution: '',
15
- zoomOffset: 0,
16
- opacity: 1,
17
- /*
18
- maxNativeZoom: null,
19
- zIndex: null,
20
- tms: false,
21
- continuousWorld: false,
22
- noWrap: false,
23
- zoomReverse: false,
24
- detectRetina: false,
25
- reuseTiles: false,
26
- bounds: false,
27
- */
28
- unloadInvisibleTiles: L.Browser.mobile,
29
- updateWhenIdle: L.Browser.mobile
30
- },
31
-
32
- initialize: function (url, options) {
33
- options = L.setOptions(this, options);
34
-
35
- // detecting retina displays, adjusting tileSize and zoom levels
36
- if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {
37
-
38
- options.tileSize = Math.floor(options.tileSize / 2);
39
- options.zoomOffset++;
40
-
41
- if (options.minZoom > 0) {
42
- options.minZoom--;
43
- }
44
- this.options.maxZoom--;
45
- }
46
-
47
- if (options.bounds) {
48
- options.bounds = L.latLngBounds(options.bounds);
49
- }
50
-
51
- this._url = url;
52
-
53
- var subdomains = this.options.subdomains;
54
-
55
- if (typeof subdomains === 'string') {
56
- this.options.subdomains = subdomains.split('');
57
- }
58
- },
59
-
60
- onAdd: function (map) {
61
- this._map = map;
62
- this._animated = map._zoomAnimated;
63
-
64
- // create a container div for tiles
65
- this._initContainer();
66
-
67
- // set up events
68
- map.on({
69
- 'viewreset': this._reset,
70
- 'moveend': this._update
71
- }, this);
72
-
73
- if (this._animated) {
74
- map.on({
75
- 'zoomanim': this._animateZoom,
76
- 'zoomend': this._endZoomAnim
77
- }, this);
78
- }
79
-
80
- if (!this.options.updateWhenIdle) {
81
- this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this);
82
- map.on('move', this._limitedUpdate, this);
83
- }
84
-
85
- this._reset();
86
- this._update();
87
- },
88
-
89
- addTo: function (map) {
90
- map.addLayer(this);
91
- return this;
92
- },
93
-
94
- onRemove: function (map) {
95
- this._container.parentNode.removeChild(this._container);
96
-
97
- map.off({
98
- 'viewreset': this._reset,
99
- 'moveend': this._update
100
- }, this);
101
-
102
- if (this._animated) {
103
- map.off({
104
- 'zoomanim': this._animateZoom,
105
- 'zoomend': this._endZoomAnim
106
- }, this);
107
- }
108
-
109
- if (!this.options.updateWhenIdle) {
110
- map.off('move', this._limitedUpdate, this);
111
- }
112
-
113
- this._container = null;
114
- this._map = null;
115
- },
116
-
117
- bringToFront: function () {
118
- var pane = this._map._panes.tilePane;
119
-
120
- if (this._container) {
121
- pane.appendChild(this._container);
122
- this._setAutoZIndex(pane, Math.max);
123
- }
124
-
125
- return this;
126
- },
127
-
128
- bringToBack: function () {
129
- var pane = this._map._panes.tilePane;
130
-
131
- if (this._container) {
132
- pane.insertBefore(this._container, pane.firstChild);
133
- this._setAutoZIndex(pane, Math.min);
134
- }
135
-
136
- return this;
137
- },
138
-
139
- getAttribution: function () {
140
- return this.options.attribution;
141
- },
142
-
143
- getContainer: function () {
144
- return this._container;
145
- },
146
-
147
- setOpacity: function (opacity) {
148
- this.options.opacity = opacity;
149
-
150
- if (this._map) {
151
- this._updateOpacity();
152
- }
153
-
154
- return this;
155
- },
156
-
157
- setZIndex: function (zIndex) {
158
- this.options.zIndex = zIndex;
159
- this._updateZIndex();
160
-
161
- return this;
162
- },
163
-
164
- setUrl: function (url, noRedraw) {
165
- this._url = url;
166
-
167
- if (!noRedraw) {
168
- this.redraw();
169
- }
170
-
171
- return this;
172
- },
173
-
174
- redraw: function () {
175
- if (this._map) {
176
- this._reset({hard: true});
177
- this._update();
178
- }
179
- return this;
180
- },
181
-
182
- _updateZIndex: function () {
183
- if (this._container && this.options.zIndex !== undefined) {
184
- this._container.style.zIndex = this.options.zIndex;
185
- }
186
- },
187
-
188
- _setAutoZIndex: function (pane, compare) {
189
-
190
- var layers = pane.children,
191
- edgeZIndex = -compare(Infinity, -Infinity), // -Infinity for max, Infinity for min
192
- zIndex, i, len;
193
-
194
- for (i = 0, len = layers.length; i < len; i++) {
195
-
196
- if (layers[i] !== this._container) {
197
- zIndex = parseInt(layers[i].style.zIndex, 10);
198
-
199
- if (!isNaN(zIndex)) {
200
- edgeZIndex = compare(edgeZIndex, zIndex);
201
- }
202
- }
203
- }
204
-
205
- this.options.zIndex = this._container.style.zIndex =
206
- (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);
207
- },
208
-
209
- _updateOpacity: function () {
210
- var i,
211
- tiles = this._tiles;
212
-
213
- if (L.Browser.ielt9) {
214
- for (i in tiles) {
215
- L.DomUtil.setOpacity(tiles[i], this.options.opacity);
216
- }
217
- } else {
218
- L.DomUtil.setOpacity(this._container, this.options.opacity);
219
- }
220
- },
221
-
222
- _initContainer: function () {
223
- var tilePane = this._map._panes.tilePane;
224
-
225
- if (!this._container) {
226
- this._container = L.DomUtil.create('div', 'leaflet-layer');
227
-
228
- this._updateZIndex();
229
-
230
- if (this._animated) {
231
- var className = 'leaflet-tile-container';
232
-
233
- this._bgBuffer = L.DomUtil.create('div', className, this._container);
234
- this._tileContainer = L.DomUtil.create('div', className, this._container);
235
-
236
- } else {
237
- this._tileContainer = this._container;
238
- }
239
-
240
- tilePane.appendChild(this._container);
241
-
242
- if (this.options.opacity < 1) {
243
- this._updateOpacity();
244
- }
245
- }
246
- },
247
-
248
- _reset: function (e) {
249
- for (var key in this._tiles) {
250
- this.fire('tileunload', {tile: this._tiles[key]});
251
- }
252
-
253
- this._tiles = {};
254
- this._tilesToLoad = 0;
255
-
256
- if (this.options.reuseTiles) {
257
- this._unusedTiles = [];
258
- }
259
-
260
- this._tileContainer.innerHTML = '';
261
-
262
- if (this._animated && e && e.hard) {
263
- this._clearBgBuffer();
264
- }
265
-
266
- this._initContainer();
267
- },
268
-
269
- _getTileSize: function () {
270
- var map = this._map,
271
- zoom = map.getZoom() + this.options.zoomOffset,
272
- zoomN = this.options.maxNativeZoom,
273
- tileSize = this.options.tileSize;
274
-
275
- if (zoomN && zoom > zoomN) {
276
- tileSize = Math.round(map.getZoomScale(zoom) / map.getZoomScale(zoomN) * tileSize);
277
- }
278
-
279
- return tileSize;
280
- },
281
-
282
- _update: function () {
283
-
284
- if (!this._map) { return; }
285
-
286
- var map = this._map,
287
- bounds = map.getPixelBounds(),
288
- zoom = map.getZoom(),
289
- tileSize = this._getTileSize();
290
-
291
- if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
292
- return;
293
- }
294
-
295
- var tileBounds = L.bounds(
296
- bounds.min.divideBy(tileSize)._floor(),
297
- bounds.max.divideBy(tileSize)._floor());
298
-
299
- this._addTilesFromCenterOut(tileBounds);
300
-
301
- if (this.options.unloadInvisibleTiles || this.options.reuseTiles) {
302
- this._removeOtherTiles(tileBounds);
303
- }
304
- },
305
-
306
- _addTilesFromCenterOut: function (bounds) {
307
- var queue = [],
308
- center = bounds.getCenter();
309
-
310
- var j, i, point;
311
-
312
- for (j = bounds.min.y; j <= bounds.max.y; j++) {
313
- for (i = bounds.min.x; i <= bounds.max.x; i++) {
314
- point = new L.Point(i, j);
315
-
316
- if (this._tileShouldBeLoaded(point)) {
317
- queue.push(point);
318
- }
319
- }
320
- }
321
-
322
- var tilesToLoad = queue.length;
323
-
324
- if (tilesToLoad === 0) { return; }
325
-
326
- // load tiles in order of their distance to center
327
- queue.sort(function (a, b) {
328
- return a.distanceTo(center) - b.distanceTo(center);
329
- });
330
-
331
- var fragment = document.createDocumentFragment();
332
-
333
- // if its the first batch of tiles to load
334
- if (!this._tilesToLoad) {
335
- this.fire('loading');
336
- }
337
-
338
- this._tilesToLoad += tilesToLoad;
339
-
340
- for (i = 0; i < tilesToLoad; i++) {
341
- this._addTile(queue[i], fragment);
342
- }
343
-
344
- this._tileContainer.appendChild(fragment);
345
- },
346
-
347
- _tileShouldBeLoaded: function (tilePoint) {
348
- if ((tilePoint.x + ':' + tilePoint.y) in this._tiles) {
349
- return false; // already loaded
350
- }
351
-
352
- var options = this.options;
353
-
354
- if (!options.continuousWorld) {
355
- var limit = this._getWrapTileNum();
356
-
357
- // don't load if exceeds world bounds
358
- if ((options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit.x)) ||
359
- tilePoint.y < 0 || tilePoint.y >= limit.y) { return false; }
360
- }
361
-
362
- if (options.bounds) {
363
- var tileSize = this._getTileSize(),
364
- nwPoint = tilePoint.multiplyBy(tileSize),
365
- sePoint = nwPoint.add([tileSize, tileSize]),
366
- nw = this._map.unproject(nwPoint),
367
- se = this._map.unproject(sePoint);
368
-
369
- // TODO temporary hack, will be removed after refactoring projections
370
- // https://github.com/Leaflet/Leaflet/issues/1618
371
- if (!options.continuousWorld && !options.noWrap) {
372
- nw = nw.wrap();
373
- se = se.wrap();
374
- }
375
-
376
- if (!options.bounds.intersects([nw, se])) { return false; }
377
- }
378
-
379
- return true;
380
- },
381
-
382
- _removeOtherTiles: function (bounds) {
383
- var kArr, x, y, key;
384
-
385
- for (key in this._tiles) {
386
- kArr = key.split(':');
387
- x = parseInt(kArr[0], 10);
388
- y = parseInt(kArr[1], 10);
389
-
390
- // remove tile if it's out of bounds
391
- if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) {
392
- this._removeTile(key);
393
- }
394
- }
395
- },
396
-
397
- _removeTile: function (key) {
398
- var tile = this._tiles[key];
399
-
400
- this.fire('tileunload', {tile: tile, url: tile.src});
401
-
402
- if (this.options.reuseTiles) {
403
- L.DomUtil.removeClass(tile, 'leaflet-tile-loaded');
404
- this._unusedTiles.push(tile);
405
-
406
- } else if (tile.parentNode === this._tileContainer) {
407
- this._tileContainer.removeChild(tile);
408
- }
409
-
410
- // for https://github.com/CloudMade/Leaflet/issues/137
411
- if (!L.Browser.android) {
412
- tile.onload = null;
413
- tile.src = L.Util.emptyImageUrl;
414
- }
415
-
416
- delete this._tiles[key];
417
- },
418
-
419
- _addTile: function (tilePoint, container) {
420
- var tilePos = this._getTilePos(tilePoint);
421
-
422
- // get unused tile - or create a new tile
423
- var tile = this._getTile();
424
-
425
- /*
426
- Chrome 20 layouts much faster with top/left (verify with timeline, frames)
427
- Android 4 browser has display issues with top/left and requires transform instead
428
- (other browsers don't currently care) - see debug/hacks/jitter.html for an example
429
- */
430
- L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome);
431
-
432
- this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
433
-
434
- this._loadTile(tile, tilePoint);
435
-
436
- if (tile.parentNode !== this._tileContainer) {
437
- container.appendChild(tile);
438
- }
439
- },
440
-
441
- _getZoomForUrl: function () {
442
-
443
- var options = this.options,
444
- zoom = this._map.getZoom();
445
-
446
- if (options.zoomReverse) {
447
- zoom = options.maxZoom - zoom;
448
- }
449
-
450
- zoom += options.zoomOffset;
451
-
452
- return options.maxNativeZoom ? Math.min(zoom, options.maxNativeZoom) : zoom;
453
- },
454
-
455
- _getTilePos: function (tilePoint) {
456
- var origin = this._map.getPixelOrigin(),
457
- tileSize = this._getTileSize();
458
-
459
- return tilePoint.multiplyBy(tileSize).subtract(origin);
460
- },
461
-
462
- // image-specific code (override to implement e.g. Canvas or SVG tile layer)
463
-
464
- getTileUrl: function (tilePoint) {
465
- return L.Util.template(this._url, L.extend({
466
- s: this._getSubdomain(tilePoint),
467
- z: tilePoint.z,
468
- x: tilePoint.x,
469
- y: tilePoint.y
470
- }, this.options));
471
- },
472
-
473
- _getWrapTileNum: function () {
474
- var crs = this._map.options.crs,
475
- size = crs.getSize(this._map.getZoom());
476
- return size.divideBy(this._getTileSize())._floor();
477
- },
478
-
479
- _adjustTilePoint: function (tilePoint) {
480
-
481
- var limit = this._getWrapTileNum();
482
-
483
- // wrap tile coordinates
484
- if (!this.options.continuousWorld && !this.options.noWrap) {
485
- tilePoint.x = ((tilePoint.x % limit.x) + limit.x) % limit.x;
486
- }
487
-
488
- if (this.options.tms) {
489
- tilePoint.y = limit.y - tilePoint.y - 1;
490
- }
491
-
492
- tilePoint.z = this._getZoomForUrl();
493
- },
494
-
495
- _getSubdomain: function (tilePoint) {
496
- var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length;
497
- return this.options.subdomains[index];
498
- },
499
-
500
- _getTile: function () {
501
- if (this.options.reuseTiles && this._unusedTiles.length > 0) {
502
- var tile = this._unusedTiles.pop();
503
- this._resetTile(tile);
504
- return tile;
505
- }
506
- return this._createTile();
507
- },
508
-
509
- // Override if data stored on a tile needs to be cleaned up before reuse
510
- _resetTile: function (/*tile*/) {},
511
-
512
- _createTile: function () {
513
- var tile = L.DomUtil.create('img', 'leaflet-tile');
514
- tile.style.width = tile.style.height = this._getTileSize() + 'px';
515
- tile.galleryimg = 'no';
516
-
517
- tile.onselectstart = tile.onmousemove = L.Util.falseFn;
518
-
519
- if (L.Browser.ielt9 && this.options.opacity !== undefined) {
520
- L.DomUtil.setOpacity(tile, this.options.opacity);
521
- }
522
- // without this hack, tiles disappear after zoom on Chrome for Android
523
- // https://github.com/Leaflet/Leaflet/issues/2078
524
- if (L.Browser.mobileWebkit3d) {
525
- tile.style.WebkitBackfaceVisibility = 'hidden';
526
- }
527
- return tile;
528
- },
529
-
530
- _loadTile: function (tile, tilePoint) {
531
- tile._layer = this;
532
- tile.onload = this._tileOnLoad;
533
- tile.onerror = this._tileOnError;
534
-
535
- this._adjustTilePoint(tilePoint);
536
- tile.src = this.getTileUrl(tilePoint);
537
-
538
- this.fire('tileloadstart', {
539
- tile: tile,
540
- url: tile.src
541
- });
542
- },
543
-
544
- _tileLoaded: function () {
545
- this._tilesToLoad--;
546
-
547
- if (this._animated) {
548
- L.DomUtil.addClass(this._tileContainer, 'leaflet-zoom-animated');
549
- }
550
-
551
- if (!this._tilesToLoad) {
552
- this.fire('load');
553
-
554
- if (this._animated) {
555
- // clear scaled tiles after all new tiles are loaded (for performance)
556
- clearTimeout(this._clearBgBufferTimer);
557
- this._clearBgBufferTimer = setTimeout(L.bind(this._clearBgBuffer, this), 500);
558
- }
559
- }
560
- },
561
-
562
- _tileOnLoad: function () {
563
- var layer = this._layer;
564
-
565
- //Only if we are loading an actual image
566
- if (this.src !== L.Util.emptyImageUrl) {
567
- L.DomUtil.addClass(this, 'leaflet-tile-loaded');
568
-
569
- layer.fire('tileload', {
570
- tile: this,
571
- url: this.src
572
- });
573
- }
574
-
575
- layer._tileLoaded();
576
- },
577
-
578
- _tileOnError: function () {
579
- var layer = this._layer;
580
-
581
- layer.fire('tileerror', {
582
- tile: this,
583
- url: this.src
584
- });
585
-
586
- var newUrl = layer.options.errorTileUrl;
587
- if (newUrl) {
588
- this.src = newUrl;
589
- }
590
-
591
- layer._tileLoaded();
592
- }
593
- });
594
-
595
- L.tileLayer = function (url, options) {
596
- return new L.TileLayer(url, options);
597
- };