Merge pull request #136 from nice-min/master

Fixed #135
kartena · Apr 19, 2017 · c2423cf · c2423cf
2 parents 41d14b5 + b87c393
commit c2423cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/proj4leaflet.js b/src/proj4leaflet.js
@@ -137,6 +137,9 @@
 			if (scale === downScale) {
 				return downZoom;
 			}
+			if (downScale === undefined) {
+				return -Infinity;
+			}
 			// Interpolate
 			nextZoom = downZoom + 1;
 			nextScale = this._scales[nextZoom];

diff --git a/test/specs.js b/test/specs.js
@@ -127,9 +127,9 @@ describe('L.Proj.CRS', function() {
 				resolutions: resolutions,
 				origin: [0, 5000]
 			}),
-		    worldSize = 256,
-		    i,
-		    bounds;
+			worldSize = 256,
+			i,
+			bounds;
 
 		for (i = 0; i < resolutions.length; i++) {
 			bounds = crs.getProjectedBounds(i);
@@ -165,6 +165,15 @@ describe('L.Proj.CRS', function() {
 		expect(crs.zoom(Infinity)).to.be(Infinity);
 	});
 
+	it('converts scale to zoom and returns -Infinity if the scale passed in is smaller than minimum scale', function () {
+		var crs = new L.Proj.CRS('EPSG:3006', '', {
+			scales: [1, 2, 3]
+		});
+
+		expect(crs.zoom(0.9)).to.be(-Infinity);
+		expect(crs.zoom(-Infinity)).to.be(-Infinity);
+	});
+
 	it('tests that distance works (L.CRS.Earth.Distance)', function testDistance() {
 		var crs = new L.Proj.CRS('EPSG:3006', '+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs', {
 			scales: [1, 2, 3]
@@ -181,4 +190,5 @@ describe('L.Proj.CRS', function() {
 			.to.be.within(111.194, 111.195);
 
 	});
+
 });