caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 18:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add pixels_to_degrees to helper

Browse Source
This commit is contained in:
Chris Pham
2018-02-03 13:56:15 -08:00
parent 37303e3a95
commit 0cbd593380
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ground_station/resources/core/MapHelper.py
View File

@@ -9,3 +9,6 @@ class MapHelper(object):
def fast_round(self, value, precision):
return int(value * 10 ** precision) / 10. ** precision
def pixels_to_degrees(self, pixels, zoom):
return pixels * 2 ** (21-zoom)

7
ground_station/resources/core/mapping.py
View File

@@ -88,9 +88,6 @@ class GMapsStitcher(object):
string_builder += "LatLong of Southeast Corner: %4f, %4f\n" % (self.southeast)
return string_builder
def _pixels_to_degrees(self, pixels, zoom):
return pixels * 2 ** (21-zoom)
def _pixels_to_meters(self):
# https://groups.google.com/forum/#!topic/google-maps-js-api-v3/hDRO4oHVSeM
return 2 ** self.zoom / (156543.03392 * math.cos(math.radians(self.latitude)))
@@ -128,13 +125,13 @@ class GMapsStitcher(object):
def _pixels_to_lon(self, iterator, lon_pixels):
# Magic Lines, no idea
degrees = self._pixels_to_degrees(((iterator) - self.num_tiles / 2) * _TILESIZE, self.zoom)
degrees = self.helper.pixels_to_degrees(((iterator) - self.num_tiles / 2) * _TILESIZE, self.zoom)
return math.degrees((lon_pixels + degrees - _EARTHPIX) / _PIXRAD)
def _pixels_to_lat(self, iterator, lat_pixels):
# Magic Lines
return math.degrees(math.pi / 2 - 2 * math.atan(
math.exp(((lat_pixels + self._pixels_to_degrees((iterator - self.num_tiles / 2) * _TILESIZE, self.zoom)) - _EARTHPIX) / _PIXRAD)))
math.exp(((lat_pixels + self.helper.pixels_to_degrees((iterator - self.num_tiles / 2) * _TILESIZE, self.zoom)) - _EARTHPIX) / _PIXRAD)))
def fetch_tiles(self):
# cap floats to precision amount