leaflet-rails 0.7.1 → 0.7.2

data/lib/leaflet-rails/version.rb

@@ -1,5 +1,5 @@
 module Leaflet
   module Rails
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   end
 end

data/lib/leaflet-rails/view_helpers.rb

@@ -20,6 +20,17 @@ module Leaflet
           end
         end
       end
+
+      if options[:circles]
+        options[:circles].each do |circle|
+          output << "L.circle(['#{circle[:latlng][0]}', '#{circle[:latlng][1]}'], #{circle[:radius]}, {
+           color: '#{circle[:color]}',
+           fillColor: '#{circle[:fillColor]}',
+           fillOpacity: #{circle[:fillOpacity]}
+        }).addTo(map);"
+        end
+      end
+
       output << "L.tileLayer('#{options[:tile_layer]}', {
           attribution: '#{options[:attribution]}',
           maxZoom: #{options[:max_zoom]}

data/spec/view_helpers_spec.rb

@@ -95,5 +95,27 @@ describe Leaflet::ViewHelpers do
           result1.should match(/L.map\('second_map'/)
 
   end
-  
+ 
+  it 'should generate a map and add a circle' do
+    result = @view.map(
+                :container_id => "first_map",
+                :center => {
+                  :latlng => [51.52238797921441, -0.08366235665359283]
+                },
+                :circles => [
+                  {
+                    :latlng => [51.52238797921441, -0.08366235665359283],
+                    :radius => 12,
+                    :color => 'red',
+                    :fillColor => '#f03',
+                    :fillOpacity => 0.5
+                  }
+                  ])
+    result.should match(/L.circle\(\[\'51.52238797921441\', \'-0.08366235665359283\'\], 12, \{
+           color: \'red\',
+           fillColor: \'#f03\',
+           fillOpacity: 0.5
+        \}\).addTo\(map\)/)
+  end
+
 end

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

@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
-L.version = '0.7.1';
+L.version = '0.7.2';
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -2895,7 +2895,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) {
@@ -6527,26 +6527,15 @@ L.DomEvent = {
 	},
 
 	getMousePosition: function (e, container) {
-		var body = document.body,
-		    docEl = document.documentElement,
-		    //gecko makes scrollLeft more negative as you scroll in rtl, other browsers don't
-			//ref: https://code.google.com/p/closure-library/source/browse/closure/goog/style/bidi.js
-			x = L.DomUtil.documentIsLtr() ?
-					(e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft : e.clientX) :
-						(L.Browser.gecko ? e.pageX - body.scrollLeft - docEl.scrollLeft :
-						 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);
-
 		if (!container) {
-			return pos;
+			return new L.Point(e.clientX, e.clientY);
 		}
 
-		var rect = container.getBoundingClientRect(),
-		    left = rect.left - container.clientLeft,
-		    top = rect.top - container.clientTop;
+		var rect = container.getBoundingClientRect();
 
-		return pos._subtract(new L.Point(left, top));
+		return new L.Point(
+			e.clientX - rect.left - container.clientLeft,
+			e.clientY - rect.top - container.clientTop);
 	},
 
 	getWheelDelta: function (e) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leaflet-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec