large-image-source-rasterio 1.29.7.dev26__tar.gz → 1.29.7.dev38__tar.gz

{large-image-source-rasterio-1.29.7.dev26 → large-image-source-rasterio-1.29.7.dev38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-rasterio
-Version: 1.29.7.dev26
+Version: 1.29.7.dev38
 Summary: A rasterio tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -16,14 +16,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.29.7.dev26
-Requires-Dist: rasterio<1.3.11,>=1.3; python_version < "3.9"
-Requires-Dist: rasterio>=1.3; python_version >= "3.9"
+Requires-Dist: large-image>=1.29.7.dev38
+Requires-Dist: rasterio>=1.3
 Requires-Dist: packaging
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.7.dev26; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.7.dev38; extra == "girder"
 Provides-Extra: all
 Requires-Dist: rio-cogeo; extra == "all"
 

{large-image-source-rasterio-1.29.7.dev26 → large-image-source-rasterio-1.29.7.dev38}/large_image_source_rasterio/__init__.py

@@ -153,33 +153,29 @@ class RasterioFileTileSource(GDALBaseFileTileSource, metaclass=LruCacheMetaclass
         # use the mapnik source if needed. This variable is always ignored
         # is_netcdf = False
 
-        try:
-            # get the different scales and projections from the image
-            scale = self.getPixelSizeInMeters()
-
-            # raise an error if we are missing some information about the projection
-            # i.e. we don't know where to place it on a map
-            isProjected = self.projection or self.dataset.driver.lower() in {'png'}
-            if isProjected and not scale:
-                msg = ('File does not have a projected scale, so will not be '
-                       'opened via rasterio with a projection.')
-                raise TileSourceError(msg)
-
-            # set the levels of the tiles
-            logX = math.log(float(self.sizeX) / self.tileWidth)
-            logY = math.log(float(self.sizeY) / self.tileHeight)
-            computedLevel = math.ceil(max(logX, logY) / math.log(2))
-            self.sourceLevels = self.levels = int(max(0, computedLevel) + 1)
-
-            self._unitsPerPixel = unitsPerPixel
-            self.projection is None or self._initWithProjection(unitsPerPixel)
-            self._getPopulatedLevels()
-            self._getTileLock = threading.Lock()
-            self._setDefaultStyle()
-        except Exception as exc:
-            msg = f'File cannot be opened via rasterio {exc}.'
+        # get the different scales and projections from the image
+        scale = self.getPixelSizeInMeters()
+
+        # raise an error if we are missing some information about the projection
+        # i.e. we don't know where to place it on a map
+        isProjected = self.projection or self.dataset.driver.lower() in {'png'}
+        if isProjected and not scale:
+            msg = ('File does not have a projected scale, so will not be '
+                   'opened via rasterio with a projection.')
             raise TileSourceError(msg)
 
+        # set the levels of the tiles
+        logX = math.log(float(self.sizeX) / self.tileWidth)
+        logY = math.log(float(self.sizeY) / self.tileHeight)
+        computedLevel = math.ceil(max(logX, logY) / math.log(2))
+        self.sourceLevels = self.levels = int(max(0, computedLevel) + 1)
+
+        self._unitsPerPixel = unitsPerPixel
+        self.projection is None or self._initWithProjection(unitsPerPixel)
+        self._getPopulatedLevels()
+        self._getTileLock = threading.Lock()
+        self._setDefaultStyle()
+
     def _getPopulatedLevels(self):
         try:
             with self._getDatasetLock:
@@ -417,14 +413,15 @@ class RasterioFileTileSource(GDALBaseFileTileSource, metaclass=LruCacheMetaclass
             for k in bounds:
                 bounds[k]['y'] = max(min(bounds[k]['y'], yBounds), -yBounds)
 
-            # rotate longitude so the western-most corner is within [-180, 180)
-            dx = min(v['x'] for v in bounds.values())
-            if dx < -180 or dx >= 180:
-                dx = ((dx + 180) % 360 - 180) - dx
+            # for each corner rotate longitude until it's within -180, 180
+            while any(v['x'] > 180 for v in bounds.values()):
+                for k in bounds:
+                    bounds[k]['x'] -= 180
+            while any(v['x'] < -180 for v in bounds.values()):
                 for k in bounds:
-                    bounds[k]['x'] += dx
+                    bounds[k]['x'] += 360
 
-            # if one of the corner is >= 180 set all the corners to world width
+            # if one of the corner is > 180 set all the corner to world width
             if any(v['x'] >= 180 for v in bounds.values()):
                 bounds['ul']['x'] = bounds['ll']['x'] = -180
                 bounds['ur']['x'] = bounds['lr']['x'] = 180

{large-image-source-rasterio-1.29.7.dev26 → large-image-source-rasterio-1.29.7.dev38}/large_image_source_rasterio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-rasterio
-Version: 1.29.7.dev26
+Version: 1.29.7.dev38
 Summary: A rasterio tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -16,14 +16,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image>=1.29.7.dev26
-Requires-Dist: rasterio<1.3.11,>=1.3; python_version < "3.9"
-Requires-Dist: rasterio>=1.3; python_version >= "3.9"
+Requires-Dist: large-image>=1.29.7.dev38
+Requires-Dist: rasterio>=1.3
 Requires-Dist: packaging
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.7.dev26; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.7.dev38; extra == "girder"
 Provides-Extra: all
 Requires-Dist: rio-cogeo; extra == "all"
 

large-image-source-rasterio-1.29.7.dev38/large_image_source_rasterio.egg-info/requires.txt

@@ -0,0 +1,9 @@
+large-image>=1.29.7.dev38
+rasterio>=1.3
+packaging
+
+[all]
+rio-cogeo
+
+[girder]
+girder-large-image>=1.29.7.dev38

{large-image-source-rasterio-1.29.7.dev26 → large-image-source-rasterio-1.29.7.dev38}/setup.py

@@ -40,7 +40,6 @@ setup(
     },
     description=description,
     long_description=long_description,
-    long_description_content_type='text/x-rst',
     license='Apache Software License 2.0',
     author='Kitware, Inc.',
     author_email='kitware@kitware.com',
@@ -56,9 +55,7 @@ setup(
     ],
     install_requires=[
         f'large-image{limit_version}',
-        'rasterio>=1.3,<1.3.11 ; python_version < "3.9"',
-        # We need rasterio > 1.3 to get the statistics attribute (<=> gdalinfo)
-        'rasterio>=1.3 ; python_version >= "3.9"',
+        'rasterio>=1.3',  # to get the statistics attribute (<=> gdalinfo)
         'packaging',
     ],
     extras_require={

large-image-source-rasterio-1.29.7.dev26/large_image_source_rasterio.egg-info/requires.txt

@@ -1,14 +0,0 @@
-large-image>=1.29.7.dev26
-packaging
-
-[:python_version < "3.9"]
-rasterio<1.3.11,>=1.3
-
-[:python_version >= "3.9"]
-rasterio>=1.3
-
-[all]
-rio-cogeo
-
-[girder]
-girder-large-image>=1.29.7.dev26