leaflet-rails 0.6.2 → 0.6.3

data/.gitignore

@@ -2,3 +2,7 @@
 .bundle
 Gemfile.lock
 pkg/*
+
+/.rspec
+/coverage/
+/log/

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode
+    - rvm: ruby-head
+    - rvm: jruby-head
+notifications:
+  email: false

data/Gemfile

@@ -1,4 +1,7 @@
 source "http://rubygems.org"
 
+#ruby=1.9.3-p374
+#ruby-gemset=leaflet-rails
+
 # Specify your gem's dependencies in leaflet-rails.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2010-2012, CloudMade, Vladimir Agafonkin, Akshay Joshi
+Copyright (c) 2010-2013, Vladimir Agafonkin
+Copyright (c) 2010-2011, CloudMade
+Copyright (c) 2012-2013, Akshay Joshi
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/axyjo/leaflet-rails.png?branch=master)](https://travis-ci.org/axyjo/leaflet-rails)
+
 Quickstart Guide
 ================
 
@@ -7,7 +9,7 @@ First, add the following code to your `Gemfile`.
 
 ```ruby
 gem 'leaflet-rails'
-``` 
+```
 
 Then, run `bundle install` from within your project to download the necessary files. Following that, open your application-wide CSS file (`app/assets/stylesheets/application.css`) and add the following line as a comment:
 
@@ -28,3 +30,80 @@ After that, open your application-wide Javascript file (typically `app/assets/ja
 ```
 
 At this point, you may skip the first two steps of the [Leaflet Quick Start guide](http://leafletjs.com/examples/quick-start.html) and start at the third step (adding the map `div` to a view).
+
+Helpers
+=======
+
+To get you up and running quickly, you can also use the gem's helper. To get started, add the following lines to a file called `leaflet.rb` in `config/initializers`:
+
+```ruby
+Leaflet.tile_layer = "http://{s}.tile.cloudmade.com/YOUR-CLOUDMADE-API-KEY/997/256/{z}/{x}/{y}.png"
+# You can also use any other tile layer here if you don't want to use Cloudmade - see http://leafletjs.com/reference.html#tilelayer for more
+Leaflet.attribution = "Your attribution statement"
+Leaflet.max_zoom = 18
+```
+
+You will then be able to call the helper in a view like so:
+```ruby
+map(:center => {
+    :latlng => [51.52238797921441, -0.08366235665359283],
+    :zoom => 18
+})
+```
+
+You can also add any number of markers like so:
+```ruby
+map(:center => {
+    :latlng => [51.52238797921441, -0.08366235665359283],
+    :zoom => 18
+  },
+  :markers => [
+    {
+       :latlng => [51.52238797921441, -0.08366235665359283],
+    }
+  ]
+)
+```
+
+Adding a `:popup` element to a marker hash will also generate a popup for a maker:
+
+```ruby
+map(:center => {
+    :latlng => [51.52238797921441, -0.08366235665359283],
+    :zoom => 18
+  },
+  :markers => [
+     {
+       :latlng => [51.52238797921441, -0.08366235665359283],
+       :popup => "Hello!"
+     }
+  ]
+)
+```
+
+If you want to override the map settings you have set in the initializer, you can also add them to the helper:
+
+```ruby
+map(:center => {
+    :latlng => [51.52238797921441, -0.08366235665359283],
+    :zoom => 18
+  },
+  :tile_layer => "http://{s}.somedomain.com/somepath/{z}/{x}/{y}.png",
+  :attribution => "Some other attribution text",
+  :max_zoom => 4
+)
+```
+
+If you want to have multiple maps on same page , you should add unique container_id in helper for each map:
+
+```ruby
+map(:container_id => "first_map", :center => {
+    :latlng => [51.52238797921441, -0.08366235665359283],
+    :zoom => 18
+})
+
+map(:container_id => "second_map", :center => {
+    :latlng => [51.52238797921441, -0.08366235665359283],
+    :zoom => 18
+})
+```

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/leaflet-rails.gemspec

@@ -7,9 +7,10 @@ Gem::Specification.new do |s|
   s.version     = Leaflet::Rails::VERSION
   s.authors     = ["Akshay Joshi"]
   s.email       = ["joshi.a@gmail.com"]
+  s.license     = "BSD"
   s.homepage    = ""
-  s.summary     = %q{Use leaflet.js with Rails 3.}
-  s.description = %q{This gem provides the leaflet.js map display library for your Rails 3 application.}
+  s.summary     = %q{Use leaflet.js with Rails 3/4.}
+  s.description = %q{This gem provides the leaflet.js map display library for your Rails 3/4 application.}
 
   s.rubyforge_project = "leaflet-rails"
 
@@ -18,7 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "simplecov-rcov"
+  s.add_development_dependency "actionpack", '>= 3.2.0'
+  s.add_development_dependency "activesupport", '>= 3.2.0'
+  s.add_development_dependency "activemodel", '>= 3.2.0'
+  s.add_development_dependency "railties", '>= 3.2.0'
 end

data/lib/leaflet-rails.rb

@@ -1,9 +1,20 @@
 require "leaflet-rails/version"
+require "leaflet-rails/view_helpers"
 
 module Leaflet
+  mattr_accessor :tile_layer
+  mattr_accessor :attribution
+  mattr_accessor :max_zoom
+  
   module Rails
     class Engine < ::Rails::Engine
-      # Rails -> use vendor directory.
+      initializer 'leaflet-rails.precompile' do |app|
+        app.config.assets.precompile += %w(layers-2x.png layers.png marker-icon-2x.png marker-icon.png marker-shadow.png)
+      end
+      
+      initializer 'leaflet-rails.helpers' do
+        ActionView::Base.send :include, Leaflet::ViewHelpers
+      end
     end
   end
 end

data/lib/leaflet-rails/version.rb

@@ -1,5 +1,5 @@
 module Leaflet
   module Rails
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

data/lib/leaflet-rails/view_helpers.rb

@@ -0,0 +1,33 @@
+module Leaflet
+  module ViewHelpers
+  
+    def map(options)
+      options[:tile_layer] ||= Leaflet.tile_layer
+      options[:attribution] ||= Leaflet.attribution
+      options[:max_zoom] ||= Leaflet.max_zoom
+      options[:container_id] ||= 'map'
+      
+      output = []
+      output << "<div id='#{options[:container_id]}'></div>"
+      output << "<script>"
+      output << "var map = L.map('#{options[:container_id]}')"
+      output << "map.setView([#{options[:center][:latlng][0]}, #{options[:center][:latlng][1]}], #{options[:center][:zoom]})"
+      if options[:markers]
+        options[:markers].each do |marker|
+          output << "marker = L.marker([#{marker[:latlng][0]}, #{marker[:latlng][1]}]).addTo(map)"
+          if marker[:popup]
+            output << "marker.bindPopup('#{marker[:popup]}')"
+          end
+        end
+      end
+      output << "L.tileLayer('#{options[:tile_layer]}', {
+          attribution: '#{options[:attribution]}',
+          maxZoom: #{options[:max_zoom]}
+      }).addTo(map)"
+      output << "</script>"
+      output.join("\n").html_safe
+    end
+  
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,43 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'simplecov'
+require 'simplecov-rcov'
+
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+SimpleCov.start
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+ 
+ENV["RAILS_ENV"] ||= 'test'
+
+require "action_controller/railtie"
+require "rails/test_unit/railtie"
+
+require "leaflet-rails"
+
+module Test
+  class Application < ::Rails::Application
+    # configuration here if needed
+    config.active_support.deprecation = :stderr
+  end
+end
+
+Test::Application.initialize!
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/spec/view_helpers_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Leaflet::ViewHelpers do
+  
+  class TestView < ActionView::Base
+  end
+  
+  before :all do
+    Leaflet.tile_layer = "http://{s}.somedomain.com/blabla/{z}/{x}/{y}.png"
+    Leaflet.attribution = "Some attribution statement"
+    Leaflet.max_zoom = 18
+    
+    @view = TestView.new
+  end
+  
+  it 'should mix in view helpers on initialization' do
+    @view.should respond_to(:map)
+  end
+  
+  it 'should set the method configuration options' do    
+    result = @view.map(:center => {
+	      :latlng => [51.52238797921441, -0.08366235665359283],
+	      :zoom => 18
+	  	})
+	  
+	  result.should match(/L.tileLayer\('http:\/\/{s}.somedomain\.com\/blabla\/{z}\/{x}\/{y}\.png'/)
+	  result.should match(/attribution: 'Some attribution statement'/)
+	  result.should match(/maxZoom: 18/)
+  end
+  
+  it 'should generate a basic map with the correct latitude, longitude and zoom' do
+    result = @view.map(:center => {
+	      :latlng => [51.52238797921441, -0.08366235665359283],
+	      :zoom => 18
+	  	})
+	  result.should match(/map\.setView\(\[51.52238797921441, -0.08366235665359283\], 18\)/)
+  end
+  
+  it 'should generate a marker' do
+    result = @view.map(:center => {
+	      :latlng => [51.52238797921441, -0.08366235665359283],
+	      :zoom => 18
+	  	},
+	  	:markers => [
+           {
+             :latlng => [51.52238797921441, -0.08366235665359283],
+           }
+        ])
+    result.should match(/marker = L\.marker\(\[51.52238797921441, -0.08366235665359283\]\).addTo\(map\)/)
+  end
+  
+  it 'should generate a marker with a popup' do
+    result = @view.map(:center => {
+	      :latlng => [51.52238797921441, -0.08366235665359283],
+	      :zoom => 18
+	  	},
+	  	:markers => [
+           {
+             :latlng => [51.52238797921441, -0.08366235665359283],
+             :popup => "Hello!"
+           }
+        ])
+    result.should match(/marker = L\.marker\(\[51.52238797921441, -0.08366235665359283\]\).addTo\(map\)/)
+    result.should match(/marker\.bindPopup\('Hello!'\)/)
+  end
+  
+  it 'should override the method configuration options if set' do
+    result = @view.map(:center => {
+	      :latlng => [51.52238797921441, -0.08366235665359283],
+	      :zoom => 18
+	  	},
+	  	:tile_layer => "http://{s}.someotherdomain.com/blabla/{z}/{x}/{y}.png",
+	  	:attribution => "Some other attribution text",
+	  	:max_zoom => 4
+	  	)
+	  
+  	  result.should match(/L.tileLayer\('http:\/\/{s}.someotherdomain\.com\/blabla\/{z}\/{x}\/{y}\.png'/)
+  	  result.should match(/attribution: 'Some other attribution text'/)
+  	  result.should match(/maxZoom: 4/)
+  end
+
+  it 'should have multiple map on single page' do
+    result = @view.map(:container_id => "first_map", :center => {
+              :latlng => [51.52238797921441, -0.08366235665359283],
+                })
+
+    result1 = @view.map(:container_id => "second_map", :center => {
+              :latlng => [51.62238797921441, -0.08366235665359284],
+                })
+
+          result.should match(/id=\'first_map'/)
+          result.should match(/L.map\('first_map'/)
+
+          result1.should match(/id=\'second_map'/)
+          result1.should match(/L.map\('second_map'/)
+
+  end
+  
+end

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

@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
-L.version = '0.6.2';
+L.version = '0.6.3';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -1092,46 +1092,30 @@ L.DomUtil.TRANSITION_END =
 	var userSelectProperty = L.DomUtil.testProp(
 		['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
 
-	var userDragProperty = L.DomUtil.testProp(
-		['userDrag', 'WebkitUserDrag', 'OUserDrag', 'MozUserDrag', 'msUserDrag']);
-
 	L.extend(L.DomUtil, {
 		disableTextSelection: function () {
+			L.DomEvent.on(window, 'selectstart', L.DomEvent.preventDefault);
 			if (userSelectProperty) {
 				var style = document.documentElement.style;
 				this._userSelect = style[userSelectProperty];
 				style[userSelectProperty] = 'none';
-			} else {
-				L.DomEvent.on(window, 'selectstart', L.DomEvent.stop);
 			}
 		},
 
 		enableTextSelection: function () {
+			L.DomEvent.off(window, 'selectstart', L.DomEvent.preventDefault);
 			if (userSelectProperty) {
 				document.documentElement.style[userSelectProperty] = this._userSelect;
 				delete this._userSelect;
-			} else {
-				L.DomEvent.off(window, 'selectstart', L.DomEvent.stop);
 			}
 		},
 
 		disableImageDrag: function () {
-			if (userDragProperty) {
-				var style = document.documentElement.style;
-				this._userDrag = style[userDragProperty];
-				style[userDragProperty] = 'none';
-			} else {
-				L.DomEvent.on(window, 'dragstart', L.DomEvent.stop);
-			}
+			L.DomEvent.on(window, 'dragstart', L.DomEvent.preventDefault);
 		},
 
 		enableImageDrag: function () {
-			if (userDragProperty) {
-				document.documentElement.style[userDragProperty] = this._userDrag;
-				delete this._userDrag;
-			} else {
-				L.DomEvent.off(window, 'dragstart', L.DomEvent.stop);
-			}
+			L.DomEvent.off(window, 'dragstart', L.DomEvent.preventDefault);
 		}
 	});
 })();
@@ -1629,7 +1613,7 @@ L.Map = L.Class.extend({
 		return this.fire('moveend');
 	},
 
-	setMaxBounds: function (bounds) {
+	setMaxBounds: function (bounds, options) {
 		bounds = L.latLngBounds(bounds);
 
 		this.options.maxBounds = bounds;
@@ -1646,7 +1630,7 @@ L.Map = L.Class.extend({
 
 		if (this._loaded) {
 			if (this._zoom < minZoom) {
-				this.setView(bounds.getCenter(), minZoom);
+				this.setView(bounds.getCenter(), minZoom, options);
 			} else {
 				this.panInsideBounds(bounds);
 			}
@@ -1724,10 +1708,14 @@ L.Map = L.Class.extend({
 
 		if (this._loaded) {
 			layer.onRemove(this);
-			this.fire('layerremove', {layer: layer});
 		}
 
 		delete this._layers[id];
+
+		if (this._loaded) {
+			this.fire('layerremove', {layer: layer});
+		}
+
 		if (this._zoomBoundLayers[id]) {
 			delete this._zoomBoundLayers[id];
 			this._updateZoomLevels();
@@ -1856,18 +1844,15 @@ L.Map = L.Class.extend({
 	},
 
 	getMinZoom: function () {
-		var z1 = this.options.minZoom || 0,
-		    z2 = this._layersMinZoom || 0,
-		    z3 = this._boundsMinZoom || 0;
-
-		return Math.max(z1, z2, z3);
+		var z1 = this._layersMinZoom === undefined ? -Infinity : this._layersMinZoom,
+		    z2 = this._boundsMinZoom === undefined ? -Infinity : this._boundsMinZoom;
+		return this.options.minZoom === undefined ? Math.max(z1, z2) : this.options.minZoom;
 	},
 
 	getMaxZoom: function () {
-		var z1 = this.options.maxZoom === undefined ? Infinity : this.options.maxZoom,
-		    z2 = this._layersMaxZoom  === undefined ? Infinity : this._layersMaxZoom;
-
-		return Math.min(z1, z2);
+		return this.options.maxZoom === undefined ?
+			(this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
+			this.options.maxZoom;
 	},
 
 	getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number
@@ -2187,16 +2172,15 @@ L.Map = L.Class.extend({
 	},
 
 	_onMouseClick: function (e) {
-		// jshint camelcase: false
-		if (!this._loaded || (!e._simulated && this.dragging && this.dragging.moved()) || e._leaflet_stop) { return; }
+		if (!this._loaded || (!e._simulated && this.dragging && this.dragging.moved()) ||
+		        L.DomEvent._skipped(e)) { return; }
 
 		this.fire('preclick');
 		this._fireMouseEvent(e);
 	},
 
 	_fireMouseEvent: function (e) {
-		// jshint camelcase: false
-		if (!this._loaded || e._leaflet_stop) { return; }
+		if (!this._loaded || L.DomEvent._skipped(e)) { return; }
 
 		var type = e.type;
 
@@ -3046,6 +3030,11 @@ L.TileLayer.Canvas = L.TileLayer.extend({
 	},
 
 	redraw: function () {
+		if (this._map) {
+			this._reset({hard: true});
+			this._update();
+		}
+
 		for (var i in this._tiles) {
 			this._redrawTile(this._tiles[i]);
 		}
@@ -3360,16 +3349,14 @@ L.Icon.Default = L.Icon.extend({
 		}
 
 		if (L.Browser.retina && name === 'icon') {
-			name += '-2x';
+			return "<%= asset_path('marker-icon-2x.png') %>";
 		}
 
-		var path = L.Icon.Default.imagePath;
-
-		if (!path) {
-			throw new Error('Couldn\'t autodetect L.Icon.Default.imagePath, set it manually.');
+		if (name == 'shadow') {
+			return "<%= asset_path('marker-shadow.png') %>";
+		} else {
+			return "<%= asset_path('marker-icon.png') %>";
 		}
-
-		return path + '/marker-' + name + '.png';
 	}
 });
 
@@ -3535,10 +3522,10 @@ L.Marker = L.Class.extend({
 		if (newShadow !== this._shadow) {
 			this._removeShadow();
 			addShadow = true;
+		}
 
-			if (newShadow) {
-				L.DomUtil.addClass(newShadow, classToAdd);
-			}
+		if (newShadow) {
+			L.DomUtil.addClass(newShadow, classToAdd);
 		}
 		this._shadow = newShadow;
 
@@ -3676,6 +3663,8 @@ L.Marker = L.Class.extend({
 		if (this._map) {
 			this._updateOpacity();
 		}
+
+		return this;
 	},
 
 	_updateOpacity: function () {
@@ -3901,6 +3890,7 @@ L.Popup = L.Class.extend({
 
 		this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
 		L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation);
+		L.DomEvent.on(this._contentNode, 'MozMousePixelScroll', L.DomEvent.stopPropagation);
 		L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
 		this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
 		this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
@@ -4301,6 +4291,9 @@ L.FeatureGroup = L.LayerGroup.extend({
 	},
 
 	removeLayer: function (layer) {
+		if (!this.hasLayer(layer)) {
+			return this;
+		}
 		if (layer in this._layers) {
 			layer = this._layers[layer];
 		}
@@ -4370,9 +4363,11 @@ L.Path = L.Class.extend({
 		// how much to extend the clip area around the map view
 		// (relative to its size, e.g. 0.5 is half the screen in each direction)
 		// set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)
-		CLIP_PADDING: L.Browser.mobile ?
-			Math.max(0, Math.min(0.5,
-			        (1280 / Math.max(window.innerWidth, window.innerHeight) - 1) / 2)) : 0.5
+		CLIP_PADDING: (function () {
+			var max = L.Browser.mobile ? 1280 : 2000,
+			    target = (max / Math.max(window.outerWidth, window.outerHeight) - 1) / 2;
+			return Math.max(0, Math.min(0.5, target));
+		})()
 	},
 
 	options: {
@@ -5632,6 +5627,16 @@ L.polygon = function (latlngs, options) {
 				}
 
 				return this;
+			},
+
+			getLatLngs: function () {
+				var latlngs = [];
+
+				this.eachLayer(function (layer) {
+					latlngs.push(layer.getLatLngs());
+				});
+
+				return latlngs;
 			}
 		});
 	}
@@ -5933,12 +5938,13 @@ L.GeoJSON = L.FeatureGroup.extend({
 
 	addData: function (geojson) {
 		var features = L.Util.isArray(geojson) ? geojson : geojson.features,
-		    i, len;
+		    i, len, feature;
 
 		if (features) {
 			for (i = 0, len = features.length; i < len; i++) {
 				// Only add this if geometry or geometries are set and not null
-				if (features[i].geometries || features[i].geometry || features[i].features) {
+				feature = features[i];
+				if (feature.geometries || feature.geometry || feature.features || feature.coordinates) {
 					this.addData(features[i]);
 				}
 			}
@@ -6316,13 +6322,30 @@ L.DomEvent = {
 
 	getMousePosition: function (e, container) {
 
-		var body = document.body,
+		var ie7 = L.Browser.ie7,
+		    body = document.body,
 		    docEl = document.documentElement,
-		    x = e.pageX ? e.pageX : e.clientX + body.scrollLeft + docEl.scrollLeft,
-		    y = e.pageY ? e.pageY : e.clientY + body.scrollTop + docEl.scrollTop,
-		    pos = new L.Point(x, y);
+		    x = e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft: e.clientX,
+		    y = e.pageY ? e.pageY - body.scrollTop - docEl.scrollTop: e.clientY,
+		    pos = new L.Point(x, y),
+		    rect = container.getBoundingClientRect(),
+		    left = rect.left - container.clientLeft,
+		    top = rect.top - container.clientTop;
+
+		// webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
+		// https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
+		if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
+			left += container.scrollWidth - container.clientWidth;
+
+			// ie7 shows the scrollbar by default and provides clientWidth counting it, so we
+			// need to add it back in if it is visible; scrollbar is on the left as we are RTL
+			if (ie7 && L.DomUtil.getStyle(container, 'overflow-y') !== 'hidden' &&
+			           L.DomUtil.getStyle(container, 'overflow') !== 'hidden') {
+				left += 17;
+			}
+		}
 
-		return (container ? pos._subtract(L.DomUtil.getViewportOffset(container)) : pos);
+		return pos._subtract(new L.Point(left, top));
 	},
 
 	getWheelDelta: function (e) {
@@ -6338,10 +6361,18 @@ L.DomEvent = {
 		return delta;
 	},
 
-	_fakeStop: function stop(e) {
-		// fakes stopPropagation by setting a special event flag checked in Map mouse events handler
-		// jshint camelcase: false
-		e._leaflet_stop = true;
+	_skipEvents: {},
+
+	_fakeStop: function (e) {
+		// fakes stopPropagation by setting a special event flag, checked/reset with L.DomEvent._skipped(e)
+		L.DomEvent._skipEvents[e.type] = true;
+	},
+
+	_skipped: function (e) {
+		var skipped = this._skipEvents[e.type];
+		// reset when checking, as it's only used in map container and propagates outside of the map
+		this._skipEvents[e.type] = false;
+		return skipped;
 	},
 
 	// check if element really left/entered the event target (for mouseenter/mouseleave)
@@ -6603,6 +6634,8 @@ L.Map.Drag = L.Handler.extend({
 			if (map.options.worldCopyJump) {
 				this._draggable.on('predrag', this._onPreDrag, this);
 				map.on('viewreset', this._onViewReset, this);
+
+				this._onViewReset();
 			}
 		}
 		this._draggable.enable();
@@ -8337,9 +8370,14 @@ L.PosAnimation = L.Class.extend({
 	},
 
 	_onStep: function () {
+		var stepPos = this._getPos();
+		if (!stepPos) {
+			this._onTransitionEnd();
+			return;
+		}
 		// jshint camelcase: false
 		// make L.DomUtil.getPosition return intermediate position value during animation
-		this._el._leaflet_pos = this._getPos();
+		this._el._leaflet_pos = stepPos;
 
 		this.fire('step');
 	},
@@ -8356,8 +8394,9 @@ L.PosAnimation = L.Class.extend({
 
 		if (L.Browser.any3d) {
 			matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);
-			left = matches ? parseFloat(matches[1]) : 0;
-			top  = matches ? parseFloat(matches[2]) : 0;
+			if (!matches) { return; }
+			left = parseFloat(matches[1]);
+			top  = parseFloat(matches[2]);
 		} else {
 			left = parseFloat(style.left);
 			top  = parseFloat(style.top);
@@ -8587,6 +8626,10 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 		}
 	},
 
+	_nothingToAnimate: function () {
+		return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
+	},
+
 	_tryAnimatedZoom: function (center, zoom, options) {
 
 		if (this._animatingZoom) { return true; }
@@ -8594,7 +8637,7 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
 		options = options || {};
 
 		// don't animate if disabled, not supported or zoom difference is too large
-		if (!this._zoomAnimated || options.animate === false ||
+		if (!this._zoomAnimated || options.animate === false || this._nothingToAnimate() ||
 		        Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; }
 
 		// offset is the pixel coords of the zoom origin relative to the current center
@@ -8847,7 +8890,7 @@ L.Map.include({
 
 		var data = {
 			latlng: latlng,
-			bounds: bounds,
+			bounds: bounds
 		};
 
 		for (var i in pos.coords) {

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

@@ -378,11 +378,11 @@
 
 .leaflet-touch .leaflet-control-attribution,
 .leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
+.leaflet-touch .leaflet-bar {
     box-shadow: none;
     }
 .leaflet-touch .leaflet-control-layers,
-.leaflet-touch .leaflet-control-zoom {
+.leaflet-touch .leaflet-bar {
     border: 4px solid rgba(0,0,0,0.3);
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leaflet-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,105 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
-dependencies: []
-description: This gem provides the leaflet.js map display library for your Rails 3
+date: 2013-11-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+description: This gem provides the leaflet.js map display library for your Rails 3/4
   application.
 email:
 - joshi.a@gmail.com
@@ -20,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -28,6 +125,9 @@ files:
 - leaflet-rails.gemspec
 - lib/leaflet-rails.rb
 - lib/leaflet-rails/version.rb
+- lib/leaflet-rails/view_helpers.rb
+- spec/spec_helper.rb
+- spec/view_helpers_spec.rb
 - vendor/assets/images/layers-2x.png
 - vendor/assets/images/layers.png
 - vendor/assets/images/marker-icon-2x.png
@@ -37,7 +137,8 @@ files:
 - vendor/assets/stylesheets/leaflet.css.erb
 - vendor/assets/stylesheets/leaflet.ie.css
 homepage: ''
-licenses: []
+licenses:
+- BSD
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -59,5 +160,7 @@ rubyforge_project: leaflet-rails
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Use leaflet.js with Rails 3.
-test_files: []
+summary: Use leaflet.js with Rails 3/4.
+test_files:
+- spec/spec_helper.rb
+- spec/view_helpers_spec.rb