fix: python3 support

Author: commenthol

README.md

@@ -16,6 +16,10 @@ On Debian style OS:
 
     sudo apt install python-gdal
 
+for python3
+
+    sudo apt install python3-gdal
+
 for others give your search-engine a try...
 
 ## Basic usage

gdal2tiles-multiprocess.py

@@ -806,7 +806,7 @@ def __init__(self, arguments):
                     math.ceil(log2(self.in_ds.RasterYSize
                     / float(self.tilesize)))))
 
-            if self.tmaxz < self.nativezoom:
+            if int(self.tmaxz or 0) < self.nativezoom:
                 self.tmaxz = self.nativezoom
 
             if self.options.verbose:
@@ -1580,7 +1580,7 @@ def generate_base_tiles(self, cpu):
 
             # mx, my = self.out_gt[0], self.out_gt[3] # OriginX, OriginY
             # px, py = self.mercator.MetersToPixels( mx, my, self.tmaxz)
-            # print "Pixel coordinates:", px, py, (mx, my)
+            # print("Pixel coordinates:", px, py, (mx, my))
 
             print('')
             print('Tiles generated from the max zoom level:')
@@ -1605,11 +1605,11 @@ def generate_base_tiles(self, cpu):
             print ('dataBandsCount: ', self.dataBandsCount)
             print ('tilebands: ', tilebands)
 
-        # print tminx, tminy, tmaxx, tmaxy
+        # print(tminx, tminy, tmaxx, tmaxy)
 
         tcount = (1 + abs(tmaxx - tminx)) * (1 + abs(tmaxy - tminy))
 
-        # print tcount
+        # print(tcount)
 
         ti = 0
 

gdal2tiles.py

@@ -1367,7 +1367,7 @@ def open_input(self):
                     math.ceil(log2(self.out_ds.RasterYSize
                     / float(self.tilesize)))))
 
-            if self.tmaxz < self.nativezoom:
+            if int(self.tmaxz or 0) < self.nativezoom:
                 self.tmaxz = self.nativezoom
 
             if self.options.verbose:
@@ -1545,7 +1545,7 @@ def generate_base_tiles(self):
 
             # mx, my = self.out_gt[0], self.out_gt[3] # OriginX, OriginY
             # px, py = self.mercator.MetersToPixels( mx, my, self.tmaxz)
-            # print "Pixel coordinates:", px, py, (mx, my)
+            # print("Pixel coordinates:", px, py, (mx, my))
 
             print('')
             print('Tiles generated from the max zoom level:')
@@ -1570,11 +1570,11 @@ def generate_base_tiles(self):
             print ('dataBandsCount: ', self.dataBandsCount)
             print ('tilebands: ', tilebands)
 
-        # print tminx, tminy, tmaxx, tmaxy
+        # print(tminx, tminy, tmaxx, tmaxy)
 
         tcount = (1 + abs(tmaxx - tminx)) * (1 + abs(tmaxy - tminy))
 
-        # print tcount
+        # print(tcount)
 
         ti = 0
 
@@ -1614,7 +1614,7 @@ def generate_base_tiles(self):
                 elif self.options.profile == 'geodetic':
                     b = self.geodetic.TileBounds(tx, ty, tz)
 
-                # print "\tgdalwarp -ts 256 256 -te %s %s %s %s %s %s_%s_%s.tif" % ( b[0], b[1], b[2], b[3], "tiles.vrt", tz, tx, ty)
+                # print("\tgdalwarp -ts 256 256 -te %s %s %s %s %s %s_%s_%s.tif" % ( b[0], b[1], b[2], b[3], "tiles.vrt", tz, tx, ty))
 
                 # Don't scale up by nearest neighbour, better change the querysize
                 # to the native resolution (and return smaller query tile) for scaling

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='gdal2tiles_leaflet',
-    version='0.1.0',
+    version='0.2.0',
     description='Generate raster image tiles for use with leaflet',
     url='https://github.com/commenthol/gdal2tiles-leaflet',
     license='MIT',

test/createtiles.sh

@@ -2,17 +2,21 @@
 
 rm -rf tiles
 
+export GDAL_ALLOW_LARGE_LIBJPEG_MEM_ALLOC=1
+
+python=python3
+
 case $1 in
   mpz)
-    ../gdal2tiles-multiprocess.py -l -p raster -z 0-5 -w none karta.jpg tiles
+    $python ../gdal2tiles-multiprocess.py -l -p raster -z 0-5 -w none karta.jpg tiles
     ;;
   mp)
-    ../gdal2tiles-multiprocess.py -l -p raster -w none karta.jpg tiles
+    $python ../gdal2tiles-multiprocess.py -l -p raster -w none karta.jpg tiles
     ;;
   z)
-    ../gdal2tiles.py -l -p raster -w none karta.jpg -z 0-5 tiles
+    $python ../gdal2tiles.py -l -p raster -w none karta.jpg -z 0-5 tiles
     ;;
   *)
-    ../gdal2tiles.py -l -p raster -w none karta.jpg tiles
+    $python ../gdal2tiles.py -l -p raster -w none karta.jpg tiles
     ;;
 esac