leaflet-js 0.6.beta4 → 0.7.0

data/lib/leaflet/spec/suites/core/UtilSpec.js

@@ -1,16 +1,16 @@
-describe('Util', function() {
+describe('Util', function () {
 
-	describe('#extend', function() {
+	describe('#extend', function () {
 		var a;
 
-		beforeEach(function() {
+		beforeEach(function () {
 			a = {
 				foo: 5,
 				bar: 'asd'
 			};
 		});
 
-		it('extends the first argument with the properties of the second', function() {
+		it('extends the first argument with the properties of the second', function () {
 			L.Util.extend(a, {
 				bar: 7,
 				baz: 3
@@ -23,7 +23,7 @@ describe('Util', function() {
 			});
 		});
 
-		it('accepts more than 2 arguments', function() {
+		it('accepts more than 2 arguments', function () {
 			L.Util.extend(a, {bar: 7}, {baz: 3});
 
 			expect(a).to.eql({
@@ -34,9 +34,9 @@ describe('Util', function() {
 		});
 	});
 
-	describe('#bind', function() {
-		it('returns the given function with the given context', function() {
-			var fn = function() {
+	describe('#bind', function () {
+		it('returns the given function with the given context', function () {
+			var fn = function () {
 				return this;
 			};
 
@@ -59,8 +59,8 @@ describe('Util', function() {
 		});
 	});
 
-	describe('#stamp', function() {
-		it('sets a unique id on the given object and returns it', function() {
+	describe('#stamp', function () {
+		it('sets a unique id on the given object and returns it', function () {
 			var a = {},
 				id = L.Util.stamp(a);
 
@@ -115,38 +115,37 @@ describe('Util', function() {
 	});
 
 
-	describe('#getParamString', function() {
-		it('creates a valid query string for appending depending on url input', function() {
+	describe('#getParamString', function () {
+		it('creates a valid query string for appending depending on url input', function () {
 			var a = {
-				url: "http://example.com/get",
+				url: 'http://example.com/get',
 				obj: {bar: 7, baz: 3},
-				result: "?bar=7&baz=3"
+				result: '?bar=7&baz=3'
 			};
 
-			expect(L.Util.getParamString(a.obj,a.url)).to.eql(a.result);
+			expect(L.Util.getParamString(a.obj, a.url)).to.eql(a.result);
 
 			var b = {
-				url: "http://example.com/get?justone=qs",
+				url: 'http://example.com/get?justone=qs',
 				obj: {bar: 7, baz: 3},
-				result: "&bar=7&baz=3"
+				result: '&bar=7&baz=3'
 			};
 
-			expect(L.Util.getParamString(b.obj,b.url)).to.eql(b.result);
+			expect(L.Util.getParamString(b.obj, b.url)).to.eql(b.result);
 
 			var c = {
 				url: undefined,
 				obj: {bar: 7, baz: 3},
-				result: "?bar=7&baz=3"
+				result: '?bar=7&baz=3'
 			};
 
-			expect(L.Util.getParamString(c.obj,c.url)).to.eql(c.result);
+			expect(L.Util.getParamString(c.obj, c.url)).to.eql(c.result);
 		});
 	});
 
 	describe('#requestAnimFrame', function () {
 		it('calles a function on next frame, unless canceled', function (done) {
 			var spy = sinon.spy(),
-				spy2 = sinon.spy(),
 				foo = {};
 
 			L.Util.requestAnimFrame(spy);
@@ -160,7 +159,7 @@ describe('Util', function() {
 		});
 	});
 
-	describe('#limitExecByInterval', function() {
+	describe('#limitExecByInterval', function () {
 		it('limits execution to not more often than specified time interval', function (done) {
 			var spy = sinon.spy();
 
@@ -189,24 +188,69 @@ describe('Util', function() {
 
 	describe('#template', function () {
 		it('evaluates templates with a given data object', function () {
-			var tpl = 'Hello {foo} and {bar}!';
+			var tpl = 'Hello {foo} and {baz }!';
 
 			var str = L.Util.template(tpl, {
 				foo: 'Vlad',
-				bar: 'Dave'
+				bar: 'Dave',
+				baz: function (o) {
+					return o.bar;
+				}
 			});
 
 			expect(str).to.eql('Hello Vlad and Dave!');
 		});
 
+		it('check the cache', function () {
+			var tpl = 'Hello {foo} and {baz }!';
+
+			var str = L.Util._templateCache[tpl]({
+				foo: 'ladies',
+				baz: function () {
+					return 'gentlemen';
+				}
+			});
+
+			expect(str).to.eql('Hello ladies and gentlemen!');
+		});
+
+		it('evaluates templates with a function', function () {
+			var tpl = L.Util.compileTemplate('Hello { foo } and { bar}!', {});
+
+			var str1 = tpl({
+				foo: 'Vlad',
+				bar: 'Dave'
+			});
+			var str2 = tpl({
+				foo: '{Calvin}',
+				bar: '{Simon}'
+			});
+
+			expect(str1).to.eql('Hello Vlad and Dave!');
+			expect(str2).to.eql('Hello {Calvin} and {Simon}!');
+		});
+
 		it('does not modify text without a token variable', function () {
 			expect(L.Util.template('foo', {})).to.eql('foo');
 		});
 
+		it('supports templates with double quotes', function () {
+			expect(L.Util.template('He said: "{foo}"!', {
+				foo: 'Hello'
+			})).to.eql('He said: "Hello"!');
+		});
+
 		it('throws when a template token is not given', function () {
 			expect(function () {
-				L.Util.template(tpl, {foo: 'bar'});
+				L.Util.template(undefined, {foo: 'bar'});
 			}).to.throwError();
 		});
 	});
+
+	describe('#isArray', function () {
+		expect(L.Util.isArray([1, 2, 3])).to.be(true);
+		expect(L.Util.isArray(new Array(1, 2, 3))).to.be(true);
+		expect(L.Util.isArray('blabla')).to.be(false);
+		expect(L.Util.isArray({0: 1, 1: 2})).to.be(false);
+	});
 });

data/lib/leaflet/spec/suites/dom/DomEventSpec.js

@@ -1,10 +1,10 @@
-describe('DomEvent', function() {
+describe('DomEvent', function () {
 	var el;
 
 	function simulateClick(el) {
 		if (document.createEvent) {
 			var e = document.createEvent('MouseEvents');
-			e.initMouseEvent('click', true, true, window, 
+			e.initMouseEvent('click', true, true, window,
 					0, 0, 0, 0, 0, false, false, false, false, 0, null);
 			return el.dispatchEvent(e);
 		} else if (el.fireEvent) {
@@ -12,19 +12,19 @@ describe('DomEvent', function() {
 		}
 	}
 
-	beforeEach(function() {
+	beforeEach(function () {
 		el = document.createElement('div');
 		el.style.position = 'absolute';
 		el.style.top = el.style.left = '-10000px';
 		document.body.appendChild(el);
 	});
 
-	afterEach(function() {
+	afterEach(function () {
 		document.body.removeChild(el);
 	});
 
-	describe('#addListener', function() {
-		it('adds a listener and calls it on event', function() {
+	describe('#addListener', function () {
+		it('adds a listener and calls it on event', function () {
 			var listener1 = sinon.spy(),
 				listener2 = sinon.spy();
 
@@ -37,11 +37,11 @@ describe('DomEvent', function() {
 			expect(listener2.called).to.be.ok();
 		});
 
-		it('binds "this" to the given context', function() {
+		it('binds "this" to the given context', function () {
 			var obj = {foo: 'bar'},
 				result;
 
-			L.DomEvent.addListener(el, 'click', function() {
+			L.DomEvent.addListener(el, 'click', function () {
 				result = this;
 			}, obj);
 
@@ -50,10 +50,10 @@ describe('DomEvent', function() {
 			expect(result).to.eql(obj);
 		});
 
-		it('passes an event object to the listener', function() {
+		it('passes an event object to the listener', function () {
 			var type;
 
-			L.DomEvent.addListener(el, 'click', function(e) {
+			L.DomEvent.addListener(el, 'click', function (e) {
 				type = e && e.type;
 			});
 			simulateClick(el);
@@ -62,8 +62,8 @@ describe('DomEvent', function() {
 		});
 	});
 
-	describe('#removeListener', function() {
-		it('removes a previously added listener', function() {
+	describe('#removeListener', function () {
+		it('removes a previously added listener', function () {
 			var listener = sinon.spy();
 
 			L.DomEvent.addListener(el, 'click', listener);
@@ -75,8 +75,8 @@ describe('DomEvent', function() {
 		});
 	});
 
-	describe('#stopPropagation', function() {
-		it('stops propagation of the given event', function() {
+	describe('#stopPropagation', function () {
+		it('stops propagation of the given event', function () {
 			var child = document.createElement('div'),
 				listener = sinon.spy();
 
@@ -92,8 +92,8 @@ describe('DomEvent', function() {
 			el.removeChild(child);
 		});
 	});
-	describe('#preventDefault', function() {
-		it('prevents the default action of event', function() {
+	describe('#preventDefault', function () {
+		it('prevents the default action of event', function () {
 			L.DomEvent.addListener(el, 'click', L.DomEvent.preventDefault);
 
 			expect(simulateClick(el)).to.be(false);

data/lib/leaflet/spec/suites/dom/DomUtilSpec.js

@@ -1,30 +1,30 @@
-describe('DomUtil', function() {
+describe('DomUtil', function () {
 	var el;
 
-	beforeEach(function() {
+	beforeEach(function () {
 		el = document.createElement('div');
 		el.style.position = 'absolute';
 		el.style.top = el.style.left = '-10000px';
 		document.body.appendChild(el);
 	});
 
-	afterEach(function() {
+	afterEach(function () {
 		document.body.removeChild(el);
 	});
 
-	describe('#get', function() {
-		it('gets element by id if the given argument is string', function() {
+	describe('#get', function () {
+		it('gets element by id if the given argument is string', function () {
 			el.id = 'testId';
 			expect(L.DomUtil.get(el.id)).to.eql(el);
 		});
 
-		it('returns the element if it is given as an argument', function() {
+		it('returns the element if it is given as an argument', function () {
 			expect(L.DomUtil.get(el)).to.eql(el);
 		});
 	});
 
-	describe('#addClass, #removeClass, #hasClass', function() {
-		it('has defined class for test element', function() {
+	describe('#addClass, #removeClass, #hasClass', function () {
+		it('has defined class for test element', function () {
 			el.className = 'bar foo baz ';
 			expect(L.DomUtil.hasClass(el, 'foo')).to.be.ok();
 			expect(L.DomUtil.hasClass(el, 'bar')).to.be.ok();
@@ -32,7 +32,7 @@ describe('DomUtil', function() {
 			expect(L.DomUtil.hasClass(el, 'boo')).to.not.be.ok();
 		});
 
-		it('adds or removes the class', function() {
+		it('adds or removes the class', function () {
 			el.className = '';
 			L.DomUtil.addClass(el, 'foo');
 
@@ -53,13 +53,6 @@ describe('DomUtil', function() {
 		});
 	});
 
-	describe('#documentIsLtr', function () {
-		it('returns true if doc direction is ltr', function () {
-			expect(L.DomUtil.documentIsLtr()).to.eql(true);
-			expect(L.DomUtil.documentIsLtr()).to.eql(true); // cached
-		});
-	});
-
 	describe('#getViewportOffset', function () {
 		it('calculates the viewport offset of an element', function () {
 			var div = document.createElement('div');

data/lib/leaflet/spec/suites/dom/PosAnimationSpec.js

@@ -0,0 +1,27 @@
+describe('PosAnimation', function () {
+	var el;
+
+	beforeEach(function () {
+		el = document.createElement('div');
+		this.subject = new L.PosAnimation();
+		this.subject._el = el;
+	});
+
+	describe('#_onStep', function () {
+		it("sets element position and fires step event if it is able to get current position", function () {
+			var point = new L.Point(5, 5, true);
+			sinon.stub(this.subject, '_getPos').returns(point);
+			this.subject.fire = sinon.stub();
+			this.subject._onStep();
+			expect(this.subject.fire.withArgs('step').calledOnce).to.be(true);
+			expect(L.DomUtil.getPosition(this.subject._el)).to.be(point);
+		});
+
+		it('stops transition if a position returned', function () {
+			sinon.stub(this.subject, '_onTransitionEnd');
+			sinon.stub(this.subject, '_getPos').returns(undefined);
+			this.subject._onStep();
+			expect(this.subject._onTransitionEnd.calledOnce).to.be(true);
+		});
+	});
+});

data/lib/leaflet/spec/suites/geo/CRSSpec.js

@@ -0,0 +1,47 @@
+describe("CRS.EPSG3395", function () {
+	var crs = L.CRS.EPSG3395;
+
+	describe("#latLngToPoint", function () {
+		it("projects a center point", function () {
+			expect(crs.latLngToPoint(L.latLng(0, 0), 0)).near(new L.Point(128, 128), 0.01);
+		});
+
+		it("projects the northeast corner of the world", function () {
+			expect(crs.latLngToPoint(L.latLng(85.0840591556, 180), 0)).near(new L.Point(256, 0));
+		});
+	});
+
+	describe("#pointToLatLng", function () {
+		it("reprojects a center point", function () {
+			expect(crs.pointToLatLng(new L.Point(128, 128), 0)).nearLatLng(L.latLng(0, 0), 0.01);
+		});
+
+		it("reprojects the northeast corner of the world", function () {
+			expect(crs.pointToLatLng(new L.Point(256, 0), 0)).nearLatLng(L.latLng(85.0840591556, 180));
+		});
+	});
+});
+
+describe("CRS.EPSG3857", function () {
+	var crs = L.CRS.EPSG3857;
+
+	describe("#latLngToPoint", function () {
+		it("projects a center point", function () {
+			expect(crs.latLngToPoint(L.latLng(0, 0), 0)).near(new L.Point(128, 128), 0.01);
+		});
+
+		it("projects the northeast corner of the world", function () {
+			expect(crs.latLngToPoint(L.latLng(85.0511287798, 180), 0)).near(new L.Point(256, 0));
+		});
+	});
+
+	describe("#pointToLatLng", function () {
+		it("reprojects a center point", function () {
+			expect(crs.pointToLatLng(new L.Point(128, 128), 0)).nearLatLng(L.latLng(0, 0), 0.01);
+		});
+
+		it("reprojects the northeast corner of the world", function () {
+			expect(crs.pointToLatLng(new L.Point(256, 0), 0)).nearLatLng(L.latLng(85.0511287798, 180));
+		});
+	});
+});

data/lib/leaflet/spec/suites/geo/LatLngBoundsSpec.js

@@ -1,7 +1,7 @@
-describe('LatLngBounds', function() {
+describe('LatLngBounds', function () {
 	var a, c;
 
-	beforeEach(function() {
+	beforeEach(function () {
 		a = new L.LatLngBounds(
 			new L.LatLng(14, 12),
 			new L.LatLng(30, 40));
@@ -27,9 +27,17 @@ describe('LatLngBounds', function() {
 
 		it('extends the bounds by given bounds', function () {
 			a.extend([[20, 50], [8, 40]]);
-
 			expect(a.getSouthEast()).to.eql(new L.LatLng(8, 50));
 		});
+
+		it('extends the bounds by undefined', function () {
+			expect(a.extend()).to.eql(a);
+		});
+
+		it('extends the bounds by raw object', function () {
+			a.extend({lat: 20, lng: 50});
+			expect(a.getNorthEast()).to.eql(new L.LatLng(30, 50));
+		});
 	});
 
 	describe('#getCenter', function () {
@@ -54,62 +62,62 @@ describe('LatLngBounds', function() {
 		});
 	});
 
-	describe('#isValid', function() {
-		it('returns true if properly set up', function() {
+	describe('#isValid', function () {
+		it('returns true if properly set up', function () {
 			expect(a.isValid()).to.be.ok();
 		});
-		it('returns false if is invalid', function() {
+		it('returns false if is invalid', function () {
 			expect(c.isValid()).to.not.be.ok();
 		});
-		it('returns true if extended', function() {
+		it('returns true if extended', function () {
 			c.extend([0, 0]);
 			expect(c.isValid()).to.be.ok();
 		});
 	});
 
 	describe('#getWest', function () {
-		it('returns a proper bbox west value', function() {
+		it('returns a proper bbox west value', function () {
 			expect(a.getWest()).to.eql(12);
 		});
 	});
 
 	describe('#getSouth', function () {
-		it('returns a proper bbox south value', function() {
+		it('returns a proper bbox south value', function () {
 			expect(a.getSouth()).to.eql(14);
 		});
 
 	});
 
 	describe('#getEast', function () {
-		it('returns a proper bbox east value', function() {
+		it('returns a proper bbox east value', function () {
 			expect(a.getEast()).to.eql(40);
 		});
 
 	});
 
 	describe('#getNorth', function () {
-		it('returns a proper bbox north value', function() {
+		it('returns a proper bbox north value', function () {
 			expect(a.getNorth()).to.eql(30);
 		});
 
 	});
 
 	describe('#toBBoxString', function () {
-		it('returns a proper left,bottom,right,top bbox', function() {
+		it('returns a proper left,bottom,right,top bbox', function () {
 			expect(a.toBBoxString()).to.eql("12,14,40,30");
 		});
 
 	});
 
 	describe('#getNorthWest', function () {
-		it('returns a proper north-west LatLng', function() {
+		it('returns a proper north-west LatLng', function () {
 			expect(a.getNorthWest()).to.eql(new L.LatLng(a.getNorth(), a.getWest()));
 		});
 
 	});
 
 	describe('#getSouthEast', function () {
-		it('returns a proper south-east LatLng', function() {
+		it('returns a proper south-east LatLng', function () {
 			expect(a.getSouthEast()).to.eql(new L.LatLng(a.getSouth(), a.getEast()));
 		});
 	});