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

sgis/geopandas_tools/duplicates.py

@@ -164,6 +164,8 @@ def update_geometries(
 
     copied.index = copied.index.map(index_mapper)
 
+    copied = make_all_singlepart(copied)
+
     # TODO check why polygons dissappear in rare cases. For now, just add back the missing
     dissapeared = sfilter_inverse(gdf, copied.buffer(-PRECISION))
     copied = pd.concat([copied, dissapeared])

sgis/io/dapla_functions.py

@@ -99,12 +99,14 @@ def read_geopandas(
             **kwargs,
         )
 
-    if (
+    single_eq_filter = (
         isinstance(filters, Iterable)
         and len(filters) == 1
         and ("=" in next(iter(filters)) or "==" in next(iter(filters)))
-    ):
-        # try to read only files in the relevant partition, because glob is slow without GCSFileSystem
+    )
+    # try to read files in subfolder path / "column=value"
+    # because glob is slow without GCSFileSystem from the root partition
+    if single_eq_filter:
         try:
             expression = "".join(next(iter(filters))).replace("==", "=")
             glob_func = _get_glob(file_system)

sgis/maps/map.py

@@ -128,6 +128,8 @@ class Map:
             categorical: Set to True to convert 'column' to string values.
             **kwargs: Arbitrary keyword arguments.
         """
+        self.kwargs = {}
+
         gdfs, column, kwargs = self._separate_args(gdfs, column, kwargs)
 
         self._column = column
@@ -175,7 +177,6 @@ class Map:
         self.labels = new_labels
 
         # pop all geometry-like items from kwargs into self._gdfs
-        self.kwargs = {}
         i = 0
         for key, value in kwargs.items():
             try:
@@ -237,8 +238,8 @@ class Map:
             self._gdf = pd.concat(self._gdfs, ignore_index=True)
 
         self._nan_idx = self._gdf[self._column].isna()
-        self._get_unique_values()
         self._to_categorical()
+        self._get_unique_values()
 
     def _to_categorical(self):
         if not (self._is_categorical and self.column is not None):
@@ -262,9 +263,9 @@ 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 __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."""
@@ -554,12 +555,6 @@ class Map:
         )
         n = n + maybe_area + maybe_length
 
-        if n == 0:
-            raise ValueError(
-                f"The column {self._column!r} is not present in any "
-                "of the passed GeoDataFrames."
-            )
-
     def _check_if_categorical(self) -> bool:
         """Quite messy this..."""
         if not self._column or not self._gdfs:

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

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

{ssb_sgis-1.1.6.dist-info → ssb_sgis-1.1.7.dist-info}/RECORD

@@ -8,7 +8,7 @@ sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=t9GJqRMDsHEU74RIlqeMr4QBg
 sgis/geopandas_tools/centerlines.py,sha256=Q65Sx01SeAlulBEd9oaZkB2maBBNdLcJwAbTILg4SPU,11848
 sgis/geopandas_tools/cleaning.py,sha256=0j7_bfuAjWVBUImbPTXuwNdYRJ_By6HAwaOdw5Dh4vc,24315
 sgis/geopandas_tools/conversion.py,sha256=o3QJZLfaqqpJNdWWNKfQn_dS77uJxxRxWZxhf18vPXs,25505
-sgis/geopandas_tools/duplicates.py,sha256=MTduclsUZlYifFsc7g9KOJyh6P4EkixZlcZmFH-bgYo,14926
+sgis/geopandas_tools/duplicates.py,sha256=p9OCYWtwkWE7i-kZX_dRqAiczsUoWEWl5I8GeYIjQOM,14968
 sgis/geopandas_tools/general.py,sha256=UPtmgEMhTZw-qMiCCjeTtyBlJWoVE96SSanufPK8MLs,39976
 sgis/geopandas_tools/geocoding.py,sha256=n47aFQMm4yX1MsPnTM4dFjwegCA1ZmGUDj1uyu7OJV4,691
 sgis/geopandas_tools/geometry_types.py,sha256=ijQDbQaZPqPGjBl707H4yooNXpk21RXyatI7itnvqLk,7603
@@ -21,7 +21,7 @@ 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=bhdOw12qIZqKYn8TXPaDcvEOGZYhwv8VE62ESZmv7bM,29998
+sgis/io/dapla_functions.py,sha256=JrMmgdFPgXYUDMCzZcWLv2NyDuzUjwxCkHUC8QiBazQ,30067
 sgis/io/opener.py,sha256=HWO3G1NB6bpXKM94JadCD513vjat1o1TFjWGWzyVasg,898
 sgis/io/read_parquet.py,sha256=FvZYv1rLkUlrSaUY6QW6E1yntmntTeQuZ9ZRgCDO4IM,3776
 sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,7 +29,7 @@ sgis/maps/examine.py,sha256=Pb0dH8JazU5E2svfQrzHO1Bi-sjy5SeyY6zoeMO34jE,9369
 sgis/maps/explore.py,sha256=Vdt1-vFKWkJxL-odh3rn2YlKpWw6Ew0bu8U3KURThNc,47797
 sgis/maps/httpserver.py,sha256=eCDoB9x74kSLiGEj2X3O91t3oscY_ia17UNuaaJ6tCc,2472
 sgis/maps/legend.py,sha256=lVRVCkhPmJRjGK23obFJZAO3qp6du1LYnobkkN7DPkc,26279
-sgis/maps/map.py,sha256=S2SrOCbVesS8Y5KlziGCmCi85_LIumL8CH8z4MdOEXc,30744
+sgis/maps/map.py,sha256=bvEQqHgdi8ZGQaKxIy1yIYVOKZ7sPIWo6zoWgo0IpwU,30570
 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.6.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.1.6.dist-info/METADATA,sha256=hKTyyKXLiExr5vbMEoiz4F2BHEz-ktdKu58Eu1Ck8kg,11740
-ssb_sgis-1.1.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.1.6.dist-info/RECORD,,
+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,,