Skip to content

Commit

Permalink
added .to_geo(centered=True)
Browse files Browse the repository at this point in the history
  • Loading branch information
Buck Heroux authored and Buck Heroux committed Apr 24, 2014
1 parent 092a2cd commit 482629a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
10 changes: 5 additions & 5 deletions quadkey/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def __init__(self, key):
"""
A quadkey must be between 1 and 23 digits and can only contain digit[0-3]
"""
self.key = key
self.key = key
self.level = len(key)

def children(self):
Expand All @@ -31,7 +31,7 @@ def is_ancestor(self, node):
Get the difference in level
If not, None
"""
if self.level <= node.level or self.key[:len(node.key)] != node.key:
if self.level <= node.level or self.key[:len(node.key)] != node.key:
return None
return self.level - node.level

Expand All @@ -53,11 +53,11 @@ def area(self):
def to_tile(self):
return TileSystem.quadkey_to_tile(self.key)

def to_geo(self):
def to_geo(self, centered=False):
ret = TileSystem.quadkey_to_tile(self.key)
tile = ret[0]
lvl = ret[1]
pixel = TileSystem.tile_to_pixel(tile)
pixel = TileSystem.tile_to_pixel(tile, centered)
return TileSystem.pixel_to_geo(pixel, lvl)

def __eq__(self, other):
Expand All @@ -84,7 +84,7 @@ def from_geo(geo, level):
pixel = TileSystem.geo_to_pixel(geo, level)
tile = TileSystem.pixel_to_tile(pixel)
key = TileSystem.tile_to_quadkey(tile, level)
return QuadKey(key)
return QuadKey(key)

@staticmethod
def from_tile(tile, level):
Expand Down
8 changes: 6 additions & 2 deletions quadkey/tile_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,13 @@ def pixel_to_tile(pixel):
return pixel[0] / 256, pixel[1] / 256

@staticmethod
def tile_to_pixel(tile):
def tile_to_pixel(tile, centered=False):
"""Transform tile to pixel coordinates"""
return tile[0] * 256, tile[1] * 256
pixel = [tile[0] * 256, tile[1] * 256]
if centered:
#should clip on max map size
pixel = [pix + 128 for pix in pixel]
return pixel[0], pixel[1]

@staticmethod
@precondition(lambda tile, lvl: valid_level(lvl))
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from setuptools import setup

setup(name="quadkey",
version="0.0.3",
version="0.0.4",
description="Python Implementation for Geospatial Quadkeys",
author="Buck Heroux",
url="https://github.com/buckheroux/QuadKey",
Expand Down

0 comments on commit 482629a

Please sign in to comment.