calzone 1.1.7__tar.gz → 1.1.8__tar.gz

{calzone-1.1.7 → calzone-1.1.8}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "calzone"
-version = "1.1.7"
+version = "1.1.8"
 edition = "2021"
 
 [lib]

{calzone-1.1.7/src/python/calzone.egg-info → calzone-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calzone
-Version: 1.1.7
+Version: 1.1.8
 Summary: A Geant4 Python wrapper.
 Author-email: Valentin Niess <valentin.niess@gmail.com>
 License: LGPLv3

{calzone-1.1.7 → calzone-1.1.8}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "Topic :: Scientific/Engineering :: Physics"
 ]
-version = "1.1.7"
+version = "1.1.8"
 requires-python = ">=3.7.0"
 dependencies = [
     "numpy >= 1.6.0",

{calzone-1.1.7 → calzone-1.1.8}/src/geometry/map.rs

@@ -4,7 +4,7 @@ use crate::utils::extract::{Extractor, Property, Tag};
 use crate::utils::float::f64x3;
 use crate::utils::io::{dump_stl, PathString};
 use crate::utils::numpy::{PyArray, PyArrayMethods, PyUntypedArray};
-use geotiff::GeoTiff;
+use geotiff::{GeoTiff, RasterType};
 use geo_types::geometry::Coord;
 use pyo3::prelude::*;
 use pyo3::types::PyDict;
@@ -486,12 +486,39 @@ impl Map {
             (x, y)
         };
 
+        let raster_type = match geotiff.geo_key_directory.raster_type
+            .unwrap_or(RasterType::Undefined) {
+            RasterType::RasterPixelIsArea => RasterType::RasterPixelIsArea,
+            RasterType::RasterPixelIsPoint => RasterType::RasterPixelIsPoint,
+            _ => if geotiff
+                .get_value_at::<f64>(&Coord { x: x0, y: y0 }, 0)
+                .or_else(|| geotiff.get_value_at::<f64>(&Coord { x: x1, y: y0 }, 0))
+                .or_else(|| geotiff.get_value_at::<f64>(&Coord { x: x0, y: y1 }, 0))
+                .or_else(|| geotiff.get_value_at::<f64>(&Coord { x: x1, y: y1 }, 0))
+                .is_none() {
+                RasterType::RasterPixelIsPoint
+            } else {
+                RasterType::RasterPixelIsArea
+            },
+        };
+        let (x0, x1, dx, y0, y1, dy) = match raster_type {
+            RasterType::RasterPixelIsArea => {
+                let dx = (x1 - x0) / (nx as f64);
+                let dy = (y1 - y0) / (ny as f64);
+                (x0 + 0.5 * dx, x1 - 0.5 * dx, dx, y0 + 0.5 * dy, y1 - 0.5 * dy, dy)
+            },
+            RasterType::RasterPixelIsPoint => {
+                let dx = (x1 - x0) / ((nx - 1) as f64);
+                let dy = (y1 - y0) / ((ny - 1) as f64);
+                (x0, x1, dx, y0, y1, dy)
+            },
+            _ => unreachable!(),
+        };
+
         let array = PyArray::<f32>::empty(py, &[ny, nx])?;
         let size = nx * ny;
         if size > 0 {
             let z = unsafe { array.slice_mut()? };
-            let dx = (x1 - x0) / ((nx - 1) as f64);
-            let dy = (y1 - y0) / ((ny - 1) as f64);
             for iy in 0..ny {
                 let y = if iy == ny - 1 { y1 } else { y0 + iy as f64 * dy };
                 for ix in 0..nx {

{calzone-1.1.7 → calzone-1.1.8}/src/python/calzone/__init__.py

@@ -11,4 +11,4 @@ def init():
 init()
 del init
 
-VERSION = "1.1.7"
+VERSION = "1.1.8"

{calzone-1.1.7 → calzone-1.1.8/src/python/calzone.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calzone
-Version: 1.1.7
+Version: 1.1.8
 Summary: A Geant4 Python wrapper.
 Author-email: Valentin Niess <valentin.niess@gmail.com>
 License: LGPLv3