leaflet-rails 0.4.2.beta1 → 0.4.4

data/lib/leaflet-rails/version.rb

@@ -1,5 +1,5 @@
 module Leaflet
   module Rails
-    VERSION = "0.4.2.beta1"
+    VERSION = "0.4.4"
   end
 end

data/vendor/assets/javascripts/leaflet.js.erb

@@ -21,7 +21,7 @@ if (typeof exports !== undefined + '') {
 	window.L = L;
 }
 
-L.version = '0.4.2';
+L.version = '0.4.4';
 
 
 /*
@@ -756,7 +756,7 @@ L.DomUtil = {
 			value = Math.round(value * 100);
 
 			if (filter) {
-				filter.Enabled = (value === 100);
+				filter.Enabled = (value !== 100);
 				filter.Opacity = value;
 			} else {
 				el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
@@ -1347,7 +1347,8 @@ L.Map = L.Class.extend({
 		if (!this._loaded) { return this; }
 
 		var offset = oldSize.subtract(this.getSize()).divideBy(2, true);
-		if (animate) {
+
+		if (animate === true) {
 			this.panBy(offset);
 		} else {
 			this._rawPanBy(offset);
@@ -2236,10 +2237,12 @@ L.TileLayer = L.Class.extend({
 		// get unused tile - or create a new tile
 		var tile = this._getTile();
 
-		// Chrome 20 layouts much faster with top/left (Verify with timeline, frames), Safari 5.1.7, iOS 5.1.1,
-		// android browser (4.0) have display issues with top/left and requires transform instead
+		// 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 3 browser not tested
+		// 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.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);
 
 		this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
 
@@ -3531,6 +3534,14 @@ L.FeatureGroup = L.LayerGroup.extend({
 		return this.invoke('setStyle', style);
 	},
 
+	bringToFront: function () {
+		return this.invoke('bringToFront');
+	},
+
+	bringToBack: function () {
+		return this.invoke('bringToBack');
+	},
+
 	getBounds: function () {
 		var bounds = new L.LatLngBounds();
 		this.eachLayer(function (layer) {
@@ -3679,6 +3690,7 @@ L.Path = L.Path.extend({
 		if (this._container) {
 			this._map._pathRoot.appendChild(this._container);
 		}
+		return this;
 	},
 
 	bringToBack: function () {
@@ -3686,6 +3698,7 @@ L.Path = L.Path.extend({
 			var root = this._map._pathRoot;
 			root.insertBefore(this._container, root.firstChild);
 		}
+		return this;
 	},
 
 	getPathString: function () {
@@ -5058,27 +5071,42 @@ L.GeoJSON = L.FeatureGroup.extend({
 			return this;
 		}
 
-		var options = this.options,
-		    style = options.style;
+		var options = this.options;
 
 		if (options.filter && !options.filter(geojson)) { return; }
 
 		var layer = L.GeoJSON.geometryToLayer(geojson, options.pointToLayer);
+		layer.feature = geojson;
 
-		if (style) {
-			if (typeof style === 'function') {
-				style = style(geojson);
-			}
-			if (layer.setStyle) {
-				layer.setStyle(style);
-			}
-		}
+		this.resetStyle(layer);
 
 		if (options.onEachFeature) {
 			options.onEachFeature(geojson, layer);
 		}
 
 		return this.addLayer(layer);
+	},
+
+	resetStyle: function (layer) {
+		var style = this.options.style;
+		if (style) {
+			this._setLayerStyle(layer, style);
+		}
+	},
+
+	setStyle: function (style) {
+		this.eachLayer(function (layer) {
+			this._setLayerStyle(layer, style);
+		}, this);
+	},
+
+	_setLayerStyle: function (layer, style) {
+		if (typeof style === 'function') {
+			style = style(layer.feature);
+		}
+		if (layer.setStyle) {
+			layer.setStyle(style);
+		}
 	}
 });
 
@@ -5158,6 +5186,7 @@ L.geoJson = function (geojson, options) {
 	return new L.GeoJSON(geojson, options);
 };
 
+
 /*
  * L.DomEvent contains functions for working with DOM events.
  */
@@ -5400,11 +5429,6 @@ L.Draggable = L.Class.extend({
 			return;
 		}
 
-		if (!L.Browser.touch) {
-			L.DomUtil.disableTextSelection();
-			this._setMovingCursor();
-		}
-
 		this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
 		this._startPoint = new L.Point(first.clientX, first.clientY);
 
@@ -5426,6 +5450,11 @@ L.Draggable = L.Class.extend({
 		if (!this._moved) {
 			this.fire('dragstart');
 			this._moved = true;
+
+			if (!L.Browser.touch) {
+				L.DomUtil.disableTextSelection();
+				this._setMovingCursor();
+			}
 		}
 
 		this._newPos = this._startPos.add(diffVec);
@@ -6042,8 +6071,8 @@ L.Map.Keyboard = L.Handler.extend({
 		right:   [39],
 		down:    [40],
 		up:      [38],
-		zoomIn:  [187, 61, 107],
-		zoomOut: [189, 109, 0]
+		zoomIn:  [187, 107, 61],
+		zoomOut: [189, 109]
 	},
 
 	initialize: function (map) {
@@ -7087,7 +7116,7 @@ L.Transition = L.Transition.extend({
 
 		this._el.style[L.Transition.DURATION] = this.options.duration + 's';
 		this._el.style[L.Transition.EASING] = this.options.easing;
-		this._el.style[L.Transition.PROPERTY] = propsList.join(', ');
+		this._el.style[L.Transition.PROPERTY] = 'all';
 
 		for (prop in props) {
 			if (props.hasOwnProperty(prop)) {
@@ -7095,9 +7124,10 @@ L.Transition = L.Transition.extend({
 			}
 		}
 
-		this._inProgress = true;
+		// Chrome flickers for some reason if you don't do this
+		L.Util.falseFn(this._el.offsetWidth);
 
-		this.fire('start');
+		this._inProgress = true;
 
 		if (L.Browser.mobileWebkit) {
 			// Set up a slightly delayed call to a backup event if webkitTransitionEnd doesn't fire properly
@@ -7353,11 +7383,18 @@ L.Map.mergeOptions({
 	zoomAnimation: L.DomUtil.TRANSITION && !L.Browser.android23 && !L.Browser.mobileOpera
 });
 
+if (L.DomUtil.TRANSITION) {
+	L.Map.addInitHook(function () {
+		L.DomEvent.on(this._mapPane, L.Transition.END, this._catchTransitionEnd, this);
+	});
+}
+
 L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 
 	_zoomToIfClose: function (center, zoom) {
 
 		if (this._animatingZoom) { return true; }
+
 		if (!this.options.zoomAnimation) { return false; }
 
 		var scale = this.getZoomScale(zoom),
@@ -7372,8 +7409,6 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 			.fire('movestart')
 			.fire('zoomstart');
 
-		this._prepareTileBg();
-
 		this.fire('zoomanim', {
 			center: center,
 			zoom: zoom
@@ -7381,17 +7416,22 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 
 		var origin = this._getCenterLayerPoint().add(offset);
 
+		this._prepareTileBg();
 		this._runAnimation(center, zoom, scale, origin);
 
 		return true;
 	},
 
+	_catchTransitionEnd: function (e) {
+		if (this._animatingZoom) {
+			this._onZoomTransitionEnd();
+		}
+	},
 
 	_runAnimation: function (center, zoom, scale, origin, backwardsTransform) {
-		this._animatingZoom = true;
-
 		this._animateToCenter = center;
 		this._animateToZoom = zoom;
+		this._animatingZoom = true;
 
 		var transform = L.DomUtil.TRANSFORM,
 			tileBg = this._tileBg;
@@ -7403,29 +7443,14 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 			tileBg.style[transform] += ' translate(0,0)';
 		}
 
-		var scaleStr;
-
-		// Android 2.* doesn't like translate/scale chains, transformOrigin + scale works better but
-		// it breaks touch zoom which Anroid doesn't support anyway, so that's a really ugly hack
-
-		// TODO work around this prettier
-		if (L.Browser.android23) {
-			tileBg.style[transform + 'Origin'] = origin.x + 'px ' + origin.y + 'px';
-			scaleStr = 'scale(' + scale + ')';
-		} else {
-			scaleStr = L.DomUtil.getScaleString(scale, origin);
-		}
-
 		L.Util.falseFn(tileBg.offsetWidth); //hack to make sure transform is updated before running animation
 
-		var options = {};
-		if (backwardsTransform) {
-			options[transform] = tileBg.style[transform] + ' ' + scaleStr;
-		} else {
-			options[transform] = scaleStr + ' ' + tileBg.style[transform];
-		}
+		var scaleStr = L.DomUtil.getScaleString(scale, origin),
+			oldTransform = tileBg.style[transform];
 
-		tileBg.transition.run(options);
+		tileBg.style[transform] = backwardsTransform ?
+			oldTransform + ' ' + scaleStr :
+			scaleStr + ' ' + oldTransform;
 	},
 
 	_prepareTileBg: function () {
@@ -7433,8 +7458,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 			tileBg = this._tileBg;
 
 		// If foreground layer doesn't have many tiles but bg layer does, keep the existing bg layer and just zoom it some more
-		// (disable this for Android due to it not supporting double translate)
-		if (!L.Browser.android23 && tileBg &&
+		if (tileBg &&
 				this._getLoadedTilesPercentage(tileBg) > 0.5 &&
 				this._getLoadedTilesPercentage(tilePane) < 0.5) {
 
@@ -7461,14 +7485,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 		this._tilePane = this._panes.tilePane = tileBg;
 		var newTileBg = this._tileBg = tilePane;
 
-		if (!newTileBg.transition) {
-			// TODO move to Map options
-			newTileBg.transition = new L.Transition(newTileBg, {
-				duration: 0.25,
-				easing: 'cubic-bezier(0.25,0.1,0.25,0.75)'
-			});
-			newTileBg.transition.on('end', this._onZoomTransitionEnd, this);
-		}
+		L.DomUtil.addClass(newTileBg, 'leaflet-zoom-animated');
 
 		this._stopLoadingImages(newTileBg);
 	},
@@ -7505,7 +7522,6 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 
 	_onZoomTransitionEnd: function () {
 		this._restoreTileFront();
-
 		L.Util.falseFn(this._tileBg.offsetWidth); // force reflow
 		this._resetView(this._animateToCenter, this._animateToZoom, true, true);
 

data/vendor/assets/stylesheets/leaflet.css.erb

@@ -365,9 +365,8 @@
 .leaflet-popup-content-wrapper, .leaflet-popup-tip {
 	background: white;
 
-	box-shadow: 0 3px 10px #888;
-	-moz-box-shadow: 0 3px 10px #888;
-	-webkit-box-shadow: 0 3px 14px #999;
+	box-shadow: 0 3px 14px rgba(0,0,0,0.35);
+	-webkit-box-shadow: 0 3px 18px rgba(0,0,0,0.33);
 	}
 .leaflet-popup-content-wrapper {
 	-moz-border-radius: 20px;

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: leaflet-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2.beta1
-  prerelease: 6
+  version: 0.4.4
+  prerelease: 
 platform: ruby
 authors:
 - Akshay Joshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides the leaflet.js map display library for your Rails 3
   application.
@@ -31,7 +31,6 @@ files:
 - vendor/assets/images/layers.png
 - vendor/assets/images/marker-icon.png
 - vendor/assets/images/marker-shadow.png
-- vendor/assets/images/popup-close.png
 - vendor/assets/images/zoom-in.png
 - vendor/assets/images/zoom-out.png
 - vendor/assets/javascripts/leaflet.js.erb
@@ -51,13 +50,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -734423042529007207
+      hash: -1604447338588129085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -1604447338588129085
 requirements: []
 rubyforge_project: leaflet-rails
 rubygems_version: 1.8.23