ssb-sgis 1.1.10__py3-none-any.whl → 1.1.12__py3-none-any.whl

sgis/raster/image_collection.py

@@ -212,19 +212,24 @@ class PixelwiseResults:
             )
         }
 
-    def to_geopandas(self, column: str = "value") -> GeoDataFrame:
+    def to_geopandas(self, column: str | list[str] = "value") -> GeoDataFrame:
         """Return GeoDataFrame with pixel geometries and values from the pixelwise operation."""
-        minx, miny = self.bounds[:2]
         resx, resy = _res_as_tuple(self.res)
 
-        minxs = np.full(self.row_indices.shape, minx) + (minx * self.row_indices * resx)
-        minys = np.full(self.col_indices.shape, miny) + (miny * self.col_indices * resy)
+        # work ourselves inwards from the bottom left and top right corners
+        minx, _, _, maxy = self.bounds
+        minxs = np.full(self.col_indices.shape, minx) + (self.col_indices * resx)
+        maxys = np.full(self.row_indices.shape, maxy) - (self.row_indices * resy)
         maxxs = minxs + resx
-        maxys = minys + resy
+        minys = maxys - resy
 
         return GeoDataFrame(
             {
-                column: self.results,
+                **(
+                    {col: [x[i] for x in self.results] for i, col in enumerate(column)}
+                    if not isinstance(column, str)
+                    else {column: self.results}
+                ),
                 "geometry": [
                     box(minx, miny, maxx, maxy)
                     for minx, miny, maxx, maxy in zip(

{ssb_sgis-1.1.10.dist-info → ssb_sgis-1.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.1.10
+Version: 1.1.12
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT

{ssb_sgis-1.1.10.dist-info → ssb_sgis-1.1.12.dist-info}/RECORD

@@ -54,12 +54,12 @@ sgis/parallel/parallel.py,sha256=CzHetSAr9wvSrEDFTqDq2xAsNuG1ig22-vcEOIoUVv4,396
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/base.py,sha256=tiZEuMcVK6hOm_aIjWhQ1WGshcjsxT1fFkuBSLFiMC0,7785
-sgis/raster/image_collection.py,sha256=FfsBgLtne9_pcCm6FynrMx90NpHLulcshj5ALT08zOA,122888
+sgis/raster/image_collection.py,sha256=hpIVKBizlhn5YyxXoSpXHNVo0eVy5PfTnJCwpw2V1rQ,123152
 sgis/raster/indices.py,sha256=-J1HYmnT240iozvgagvyis6K0_GHZHRuUrPOgyoeIrY,223
 sgis/raster/regex.py,sha256=kYhVpRYzoXutx1dSYmqMoselWXww7MMEsTPmLZwHjbM,3759
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.1.10.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.1.10.dist-info/METADATA,sha256=TBZyISEqjWgban-cpg_xc0ohMB-Resq36r-1NY-s7V8,11741
-ssb_sgis-1.1.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.1.10.dist-info/RECORD,,
+ssb_sgis-1.1.12.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.1.12.dist-info/METADATA,sha256=UMYFkb-iBAu40ktwp9hVhdXoQ4MHvO4osBaCwCG5xHU,11741
+ssb_sgis-1.1.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.1.12.dist-info/RECORD,,