tilebelt - npm Package Compare versions

Comparing version 0.1.1 to 0.2.0

index.js

@@ -5,90 +5,90 @@ // a tile is an array [x,y,z]
 function tileToGeoJSON (tile) {
-	var bbox = [tile2lon(tile[0],tile[2]), tile2lat(tile[1],tile[2]), tile2lon(tile[0]+1,tile[2]), tile2lat(tile[1]+1,tile[2])];
-	var poly = bboxPolygon(bbox);
-	return poly;
+    var bbox = [tile2lon(tile[0],tile[2]), tile2lat(tile[1],tile[2]), tile2lon(tile[0]+1,tile[2]), tile2lat(tile[1]+1,tile[2])];
+    var poly = bboxPolygon(bbox);
+    return poly;
 }
 
 function tile2lon(x, z) {
-	return (x/Math.pow(2,z)*360-180);
+    return (x/Math.pow(2,z)*360-180);
 }
  function tile2lat(y, z) {
-	var n=Math.PI-2*Math.PI*y/Math.pow(2,z);
-	return (180/Math.PI*Math.atan(0.5*(Math.exp(n)-Math.exp(-n))));
+    var n=Math.PI-2*Math.PI*y/Math.pow(2,z);
+    return (180/Math.PI*Math.atan(0.5*(Math.exp(n)-Math.exp(-n))));
 }
 
 function pointToTile(lon, lat, z) {
-	return [
-		long2tile(lon, z),
-		lat2tile(lat, z),
-		z
-	];
+    return [
+        long2tile(lon, z),
+        lat2tile(lat, z),
+        z
+    ];
 }
 
 function long2tile(lon, z) { 
-  return (Math.floor((lon+180)/360*Math.pow(2, z))); 
+    return (Math.floor((lon+180)/360*Math.pow(2, z))); 
 }
 
 function lat2tile(lat, z) { 
-  return (Math.floor((1-Math.log(Math.tan(lat*Math.PI/180) + 1/Math.cos(lat*Math.PI/180))/Math.PI)/2 *Math.pow(2, z))); 
+    return (Math.floor((1-Math.log(Math.tan(lat*Math.PI/180) + 1/Math.cos(lat*Math.PI/180))/Math.PI)/2 *Math.pow(2, z))); 
 }
 
 function getChildren (tile) {
-	return [
-		[tile[0]*2, tile[1]*2, tile[2]+1],
-		[tile[0]*2+1, tile[1]*2, tile[2 ]+1],
-		[tile[0]*2+1, tile[1]*2+1, tile[2]+1],
-		[tile[0]*2, tile[1]*2+1, tile[2]+1],
-	];
+    return [
+        [tile[0]*2, tile[1]*2, tile[2]+1],
+        [tile[0]*2+1, tile[1]*2, tile[2 ]+1],
+        [tile[0]*2+1, tile[1]*2+1, tile[2]+1],
+        [tile[0]*2, tile[1]*2+1, tile[2]+1],
+    ];
 }
 
 function getParent (tile) {
-	// top left
-	if(tile[0]%2===0 && tile[1]%2===0) {
-		return [tile[0]/2, tile[1]/2, tile[2]-1];
-	}
-	// bottom left
-	else if((tile[0]%2===0) && (!tile[1]%2===0)) {
-		return [tile[0]/2, (tile[1]-1)/2, tile[2]-1];
-	}
-	// top right
-	else if((!tile[0]%2===0) && (tile[1]%2===0)) {
-		return [(tile[0]-1)/2, (tile[1])/2, tile[2]-1];
-	}
-	// bottom right
-	else {
-		return [(tile[0]-1)/2, (tile[1]-1)/2, tile[2]-1];
-	}
+    // top left
+    if(tile[0]%2===0 && tile[1]%2===0) {
+        return [tile[0]/2, tile[1]/2, tile[2]-1];
+    }
+    // bottom left
+    else if((tile[0]%2===0) && (!tile[1]%2===0)) {
+        return [tile[0]/2, (tile[1]-1)/2, tile[2]-1];
+    }
+    // top right
+    else if((!tile[0]%2===0) && (tile[1]%2===0)) {
+        return [(tile[0]-1)/2, (tile[1])/2, tile[2]-1];
+    }
+    // bottom right
+    else {
+        return [(tile[0]-1)/2, (tile[1]-1)/2, tile[2]-1];
+    }
 }
 
 function getSiblings (tile) {
-	return getChildren(getParent(tile));
+    return getChildren(getParent(tile));
 }
 
 function hasSiblings (tile, tiles) {
-	var hasAll = true;
-	var siblings = getSiblings(tile);
-	siblings.forEach(function(sibling) {
-		if(!hasTile(tiles, sibling)) {
-			hasAll = false;
-		}
-	});
-	return hasAll;
+    var hasAll = true;
+    var siblings = getSiblings(tile);
+    siblings.forEach(function(sibling) {
+        if(!hasTile(tiles, sibling)) {
+            hasAll = false;
+        }
+    });
+    return hasAll;
 }
 
 function hasTile(tiles, tile) {
-	var tileFound = false;
-	tiles.forEach(function(t) {
-		if(tilesEqual(t, tile)) {
-			tileFound = true;
-		}
-	});
-	return tileFound;
+    var tileFound = false;
+    tiles.forEach(function(t) {
+        if(tilesEqual(t, tile)) {
+            tileFound = true;
+        }
+    });
+    return tileFound;
 }
 
 function tilesEqual(tile1, tile2) {
-	return (
-		tile1[0] === tile2[0] &&
-		tile1[1] === tile2[1] &&
-		tile1[2] === tile2[2]
-	);
+    return (
+        tile1[0] === tile2[0] &&
+        tile1[1] === tile2[1] &&
+        tile1[2] === tile2[2]
+    );
 }
@@ -109,31 +109,58 @@
 function quadkeyToTile(quadkey) {
-	var x = 0;
-	var y = 0;
-	var z = quadkey.length;
-	for (var i = z; i >0 ; i--) {
-		var mask = 1 << (i-1) ;
-		var cell =  parseInt(quadkey.substring (z-i,1));
-		if ((cell & 1) !== 0)
-		{
-		    x = x + mask;
-		}
-		if ((cell & 2) !== 0)
-		{
-		    y = y + mask;
-		}
-	}
-	return [x, y, z];
+    var x = 0;
+    var y = 0;
+    var z = quadkey.length;
+
+    for (var i = z; i > 0; i--) {
+        var mask = 1 << (i - 1);
+        switch (quadkey[z - i]) {
+            case '0':
+                break;
+
+            case '1':
+                x |= mask;
+                break;
+
+            case '2':
+                y |= mask;
+                break;
+
+            case '3':
+                x |= mask;
+                y |= mask;
+                break;
+        }
+    }
+    return [x,y,z];
+
+    /*var x = 0;
+    var y = 0;
+    var z = quadkey.length;
+    for (var i = z; i >0 ; i--) {
+        var mask = 1 << (i-1) ;
+        var cell =  parseInt(quadkey.substring (z-i));
+        if ((cell & 1) !== 0)
+        {
+            x = x + mask;
+        }
+        if ((cell & 2) !== 0)
+        {
+            y = y + mask;
+        }
+    }
+    return [x, y, z];*/
 }
 
+
 module.exports = {
-	tileToGeoJSON: tileToGeoJSON,
-	getChildren: getChildren,
-	getParent: getParent,
-	getSiblings: getSiblings,
-	hasTile: hasTile,
-	hasSiblings: hasSiblings,
-	tilesEqual: tilesEqual,
-	tileToQuadkey: tileToQuadkey,
-	quadkeyToTile: quadkeyToTile,
-	pointToTile: pointToTile
+    tileToGeoJSON: tileToGeoJSON,
+    getChildren: getChildren,
+    getParent: getParent,
+    getSiblings: getSiblings,
+    hasTile: hasTile,
+    hasSiblings: hasSiblings,
+    tilesEqual: tilesEqual,
+    tileToQuadkey: tileToQuadkey,
+    quadkeyToTile: quadkeyToTile,
+    pointToTile: pointToTile
 };

package.json

 {
   "name": "tilebelt",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "simple tile utilities",
@@ -5,0 +5,0 @@ "main": "index.js",

test.js

@@ -83,2 +83,14 @@ var test = require('tape'),
     t.end();
-});
+});
+
+test('point and tile back and forth', function(t) {
+    var tile = tilebelt.pointToTile(10,10,10);
+    t.equal(tile.toString(), tilebelt.quadkeyToTile(tilebelt.tileToQuadkey(tile)).toString());
+    t.end();
+});
+
+test('check key 03', function(t) {
+    var quadkey = '03'
+    t.equal(tilebelt.quadkeyToTile(quadkey).toString(), [1,1,2].toString())
+    t.end();
+});

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

9456

increased by14.48%

Lines of code

225

increased by16.58%

No dependency changes