ssb-sgis 1.1.7__tar.gz → 1.1.9__tar.gz

{ssb_sgis-1.1.7 → ssb_sgis-1.1.9}/PKG-INFO

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

{ssb_sgis-1.1.7 → ssb_sgis-1.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.1.7"
+version = "1.1.9"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"

{ssb_sgis-1.1.7 → ssb_sgis-1.1.9}/src/sgis/geopandas_tools/overlay.py

@@ -824,11 +824,14 @@ def make_valid_and_keep_geom_type(
     geoms = GeoSeries(geoms)
     geoms.index = range(len(geoms))
     geoms.loc[:] = make_valid(geoms.to_numpy())
-    geoms = geoms.explode(index_parts=False).pipe(to_single_geom_type, geom_type)
-    only_one = geoms.groupby(level=0).transform("size") == 1
-    one_hit = geoms[only_one]
-    many_hits = geoms[~only_one].groupby(level=0).agg(unary_union)
-    return pd.concat([one_hit, many_hits]).sort_index()
+    geoms_with_correct_type = geoms.explode(index_parts=False).pipe(
+        to_single_geom_type, geom_type
+    )
+    only_one = geoms_with_correct_type.groupby(level=0).transform("size") == 1
+    one_hit = geoms_with_correct_type[only_one]
+    many_hits = geoms_with_correct_type[~only_one].groupby(level=0).agg(unary_union)
+    geoms_with_wrong_type = geoms.loc[~geoms.index.isin(geoms_with_correct_type.index)]
+    return pd.concat([one_hit, many_hits, geoms_with_wrong_type]).sort_index()
 
 
 def _agg_geoms(g: np.ndarray, grid_size: int | float | None = None) -> Geometry:

{ssb_sgis-1.1.7 → ssb_sgis-1.1.9}/src/sgis/io/dapla_functions.py

@@ -128,7 +128,7 @@ def read_geopandas(
         return gpd.GeoDataFrame(
             _read_partitioned_parquet(
                 gcs_path,
-                read_func=_read_geopandas,
+                read_func=pq.read_table,
                 file_system=file_system,
                 mask=mask,
                 filters=filters,
@@ -145,7 +145,7 @@ def read_geopandas(
         read_func = gpd.read_file
 
     with file_system.open(gcs_path, mode="rb") as file:
-        df = _read_geopandas(
+        return _read_geopandas(
             file,
             read_func=read_func,
             file_format=file_format,
@@ -153,8 +153,6 @@ def read_geopandas(
             **kwargs,
         )
 
-    return df
-
 
 def _read_geopandas_from_iterable(
     paths, mask, file_system, use_threads, pandas_fallback, **kwargs
@@ -242,8 +240,13 @@ def _get_geo_metadata(file, file_system) -> dict:
     try:
         meta = pq.read_schema(file).metadata
     except FileNotFoundError:
-        with file_system.open(file, "rb") as f:
-            meta = pq.read_schema(f).metadata
+        try:
+            with file_system.open(file, "rb") as f:
+                meta = pq.read_schema(f).metadata
+        except Exception as e:
+            raise e.__class__(f"{file}: {e}") from e
+    except Exception as e:
+        raise e.__class__(f"{file}: {e}") from e
 
     return json.loads(meta[b"geo"])
 
@@ -763,21 +766,23 @@ def _read_partitioned_parquet(
 
     if results:
         if all(isinstance(x, DataFrame) for x in results):
-            results = pd.concat(results)
+            return pd.concat(results)
         else:
             geo_metadata = _get_geo_metadata(next(iter(child_paths)), file_system)
-            results = _arrow_to_geopandas(
+            return _arrow_to_geopandas(
                 pyarrow.concat_tables(
                     results,
                     promote_options="permissive",
                 ),
                 geo_metadata,
             )
-        return results
 
     # add columns to empty DataFrame
     first_path = next(iter(child_paths + [path]))
-    return pd.DataFrame(columns=_get_columns(first_path, file_system))
+    df = pd.DataFrame(columns=_get_columns(first_path, file_system))
+    if "columns" in kwargs:
+        return df[list(kwargs["columns"])]
+    return df
 
 
 def paths_are_equal(path1: Path | str, path2: Path | str) -> bool:

{ssb_sgis-1.1.7 → ssb_sgis-1.1.9}/src/sgis/maps/explore.py

@@ -646,6 +646,10 @@ class Explore(Map):
         else:
             self._create_continous_map()
 
+        if not self.map:
+            print("No data, no map")
+            return
+
         if self.out_path:
             with self.file_system.open(self.out_path, "w") as f:
                 f.write(self.map._repr_html_())

{ssb_sgis-1.1.7 → ssb_sgis-1.1.9}/src/sgis/maps/map.py

@@ -263,10 +263,6 @@ class Map:
                 self._gdfs[i][self.column] = to_string_via_int(gdf[self.column])
         self._gdf[self.column] = to_string_via_int(self._gdf[self.column])
 
-    # def __getattr__(self, attr: str) -> Any:
-    #     """Search for attribute in kwargs."""
-    #     return self.kwargs.get(attr, super().__getattribute__(attr))
-
     def __bool__(self) -> bool:
         """True of any gdfs with more than 0 rows."""
         return bool(len(self._gdfs) + len(self._gdf))