rastr 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

rastr/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.0'
-__version_tuple__ = version_tuple = (0, 1, 0)
+__version__ = version = '0.2.0'
+__version_tuple__ = version_tuple = (0, 2, 0)

rastr/io.py

@@ -9,7 +9,7 @@ from rastr.meta import RasterMeta
 from rastr.raster import RasterModel
 
 
-def read_raster_inmem(raster_path: Path, crs: CRS | None = None) -> RasterModel:
+def read_raster_inmem(raster_path: Path | str, crs: CRS | None = None) -> RasterModel:
     """Read raster data from a file and return an in-memory Raster object."""
     with rasterio.open(raster_path, mode="r") as dst:
         # Read the entire array

rastr/meta.py

@@ -11,6 +11,8 @@ class RasterMeta(BaseModel, extra="forbid"):
     Attributes:
         cell_size: Cell size in meters.
         crs: Coordinate reference system.
+        transform: The affine transformation associated with the raster. This is based
+                   on the CRS, the cell size, as well as the offset/origin.
     """
 
     cell_size: float

rastr/raster.py

@@ -74,9 +74,10 @@ class RasterModel(BaseModel):
     __hash__ = BaseModel.__hash__
 
     def __add__(self, other: float | Self) -> Self:
+        cls = self.__class__
         if isinstance(other, float | int):
             new_arr = self.arr + other
-            return RasterModel(arr=new_arr, raster_meta=self.raster_meta)
+            return cls(arr=new_arr, raster_meta=self.raster_meta)
         elif isinstance(other, RasterModel):
             if self.raster_meta != other.raster_meta:
                 msg = (
@@ -91,7 +92,7 @@ class RasterModel(BaseModel):
                 )
                 raise ValueError(msg)
             new_arr = self.arr + other.arr
-            return RasterModel(arr=new_arr, raster_meta=self.raster_meta)
+            return cls(arr=new_arr, raster_meta=self.raster_meta)
         else:
             return NotImplemented
 
@@ -99,9 +100,10 @@ class RasterModel(BaseModel):
         return self + other
 
     def __mul__(self, other: float | Self) -> Self:
+        cls = self.__class__
         if isinstance(other, float | int):
             new_arr = self.arr * other
-            return RasterModel(arr=new_arr, raster_meta=self.raster_meta)
+            return cls(arr=new_arr, raster_meta=self.raster_meta)
         elif isinstance(other, RasterModel):
             if self.raster_meta != other.raster_meta:
                 msg = (
@@ -113,7 +115,7 @@ class RasterModel(BaseModel):
                 msg = "Rasters must have the same shape to be multiplied"
                 raise ValueError(msg)
             new_arr = self.arr * other.arr
-            return RasterModel(arr=new_arr, raster_meta=self.raster_meta)
+            return cls(arr=new_arr, raster_meta=self.raster_meta)
         else:
             return NotImplemented
 
@@ -121,9 +123,10 @@ class RasterModel(BaseModel):
         return self * other
 
     def __truediv__(self, other: float | Self) -> Self:
+        cls = self.__class__
         if isinstance(other, float | int):
             new_arr = self.arr / other
-            return RasterModel(arr=new_arr, raster_meta=self.raster_meta)
+            return cls(arr=new_arr, raster_meta=self.raster_meta)
         elif isinstance(other, RasterModel):
             if self.raster_meta != other.raster_meta:
                 msg = (
@@ -135,7 +138,7 @@ class RasterModel(BaseModel):
                 msg = "Rasters must have the same shape to be divided"
                 raise ValueError(msg)
             new_arr = self.arr / other.arr
-            return RasterModel(arr=new_arr, raster_meta=self.raster_meta)
+            return cls(arr=new_arr, raster_meta=self.raster_meta)
         else:
             return NotImplemented
 
@@ -149,7 +152,8 @@ class RasterModel(BaseModel):
         return -self + other
 
     def __neg__(self) -> Self:
-        return RasterModel(arr=-self.arr, raster_meta=self.raster_meta)
+        cls = self.__class__
+        return cls(arr=-self.arr, raster_meta=self.raster_meta)
 
     @property
     def cell_centre_coords(self) -> NDArray[np.float64]:
@@ -422,9 +426,11 @@ class RasterModel(BaseModel):
 
         return raster_gdf
 
-    def to_file(self, path: Path) -> None:
+    def to_file(self, path: Path | str) -> None:
         """Write the raster to a GeoTIFF file."""
 
+        path = Path(path)
+
         suffix = path.suffix.lower()
         if suffix in (".tif", ".tiff"):
             driver = "GTiff"
@@ -455,8 +461,9 @@ class RasterModel(BaseModel):
                 raise OSError(msg) from err
 
     def __str__(self) -> str:
+        cls = self.__class__
         mean = np.nanmean(self.arr)
-        return f"RasterModel(shape={self.arr.shape}, {mean=})"
+        return f"{cls.__name__}(shape={self.arr.shape}, {mean=})"
 
     def __repr__(self) -> str:
         return str(self)
@@ -619,6 +626,7 @@ class RasterModel(BaseModel):
 
         factor = self.raster_meta.cell_size / new_cell_size
 
+        cls = self.__class__
         # Use the rasterio dataset with proper context management
         with self.to_rasterio_dataset() as dataset:
             # N.B. the new height and width may increase slightly.
@@ -642,7 +650,7 @@ class RasterModel(BaseModel):
                 cell_size=new_cell_size,
             )
 
-            return RasterModel(arr=new_arr, raster_meta=new_raster_meta)
+            return cls(arr=new_arr, raster_meta=new_raster_meta)
 
     @field_validator("arr")
     @classmethod

{rastr-0.1.0.dist-info → rastr-0.2.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: rastr
-Version: 0.1.0
+Version: 0.2.0
 Summary: Geospatial Raster datatype library for Python.
 Project-URL: Source Code, https://github.com/tonkintaylor/rastr
 Project-URL: Bug Tracker, https://github.com/tonkintaylor/rastr/issues
 Project-URL: Releases, https://github.com/tonkintaylor/rastr/releases
-Project-URL: Source Archive, https://github.com/tonkintaylor/rastr/archive/ac9cfaefef4030485d30ce79b97a000821338bd2.zip
-Author-email: Tonkin & Taylor Limited <Sub-DisciplineData+AnalyticsStaff@tonkintaylor.co.nz>, Nathan McDougall <nmcdougall@tonkintaylor.co.nz>
+Project-URL: Source Archive, https://github.com/tonkintaylor/rastr/archive/551d36604b84f947fffbe328e9e877732c9e35fb.zip
+Author-email: Tonkin & Taylor Limited <Sub-DisciplineData+AnalyticsStaff@tonkintaylor.co.nz>, Nathan McDougall <nmcdougall@tonkintaylor.co.nz>, Ben Karl <bkarl@tonkintaylor.co.nz>
 License-Expression: MIT
 License-File: LICENSE
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -41,4 +41,4 @@ Description-Content-Type: text/markdown
 
 Geospatial Raster datatype library for Python.
 
-Currently, only single-banded rasters with square cells are supported.
+Currently, only single-banded, in-memory rasters with square cells are supported.

{rastr-0.1.0.dist-info → rastr-0.2.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rastr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rastr/_version.py,sha256=-LyU5F1uZDjn6Q8_Z6-_FJt_8RE4Kq9zcKdg1abSSps,511
+rastr/_version.py,sha256=iB5DfB5V6YB5Wo4JmvS-txT42QtmGaWcWp3udRT7zCI,511
 rastr/create.py,sha256=tHLVnGarMt04p1z8CVknMWMjQLKrb0WrcP_Wgdw8xr4,9346
-rastr/io.py,sha256=GLj2o26L2bLLXys2wTSKk1mM-FRDciOt7Ty7r87gVg4,961
-rastr/meta.py,sha256=b_knC8a5qWcAZKm8RrZ7bYTLuOtfGQsIp73JMcq8cU0,1384
-rastr/raster.py,sha256=PzmMLJqf6nhYNu81dqLJ9iZpkxOBrn02FtI-5o3meL4,22996
+rastr/io.py,sha256=dKOY5JYQDULg3Si24cysVTZuWoPjftAE8pbxgSoN1tw,967
+rastr/meta.py,sha256=jmDDx3w61ZZ3dQSrMFgaBx0LJxYp42xTm_7uS_s96lg,1547
+rastr/raster.py,sha256=jGk9buG1uKQ3tb3ciI4yhw9JFu7oyXWXMnUBnPjOD54,23142
 rastr/arr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rastr/arr/fill.py,sha256=7N3ECMli7ssNJJk5qgDoj_3xExgu03nohGPgUKWxcCk,903
 rastr/gis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rastr/gis/fishnet.py,sha256=LZqtI9cgYPacuWNfIfdbTkRMRSnJCQdYlaT2eVPmorM,2459
 rastr/gis/smooth.py,sha256=LbWvAG1O-O5H6P5LrbwD03mbnXVYjkH1re-_iZ4arIU,4754
-rastr-0.1.0.dist-info/METADATA,sha256=IKTH8nVmhO3FRMTHWKk0zpdxt5kxw5giusz-7perakI,2143
-rastr-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-rastr-0.1.0.dist-info/licenses/LICENSE,sha256=7qUsx93G2ATTRLZiSYuQofwAX_uWvrqnAiMK8PzxvNc,1080
-rastr-0.1.0.dist-info/RECORD,,
+rastr-0.2.0.dist-info/METADATA,sha256=7uUi8aLMaEbxoPfk6go_szv3H_TnDGYGE4RSC_sbUqo,2191
+rastr-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+rastr-0.2.0.dist-info/licenses/LICENSE,sha256=7qUsx93G2ATTRLZiSYuQofwAX_uWvrqnAiMK8PzxvNc,1080
+rastr-0.2.0.dist-info/RECORD,,