leaflet-js 0.7.0.4 → 0.7.7

data/{lib/leaflet → vendor/assets/Leaflet}/src/layer/tile/TileLayer.js

@@ -360,7 +360,7 @@ L.TileLayer = L.Class.extend({
 		}
 
 		if (options.bounds) {
-			var tileSize = options.tileSize,
+			var tileSize = this._getTileSize(),
 			    nwPoint = tilePoint.multiplyBy(tileSize),
 			    sePoint = nwPoint.add([tileSize, tileSize]),
 			    nw = this._map.unproject(nwPoint),
@@ -425,11 +425,9 @@ L.TileLayer = L.Class.extend({
 		/*
 		Chrome 20 layouts much faster with top/left (verify with timeline, frames)
 		Android 4 browser has display issues with top/left and requires transform instead
-		Android 2 browser requires top/left or tiles disappear on load or first drag
-		(reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866
 		(other browsers don't currently care) - see debug/hacks/jitter.html for an example
 		*/
-		L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);
+		L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome);
 
 		this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
 
@@ -475,7 +473,7 @@ L.TileLayer = L.Class.extend({
 	_getWrapTileNum: function () {
 		var crs = this._map.options.crs,
 		    size = crs.getSize(this._map.getZoom());
-		return size.divideBy(this.options.tileSize);
+		return size.divideBy(this._getTileSize())._floor();
 	},
 
 	_adjustTilePoint: function (tilePoint) {

data/{lib/leaflet → vendor/assets/Leaflet}/src/layer/vector/CircleMarker.js

@@ -27,6 +27,7 @@ L.CircleMarker = L.Circle.extend({
 		if (this._popup && this._popup._isOpen) {
 			this._popup.setLatLng(latlng);
 		}
+		return this;
 	},
 
 	setRadius: function (radius) {

data/{lib/leaflet → vendor/assets/Leaflet}/src/layer/vector/Path.SVG.js

@@ -135,7 +135,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),

data/{lib/leaflet → vendor/assets/Leaflet}/src/layer/vector/canvas/Path.Canvas.js

@@ -42,7 +42,8 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 		}
 
 		this._requestUpdate();
-
+		
+		this.fire('remove');
 		this._map = null;
 	},
 
@@ -72,6 +73,13 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 		if (options.fill) {
 			this._ctx.fillStyle = options.fillColor || options.color;
 		}
+
+		if (options.lineCap) {
+			this._ctx.lineCap = options.lineCap;
+		}
+		if (options.lineJoin) {
+			this._ctx.lineJoin = options.lineJoin;
+		}
 	},
 
 	_drawPath: function () {
@@ -109,7 +117,7 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 
 		if (options.fill) {
 			ctx.globalAlpha = options.fillOpacity;
-			ctx.fill();
+			ctx.fill(options.fillRule || 'evenodd');
 		}
 
 		if (options.stroke) {
@@ -124,15 +132,14 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
 
 	_initEvents: function () {
 		if (this.options.clickable) {
-			// TODO dblclick
 			this._map.on('mousemove', this._onMouseMove, this);
-			this._map.on('click', this._onClick, this);
+			this._map.on('click dblclick contextmenu', this._fireMouseEvent, this);
 		}
 	},
 
-	_onClick: function (e) {
+	_fireMouseEvent: function (e) {
 		if (this._containsPoint(e.layerPoint)) {
-			this.fire('click', e);
+			this.fire(e.type, e);
 		}
 	},
 

data/{lib/leaflet → vendor/assets/Leaflet}/src/map/Map.js

@@ -96,15 +96,16 @@ L.Map = L.Class.extend({
 		var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]),
 		    paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]),
 
-		    zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)),
-		    paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
+		    zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR));
+
+		zoom = (options.maxZoom) ? Math.min(options.maxZoom, zoom) : zoom;
+
+		var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
 
 		    swPoint = this.project(bounds.getSouthWest(), zoom),
 		    nePoint = this.project(bounds.getNorthEast(), zoom),
 		    center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);
 
-		zoom = options && options.maxZoom ? Math.min(options.maxZoom, zoom) : zoom;
-
 		return this.setView(center, zoom, options);
 	},
 
@@ -224,6 +225,8 @@ L.Map = L.Class.extend({
 	},
 
 	invalidateSize: function (options) {
+		if (!this._loaded) { return this; }
+
 		options = L.extend({
 			animate: false,
 			pan: true
@@ -233,8 +236,6 @@ L.Map = L.Class.extend({
 		this._sizeChanged = true;
 		this._initialCenter = null;
 
-		if (!this._loaded) { return this; }
-
 		var newSize = this.getSize(),
 		    oldCenter = oldSize.divideBy(2).round(),
 		    newCenter = newSize.divideBy(2).round(),
@@ -568,13 +569,13 @@ L.Map = L.Class.extend({
 		var loading = !this._loaded;
 		this._loaded = true;
 
+		this.fire('viewreset', {hard: !preserveMapOffset});
+
 		if (loading) {
 			this.fire('load');
 			this.eachLayer(this._layerAdd, this);
 		}
 
-		this.fire('viewreset', {hard: !preserveMapOffset});
-
 		this.fire('move');
 
 		if (zoomChanged || afterZoomAnim) {

data/{lib/leaflet → vendor/assets/Leaflet}/src/map/anim/Map.ZoomAnimation.js

@@ -24,8 +24,8 @@ if (L.DomUtil.TRANSITION) {
 
 L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 
-	_catchTransitionEnd: function () {
-		if (this._animatingZoom) {
+	_catchTransitionEnd: function (e) {
+		if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) {
 			this._onZoomTransitionEnd();
 		}
 	},
@@ -61,9 +61,11 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 		return true;
 	},
 
-	_animateZoom: function (center, zoom, origin, scale, delta, backwards) {
+	_animateZoom: function (center, zoom, origin, scale, delta, backwards, forTouchZoom) {
 
-		this._animatingZoom = true;
+		if (!forTouchZoom) {
+			this._animatingZoom = true;
+		}
 
 		// put transform transition on all layers with leaflet-zoom-animated class
 		L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
@@ -77,26 +79,33 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 			L.Draggable._disabled = true;
 		}
 
-		this.fire('zoomanim', {
-			center: center,
-			zoom: zoom,
-			origin: origin,
-			scale: scale,
-			delta: delta,
-			backwards: backwards
-		});
+		L.Util.requestAnimFrame(function () {
+			this.fire('zoomanim', {
+				center: center,
+				zoom: zoom,
+				origin: origin,
+				scale: scale,
+				delta: delta,
+				backwards: backwards
+			});
+			// horrible hack to work around a Chrome bug https://github.com/Leaflet/Leaflet/issues/3689
+			setTimeout(L.bind(this._onZoomTransitionEnd, this), 250);
+		}, this);
 	},
 
 	_onZoomTransitionEnd: function () {
+		if (!this._animatingZoom) { return; }
 
 		this._animatingZoom = false;
 
 		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);
 	}
 });

data/{lib/leaflet → vendor/assets/Leaflet}/src/map/handler/Map.TouchZoom.js

@@ -85,7 +85,7 @@ L.Map.TouchZoom = L.Handler.extend({
 		    center = map.layerPointToLatLng(origin),
 		    zoom = map.getScaleZoom(this._scale);
 
-		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
+		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta, false, true);
 	},
 
 	_onTouchEnd: function () {

data/vendor/assets/{javascripts/leaflet-js.js → leaflet-js.js}

@@ -1,3 +1,3 @@
-//= require 'leaflet.js'
-//= require 'leaflet.draw.js'
+//= require 'leaflet.js'
+//= require 'leaflet.draw.js'
 //= require 'leaflet.label.js'

data/{lib/leaflet.label/libs/leaflet/leaflet.css → vendor/assets/leaflet.css.erb}

@@ -278,12 +278,12 @@
 	border-radius: 5px;
 	}
 .leaflet-control-layers-toggle {
-	background-image: url(images/layers.png);
+	background-image: url(<%= asset_path 'Leaflet/dist/images/layers.png' %>);
 	width: 36px;
 	height: 36px;
 	}
 .leaflet-retina .leaflet-control-layers-toggle {
-	background-image: url(images/layers-2x.png);
+	background-image: url(<%= asset_path 'Leaflet/dist/images/layers-2x.png' %>);
 	background-size: 26px 26px;
 	}
 .leaflet-touch .leaflet-control-layers-toggle {

data/vendor/assets/{stylesheets/leaflet.draw.css.erb → leaflet.draw.css.erb}

@@ -23,12 +23,12 @@
 }
 
 .leaflet-draw-toolbar a {
-	background-image: url(<%= asset_path 'spritesheet.png' %>);
+	background-image: url(<%= asset_path 'Leaflet.draw/dist/images/spritesheet.png' %>);
 	background-repeat: no-repeat;
 }
 
 .leaflet-retina .leaflet-draw-toolbar a {
-	background-image: url(<%= asset_path 'spritesheet-2x.png' %>);
+	background-image: url(<%= asset_path 'Leaflet.draw/dist/images/spritesheet-2x.png' %>);
 	background-size: 270px 30px;
 }
 

data/vendor/assets/leaflet.draw.js

@@ -0,0 +1,38 @@
+// Core
+//=require leaflet.draw/src/Leaflet.draw.js
+
+// DrawHandlers
+//=require leaflet.draw/src/draw/handler/Draw.Feature.js
+//=require leaflet.draw/src/draw/handler/Draw.Polyline.js
+//=require leaflet.draw/src/draw/handler/Draw.Polygon.js
+//=require leaflet.draw/src/draw/handler/Draw.SimpleShape.js
+//=require leaflet.draw/src/draw/handler/Draw.Rectangle.js
+//=require leaflet.draw/src/draw/handler/Draw.Circle.js
+//=require leaflet.draw/src/draw/handler/Draw.Marker.js
+
+// EditHandlers
+//=require leaflet.draw/src/edit/handler/Edit.Marker.js
+//=require leaflet.draw/src/edit/handler/Edit.Poly.js
+//=require leaflet.draw/src/edit/handler/Edit.SimpleShape.js
+//=require leaflet.draw/src/edit/handler/Edit.Rectangle.js
+//=require leaflet.draw/src/edit/handler/Edit.Circle.js
+
+// Extensions
+//=require leaflet.draw/src/ext/LatLngUtil.js
+//=require leaflet.draw/src/ext/GeometryUtil.js
+//=require leaflet.draw/src/ext/LineUtil.Intersect.js
+//=require leaflet.draw/src/ext/Polyline.Intersect.js
+//=require leaflet.draw/src/ext/Polygon.Intersect.js
+
+// CommonUI
+//=require leaflet.draw/src/Control.Draw.js
+//=require leaflet.draw/src/Toolbar.js
+//=require leaflet.draw/src/Tooltip.js
+
+// DrawUI
+//=require leaflet.draw/src/draw/DrawToolbar.js
+
+// EditUI
+//=require leaflet.draw/src/edit/EditToolbar.js
+//=require leaflet.draw/src/edit/handler/EditToolbar.Edit.js
+//=require leaflet.draw/src/edit/handler/EditToolbar.Delete.js

data/vendor/assets/leaflet.js

@@ -0,0 +1,155 @@
+// The core of the library, including OOP, events, DOM facilities, basic units,
+// projections (EPSG:3857 and EPSG:4326) and the base Map class.
+//=require leaflet/src/Leaflet.js
+//=require leaflet/src/core/Util.js
+//=require leaflet/src/core/Class.js
+//=require leaflet/src/core/Events.js
+//=require leaflet/src/core/Browser.js
+//=require leaflet/src/geometry/Point.js
+//=require leaflet/src/geometry/Bounds.js
+//=require leaflet/src/geometry/Transformation.js
+//=require leaflet/src/dom/DomUtil.js
+//=require leaflet/src/geo/LatLng.js
+//=require leaflet/src/geo/LatLngBounds.js
+//=require leaflet/src/geo/projection/Projection.js
+//=require leaflet/src/geo/projection/Projection.SphericalMercator.js
+//=require leaflet/src/geo/projection/Projection.LonLat.js
+//=require leaflet/src/geo/crs/CRS.js
+//=require leaflet/src/geo/crs/CRS.Simple.js
+//=require leaflet/src/geo/crs/CRS.EPSG3857.js
+//=require leaflet/src/geo/crs/CRS.EPSG4326.js
+//=require leaflet/src/map/Map.js
+
+// EPSG3395
+//=require leaflet/src/geo/projection/Projection.Mercator.js
+//=require leaflet/src/geo/crs/CRS.EPSG3395.js
+
+// TileLayer
+//=require leaflet/src/layer/tile/TileLayer.js
+
+// TileLayerWMS
+//=require leaflet/src/layer/tile/TileLayer.WMS.js
+
+// TileLayerCanvas
+//=require leaflet/src/layer/tile/TileLayer.Canvas.js
+
+// ImageOverlay
+//=require leaflet/src/layer/ImageOverlay.js
+
+// Marker
+//=require leaflet/src/layer/marker/Icon.js
+//=require leaflet/src/layer/marker/Icon.Default.js
+//=require leaflet/src/layer/marker/Marker.js
+
+// DivIcon
+//=require leaflet/src/layer/marker/DivIcon.js
+
+// Popup
+//=require leaflet/src/layer/Popup.js
+//=require leaflet/src/layer/marker/Marker.Popup.js
+
+// LayerGroup:
+//=require leaflet/src/layer/LayerGroup.js
+
+// FeatureGroup
+//=require leaflet/src/layer/FeatureGroup.js
+
+// Path
+//=require leaflet/src/layer/vector/Path.js
+//=require leaflet/src/layer/vector/Path.SVG.js
+//=require leaflet/src/layer/vector/Path.Popup.js
+
+// PathVML
+//=require leaflet/src/layer/vector/Path.VML.js
+
+// PathCanvas
+//=require leaflet/src/layer/vector/canvas/Path.Canvas.js
+
+// Polyline
+//=require leaflet/src/geometry/LineUtil.js
+//=require leaflet/src/layer/vector/Polyline.js
+
+// Polygon
+//=require leaflet/src/geometry/PolyUtil.js
+//=require leaflet/src/layer/vector/Polygon.js
+
+// MultiPoly
+//=require leaflet/src/layer/vector/MultiPoly.js
+
+// Rectangle
+//=require leaflet/src/layer/vector/Rectangle.js
+
+// Circle
+//=require leaflet/src/layer/vector/Circle.js
+
+// CircleMarker
+//=require leaflet/src/layer/vector/CircleMarker.js
+
+// VectorsCanvas
+//=require leaflet/src/layer/vector/canvas/Polyline.Canvas.js
+//=require leaflet/src/layer/vector/canvas/Polygon.Canvas.js
+//=require leaflet/src/layer/vector/canvas/Circle.Canvas.js
+//=require leaflet/src/layer/vector/canvas/CircleMarker.Canvas.js
+
+// GeoJSON
+//=require leaflet/src/layer/GeoJSON.js
+
+// MapDrag
+//=require leaflet/src/dom/DomEvent.js
+//=require leaflet/src/dom/Draggable.js
+//=require leaflet/src/core/Handler.js
+//=require leaflet/src/map/handler/Map.Drag.js
+
+// MouseZoom
+//=require leaflet/src/dom/DomEvent.js
+//=require leaflet/src/core/Handler.js
+//=require leaflet/src/map/handler/Map.DoubleClickZoom.js
+//=require leaflet/src/map/handler/Map.ScrollWheelZoom.js
+
+// TouchZoom
+//=require leaflet/src/dom/DomEvent.js
+//=require leaflet/src/dom/DomEvent.DoubleTap.js
+//=require leaflet/src/dom/DomEvent.Pointer.js
+//=require leaflet/src/core/Handler.js
+//=require leaflet/src/map/handler/Map.TouchZoom.js
+//=require leaflet/src/map/handler/Map.Tap.js
+
+// BoxZoom
+//=require leaflet/src/map/handler/Map.BoxZoom.js
+
+// Keyboard
+//=require leaflet/src/map/handler/Map.Keyboard.js
+
+// MarkerDrag
+//=require leaflet/src/layer/marker/Marker.Drag.js
+
+// ControlZoom
+//=require leaflet/src/control/Control.js
+//=require leaflet/src/control/Control.Zoom.js
+
+// ControlAttrib
+//=require leaflet/src/control/Control.js
+//=require leaflet/src/control/Control.Attribution.js
+
+// ControlScale
+//=require leaflet/src/control/Control.js
+//=require leaflet/src/control/Control.Scale.js
+
+// ControlLayers
+//=require leaflet/src/control/Control.js
+//=require leaflet/src/control/Control.Layers.js
+
+// AnimationPan
+//=require leaflet/src/dom/DomEvent.js
+//=require leaflet/src/dom/PosAnimation.js
+//=require leaflet/src/map/anim/Map.PanAnimation.js
+
+// AnimationTimer
+//=require leaflet/src/dom/PosAnimation.Timer.js
+
+// AnimationZoom
+//=require leaflet/src/map/anim/Map.ZoomAnimation.js
+//=require leaflet/src/layer/tile/TileLayer.Anim.js
+
+// Geolocation
+//=require leaflet/src/map/ext/Map.Geolocation.js