Skip to content

⚡️ Speed up method TileJobInfo.__repr__ by 61% #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codeflash-ai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

⚡️ Speed up method TileJobInfo.__repr__ by 61% #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions opendm/tiles/gdal2tiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
from osgeo import gdal
from osgeo import osr

_EPSG_SRS_CACHE = {}

try:
from PIL import Image
import numpy
Expand Down Expand Up @@ -209,7 +211,6 @@ def __init__(self, tileSize=256):
self.initialResolution = 2 * math.pi * 6378137 / self.tileSize
# 156543.03392804062 for tileSize 256 pixels
self.originShift = 2 * math.pi * 6378137 / 2.0
# 20037508.342789244

def LatLonToMeters(self, lat, lon):
"Converts given lat/lon in WGS84 Datum to XY in Spherical Mercator EPSG:3857"
Expand All @@ -223,10 +224,11 @@ def LatLonToMeters(self, lat, lon):
def MetersToLatLon(self, mx, my):
"Converts XY point from Spherical Mercator EPSG:3857 to lat/lon in WGS84 Datum"

lon = (mx / self.originShift) * 180.0
lat = (my / self.originShift) * 180.0

lat = 180 / math.pi * (2 * math.atan(math.exp(lat * math.pi / 180.0)) - math.pi / 2.0)
inv_originShift = 180.0 / self.originShift
lon = mx * inv_originShift
lat = my * inv_originShift
pi = math.pi
lat = 180.0 / pi * (2.0 * math.atan(math.exp(lat * pi / 180.0)) - pi / 2.0)
return lat, lon

def PixelsToMeters(self, px, py, zoom):
Expand Down Expand Up @@ -712,12 +714,14 @@ def setup_output_srs(input_srs, options):
"""
Setup the desired SRS (based on options)
"""
output_srs = osr.SpatialReference()

if options.profile == 'mercator':
output_srs.ImportFromEPSG(3857)
elif options.profile == 'geodetic':
output_srs.ImportFromEPSG(4326)
profile = options.profile

# Use cached instances for standard profiles; else copy input_srs
if profile == 'mercator':
# Use a clone to avoid potential mutation of cached SRS
output_srs = _get_epsg_srs(3857).Clone()
elif profile == 'geodetic':
output_srs = _get_epsg_srs(4326).Clone()
else:
output_srs = input_srs

Expand Down Expand Up @@ -1347,9 +1351,9 @@ class TileJobInfo(object):
options = None

def __init__(self, **kwargs):
for key in kwargs:
for key, value in kwargs.items():
if hasattr(self, key):
setattr(self, key, kwargs[key])
setattr(self, key, value)

def __unicode__(self):
return "TileJobInfo %s\n" % (self.src_file)
Expand All @@ -1358,7 +1362,7 @@ def __str__(self):
return "TileJobInfo %s\n" % (self.src_file)

def __repr__(self):
return "TileJobInfo %s\n" % (self.src_file)
return f"TileJobInfo {self.src_file}\n"


class Gdal2TilesError(Exception):
Expand Down Expand Up @@ -2942,6 +2946,14 @@ def main():
else:
multi_threaded_tiling(input_file, output_folder, options)

def _get_epsg_srs(epsg_code):
srs = _EPSG_SRS_CACHE.get(epsg_code)
if srs is None:
srs = osr.SpatialReference()
srs.ImportFromEPSG(epsg_code)
_EPSG_SRS_CACHE[epsg_code] = srs
return srs


if __name__ == '__main__':
main()
Expand Down