ssb-sgis 1.1.10__tar.gz → 1.1.12__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/PKG-INFO +1 -1
  2. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/pyproject.toml +1 -1
  3. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/raster/image_collection.py +11 -6
  4. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/LICENSE +0 -0
  5. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/README.md +0 -0
  6. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/__init__.py +0 -0
  7. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/conf.py +0 -0
  8. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/debug_config.py +0 -0
  9. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/exceptions.py +0 -0
  10. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/__init__.py +0 -0
  11. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/bounds.py +0 -0
  12. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/buffer_dissolve_explode.py +0 -0
  13. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/centerlines.py +0 -0
  14. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/cleaning.py +0 -0
  15. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/conversion.py +0 -0
  16. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/duplicates.py +0 -0
  17. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/general.py +0 -0
  18. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/geocoding.py +0 -0
  19. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/geometry_types.py +0 -0
  20. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/neighbors.py +0 -0
  21. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/overlay.py +0 -0
  22. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/point_operations.py +0 -0
  23. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/polygon_operations.py +0 -0
  24. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/polygons_as_rings.py +0 -0
  25. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/geopandas_tools/sfilter.py +0 -0
  26. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/helpers.py +0 -0
  27. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/io/__init__.py +0 -0
  28. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/io/_is_dapla.py +0 -0
  29. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/io/dapla_functions.py +0 -0
  30. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/io/opener.py +0 -0
  31. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/io/read_parquet.py +0 -0
  32. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/__init__.py +0 -0
  33. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/examine.py +0 -0
  34. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/explore.py +0 -0
  35. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/httpserver.py +0 -0
  36. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/legend.py +0 -0
  37. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/map.py +0 -0
  38. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/maps.py +0 -0
  39. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/norge_i_bilder.json +0 -0
  40. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/thematicmap.py +0 -0
  41. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/tilesources.py +0 -0
  42. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/maps/wms.py +0 -0
  43. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/__init__.py +0 -0
  44. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/_get_route.py +0 -0
  45. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/_od_cost_matrix.py +0 -0
  46. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/_points.py +0 -0
  47. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/_service_area.py +0 -0
  48. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/closing_network_holes.py +0 -0
  49. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/cutting_lines.py +0 -0
  50. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/directednetwork.py +0 -0
  51. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/finding_isolated_networks.py +0 -0
  52. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/network.py +0 -0
  53. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/networkanalysis.py +0 -0
  54. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/networkanalysisrules.py +0 -0
  55. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/nodes.py +0 -0
  56. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/networkanalysis/traveling_salesman.py +0 -0
  57. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/parallel/__init__.py +0 -0
  58. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/parallel/parallel.py +0 -0
  59. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/py.typed +0 -0
  60. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/raster/__init__.py +0 -0
  61. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/raster/base.py +0 -0
  62. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/raster/indices.py +0 -0
  63. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/raster/regex.py +0 -0
  64. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/raster/sentinel_config.py +0 -0
  65. {ssb_sgis-1.1.10 → ssb_sgis-1.1.12}/src/sgis/raster/zonal.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ssb-sgis
3
- Version: 1.1.10
3
+ Version: 1.1.12
4
4
  Summary: GIS functions used at Statistics Norway.
5
5
  Home-page: https://github.com/statisticsnorway/ssb-sgis
6
6
  License: MIT
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "ssb-sgis"
3
- version = "1.1.10"
3
+ version = "1.1.12"
4
4
  description = "GIS functions used at Statistics Norway."
5
5
  authors = ["Morten Letnes <morten.letnes@ssb.no>"]
6
6
  license = "MIT"
@@ -212,19 +212,24 @@ class PixelwiseResults:
212
212
  )
213
213
  }
214
214
 
215
- def to_geopandas(self, column: str = "value") -> GeoDataFrame:
215
+ def to_geopandas(self, column: str | list[str] = "value") -> GeoDataFrame:
216
216
  """Return GeoDataFrame with pixel geometries and values from the pixelwise operation."""
217
- minx, miny = self.bounds[:2]
218
217
  resx, resy = _res_as_tuple(self.res)
219
218
 
220
- minxs = np.full(self.row_indices.shape, minx) + (minx * self.row_indices * resx)
221
- minys = np.full(self.col_indices.shape, miny) + (miny * self.col_indices * resy)
219
+ # work ourselves inwards from the bottom left and top right corners
220
+ minx, _, _, maxy = self.bounds
221
+ minxs = np.full(self.col_indices.shape, minx) + (self.col_indices * resx)
222
+ maxys = np.full(self.row_indices.shape, maxy) - (self.row_indices * resy)
222
223
  maxxs = minxs + resx
223
- maxys = minys + resy
224
+ minys = maxys - resy
224
225
 
225
226
  return GeoDataFrame(
226
227
  {
227
- column: self.results,
228
+ **(
229
+ {col: [x[i] for x in self.results] for i, col in enumerate(column)}
230
+ if not isinstance(column, str)
231
+ else {column: self.results}
232
+ ),
228
233
  "geometry": [
229
234
  box(minx, miny, maxx, maxy)
230
235
  for minx, miny, maxx, maxy in zip(
File without changes
File without changes
File without changes
File without changes
File without changes