ssb-sgis 1.1.7__py3-none-any.whl → 1.1.9__py3-none-any.whl

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:

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:

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_())

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))

{ssb_sgis-1.1.7.dist-info → ssb_sgis-1.1.9.dist-info}/METADATA

@@ -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.dist-info → ssb_sgis-1.1.9.dist-info}/RECORD

@@ -13,7 +13,7 @@ sgis/geopandas_tools/general.py,sha256=UPtmgEMhTZw-qMiCCjeTtyBlJWoVE96SSanufPK8M
 sgis/geopandas_tools/geocoding.py,sha256=n47aFQMm4yX1MsPnTM4dFjwegCA1ZmGUDj1uyu7OJV4,691
 sgis/geopandas_tools/geometry_types.py,sha256=ijQDbQaZPqPGjBl707H4yooNXpk21RXyatI7itnvqLk,7603
 sgis/geopandas_tools/neighbors.py,sha256=vduQlHeoZjHyD5pxDbjfonQ3-LAHGfPETxV7-L6Sg4M,16634
-sgis/geopandas_tools/overlay.py,sha256=pfRSvHmX7GXkJDkpMQvNgS6LTF6DirzrEZCVPSHDUBs,25582
+sgis/geopandas_tools/overlay.py,sha256=pMQK86t0ixKErHQsP0HC8RXHUXNxDCNdH6FK1MEJamM,25779
 sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9hzbFYN42f9WY,6972
 sgis/geopandas_tools/polygon_operations.py,sha256=FJ-dXCxLHRsmp0oXsmBOFRprFFwmhrxqOPZkW2WWWQM,50088
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
@@ -21,15 +21,15 @@ sgis/geopandas_tools/sfilter.py,sha256=SLcMYprQwnY5DNo0R7TGXk4m6u26H8o4PRn-RPhme
 sgis/helpers.py,sha256=_h7ke9hJrRNhHW-ZX3gA95fOrX2s1ADKBMxc94p2F4Q,9627
 sgis/io/__init__.py,sha256=uyBr20YDqB2bQttrd5q1JuGOvX32A-MSvS7Wmw5f5qg,177
 sgis/io/_is_dapla.py,sha256=wmfkSe98IrLhUg3dtXZusV6OVC8VlY1kbc5EQDf3P-Q,358
-sgis/io/dapla_functions.py,sha256=JrMmgdFPgXYUDMCzZcWLv2NyDuzUjwxCkHUC8QiBazQ,30067
+sgis/io/dapla_functions.py,sha256=1jg-OOGRMceJO4b_r9NH9tNRuj3ve352rCec3hRrdAY,30287
 sgis/io/opener.py,sha256=HWO3G1NB6bpXKM94JadCD513vjat1o1TFjWGWzyVasg,898
 sgis/io/read_parquet.py,sha256=FvZYv1rLkUlrSaUY6QW6E1yntmntTeQuZ9ZRgCDO4IM,3776
 sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/maps/examine.py,sha256=Pb0dH8JazU5E2svfQrzHO1Bi-sjy5SeyY6zoeMO34jE,9369
-sgis/maps/explore.py,sha256=Vdt1-vFKWkJxL-odh3rn2YlKpWw6Ew0bu8U3KURThNc,47797
+sgis/maps/explore.py,sha256=ReML94ek49vkToXRK9vA_c5Zzg8O7n0GoeqyeuwaBpo,47879
 sgis/maps/httpserver.py,sha256=eCDoB9x74kSLiGEj2X3O91t3oscY_ia17UNuaaJ6tCc,2472
 sgis/maps/legend.py,sha256=lVRVCkhPmJRjGK23obFJZAO3qp6du1LYnobkkN7DPkc,26279
-sgis/maps/map.py,sha256=bvEQqHgdi8ZGQaKxIy1yIYVOKZ7sPIWo6zoWgo0IpwU,30570
+sgis/maps/map.py,sha256=vvdWSYZN9U0pbv6-l6l5xG3HUWj09fE4qloOe9fF8L8,30403
 sgis/maps/maps.py,sha256=gxu0rgcVygjudRtM1dVRmsUMilMUIg3vG-UgvASM91E,23072
 sgis/maps/norge_i_bilder.json,sha256=W_mFfte3DxugWbEudZ5fadZ2JeFYb0hyab2Quf4oJME,481311
 sgis/maps/thematicmap.py,sha256=w6q4_gIr8BubQgsPJkc6WXk-tmplDLGcKyjphhFp7ng,21873
@@ -59,7 +59,7 @@ 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.7.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.1.7.dist-info/METADATA,sha256=c-fXSCy0eK6NKycntm8iC0GpuM_J2xTnXcdTV8tnmzM,11740
-ssb_sgis-1.1.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.1.7.dist-info/RECORD,,
+ssb_sgis-1.1.9.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.1.9.dist-info/METADATA,sha256=BVkpmYvkcTxMKuyy6ixUsIRrasOpKsgYAMm2Y5qwM9o,11740
+ssb_sgis-1.1.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.1.9.dist-info/RECORD,,