ssb-sgis 1.2.13__py3-none-any.whl → 1.2.14__py3-none-any.whl

sgis/maps/legend.py

@@ -330,6 +330,8 @@ class Legend:
             framealpha=self.framealpha,
             edgecolor=self.edgecolor,
             labelspacing=self.labelspacing,
+            facecolor=self.facecolor,
+            labelcolor=self.labelcolor,
             **self.kwargs,
         )
 
@@ -344,16 +346,22 @@ class Legend:
         minx, miny, maxx, maxy = gdf.total_bounds
         diffx = maxx - minx
         diffy = maxy - miny
-
+        if diffx > 10000 and diffy > 10000:
+            gridsize = (diffy + diffx) // 1000
+        if diffx > 1000 and diffy > 1000:
+            gridsize = (diffy + diffx) // 100
+        if diffx > 100 and diffy > 100:
+            gridsize = (diffy + diffx) // 10
+        else:
+            gridsize = 30
         points = pd.concat(
             [
-                points_in_bounds(gdf, 30),
+                points_in_bounds(gdf, gridsize),
                 bounds_to_points(gdf)
                 .geometry.explode(ignore_index=True)
                 .to_frame("geometry"),
             ]
         )
-
         gdf = gdf.loc[:, ~gdf.columns.str.contains("index|level_")]
         joined = points.sjoin_nearest(gdf, distance_col="nearest")
 

sgis/maps/thematicmap.py

@@ -253,18 +253,13 @@ class ThematicMap(Map):
         self._dark = self._dark or black
 
         if not self.cmap and not self._is_categorical:
-            self._choose_cmap()
+            self._choose_cmap(**kwargs)
 
         if not legend:
             self.legend = None
         else:
             self._create_legend()
 
-        self._dark_or_light()
-
-        if cmap:
-            self._cmap = cmap
-
         new_kwargs = {}
         for key, value in self.kwargs.items():
             if key not in MAP_KWARGS:
@@ -286,6 +281,11 @@ class ThematicMap(Map):
                 except Exception:
                     setattr(self.legend, f"_{key}", value)
 
+        self._dark_or_light()
+
+        if cmap:
+            self._cmap = cmap
+
         self.bounds = (
             to_bbox(bounds) if bounds is not None else to_bbox(self._gdf.total_bounds)
         )
@@ -589,16 +589,16 @@ class ThematicMap(Map):
         else:
             self.legend = ContinousLegend(title=self._column, size=self._size)
 
-    def _choose_cmap(self) -> None:
+    def _choose_cmap(self, **kwargs) -> None:
         """Kwargs is to catch start and stop points for the cmap in __init__."""
         if self._dark:
             self._cmap = "viridis"
-            self.cmap_start = 0
-            self.cmap_stop = 256
+            self.cmap_start = self.kwargs.pop("cmap_start", 0)
+            self.cmap_stop = self.kwargs.pop("cmap_stop", 256)
         else:
             self._cmap = "RdPu"
-            self.cmap_start = 23
-            self.cmap_stop = 256
+            self.cmap_start = self.kwargs.pop("cmap_start", 23)
+            self.cmap_stop = self.kwargs.pop("cmap_stop", 256)
 
     def _make_bin_value_dict(self, gdf: GeoDataFrame, classified: np.ndarray) -> dict:
         """Dict with unique values of all bins. Used in labels in ContinousLegend."""
@@ -609,8 +609,6 @@ class ThematicMap(Map):
         return bins_unique_values
 
     def _actually_add_background(self) -> None:
-        # self.ax.set_xlim([self.minx - self.diffx * 0.03, self.maxx + self.diffx * 0.03])
-        # self.ax.set_ylim([self.miny - self.diffy * 0.03, self.maxy + self.diffy * 0.03])
         self._background_gdfs.plot(
             ax=self.ax, color=self.bg_gdf_color, **self.bg_gdf_kwargs
         )
@@ -632,13 +630,14 @@ class ThematicMap(Map):
             )
             self.nan_color = "#666666" if self._nan_color_was_none else self.nan_color
             if not self._is_categorical:
-                self.change_cmap("viridis")
+                self._cmap = self.kwargs.get("cmap", "viridis")
 
             if self.legend is not None:
                 for key, color in {
                     "facecolor": "#0f0f0f",
                     "labelcolor": "#fefefe",
                     "title_color": "#fefefe",
+                    "edgecolor": "#0f0f0f",
                 }.items():
                     setattr(self.legend, key, color)
 
@@ -650,13 +649,14 @@ class ThematicMap(Map):
             )
             self.nan_color = "#c2c2c2" if self._nan_color_was_none else self.nan_color
             if not self._is_categorical:
-                self.change_cmap("RdPu", start=23)
+                self._cmap = self.kwargs.get("cmap", "RdPu")
 
             if self.legend is not None:
                 for key, color in {
                     "facecolor": "#fefefe",
                     "labelcolor": "#0f0f0f",
                     "title_color": "#0f0f0f",
+                    "edgecolor": "#0f0f0f",
                 }.items():
                     setattr(self.legend, key, color)
 

sgis/networkanalysis/_get_route.py

@@ -2,6 +2,7 @@ import warnings
 
 import joblib
 import pandas as pd
+import shapely
 from geopandas import GeoDataFrame
 from igraph import Graph
 from pandas import DataFrame
@@ -116,8 +117,8 @@ def _get_route(
     results: DataFrame = pd.concat(resultlist)
     assert list(results.columns) == ["origin", "destination"], list(results.columns)
     lines: GeoDataFrame = _get_line_geometries(results, roads, weight)
+    lines.geometry = shapely.force_2d(lines.geometry)
     lines = lines.dissolve(by=["origin", "destination"], aggfunc="sum", as_index=False)
-
     return lines[["origin", "destination", weight, "geometry"]]
 
 

sgis/networkanalysis/_service_area.py

@@ -129,10 +129,12 @@ def _service_area(
 
             service_areas.append(edges_within)
 
-    return pd.concat(
+    service_areas = pd.concat(
         service_areas,
         ignore_index=True,
     )
+    service_areas.geometry = force_2d(service_areas.geometry)
+    return service_areas
 
 
 def _part_of_edge_within(distance_df, nodes_within_break, directed):

sgis/networkanalysis/networkanalysis.py

@@ -17,6 +17,7 @@ from geopandas import GeoDataFrame
 from igraph import Graph
 from pandas import DataFrame
 from pandas import MultiIndex
+from shapely import force_2d
 
 from ..geopandas_tools.general import _push_geom_col
 from ._get_route import _get_k_routes
@@ -34,9 +35,20 @@ from .networkanalysisrules import NetworkAnalysisRules
 class NetworkAnalysis:
     """Class for doing network analysis.
 
-    The class takes a GeoDataFrame of line geometries and rules for the analyses,
-    and holds methods for doing network analysis based on GeoDataFrames of origin
-    and destination points.
+    Args:
+        network: A GeoDataFrame of line geometries.
+        rules: The rules for the analysis, either as an instance of
+            NetworkAnalysisRules or a dictionary with the parameters
+            as keys.
+        log: If True (default), a DataFrame with information about each
+            analysis run will be stored in the 'log' attribute.
+        detailed_log: If True, the log DataFrame will include columns for
+            all arguments passed to the analysis method, plus standard deviation and
+            percentiles (25th, 50th, 75th) of the weight column in the results.
+            Defaults to False.
+
+    The class implements methods for doing network analysis based on
+    GeoDataFrames of origin and destination points.
 
     The 'od_cost_matrix' method is the fastest, and returns a DataFrame with only
     indices and travel costs between each origin-destination pair.
@@ -96,21 +108,7 @@ class NetworkAnalysis:
         log: bool = True,
         detailed_log: bool = False,
     ) -> None:
-        """Initialise NetworkAnalysis instance.
-
-        Args:
-            network: A GeoDataFrame of line geometries.
-            rules: The rules for the analysis, either as an instance of
-                NetworkAnalysisRules or a dictionary with the parameters
-                as keys.
-            log: If True (default), a DataFrame with information about each
-                analysis run will be stored in the 'log' attribute.
-            detailed_log: If True, the log DataFrame will include columns for
-                all arguments passed to the analysis method, plus standard deviation and
-                percentiles (25th, 50th, 75th) of the weight column in the results.
-                Defaults to False.
-
-        """
+        """Initialise NetworkAnalysis instance."""
         if not isinstance(rules, NetworkAnalysisRules):
             rules = NetworkAnalysisRules(**rules)
 
@@ -647,6 +645,8 @@ class NetworkAnalysis:
             frequency_col
         )
 
+        results.geometry = force_2d(results.geometry)
+
         if self.rules.split_lines:
             self._unsplit_network()
 

{ssb_sgis-1.2.13.dist-info → ssb_sgis-1.2.14.dist-info}/METADATA

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

{ssb_sgis-1.2.13.dist-info → ssb_sgis-1.2.14.dist-info}/RECORD

@@ -30,24 +30,24 @@ sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/maps/examine.py,sha256=69nPtMChKmso7Yy8X--UoTWJjKmjMF1VHsdLpPKFbA0,9233
 sgis/maps/explore.py,sha256=ANbhScthhwznLEUDDjRUBmniGmkdF9zftbzp9dYHu-U,48210
 sgis/maps/httpserver.py,sha256=I7tTn3hFaTCc-E-T_o9v0nXwMGaS2Xqd4MlWbq8k-J4,3014
-sgis/maps/legend.py,sha256=qq2RkebuaNAdFztlXrDOWbN0voeK5w5VycmRKyx0NdM,26512
+sgis/maps/legend.py,sha256=6L6KspAoYuQbOcs-0vWzMDEL_9qvmGuRR7VIL1wsBMI,26898
 sgis/maps/map.py,sha256=07YK_oHa2z_yw_es06pd-80dV8YTI5mkTyJxyud707Y,30758
 sgis/maps/maps.py,sha256=fLK5WUlQ2YTm7t-8260lYxCFvpZN6j0Y-bVYCyv8NAY,23249
 sgis/maps/norge_i_bilder.json,sha256=G9DIN_2vyn-18UF5wUC-koZxFCbiNxMu0BbCJhMFJUk,15050340
-sgis/maps/thematicmap.py,sha256=Z3o_Bca0oty5Cn35pZfX5Qy52sXDVIMVSFD6IlZrovo,25111
+sgis/maps/thematicmap.py,sha256=ZtV4Hfylr1ST_cPzi11_lFIsTdY3D1o1EZQbPXZLwyM,25187
 sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
 sgis/maps/wms.py,sha256=3ZPf-H3sirvHeLQdXGwE3j6w1sFQCkExsEWkvHl7a4g,11233
 sgis/networkanalysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sgis/networkanalysis/_get_route.py,sha256=dMX4Vm6O90ISIZPjQWuZMVMuEubkeSdC2osMCbFvrRU,7750
+sgis/networkanalysis/_get_route.py,sha256=3m5xQdQqGtt51vcI5fcmYQAOQCeBtL6sorDoPxBNf84,7818
 sgis/networkanalysis/_od_cost_matrix.py,sha256=zkyPX7ObT996ahaFJ2oI0D0SqQWbWyfy_qLtXwValPg,3434
 sgis/networkanalysis/_points.py,sha256=128QEepBGAyI5XakMUVvNyOnJE0Ts7hvGiVUt1YTXiU,4439
-sgis/networkanalysis/_service_area.py,sha256=jE0X54yS4eMfZYJXeKe_NgMKPDpau-05xWZaxDi_c6Y,5546
+sgis/networkanalysis/_service_area.py,sha256=-xSdiZrZ3uqAhd4ZaBY8a8fMJjN09MPoYxlVMXm3UZk,5642
 sgis/networkanalysis/closing_network_holes.py,sha256=FYZ677nRwLmDkP6bQ1ssQ_h29RzAG463U4xmbu5ksfg,14572
 sgis/networkanalysis/cutting_lines.py,sha256=ZQAt0cufaPeNAEqUzp-imu26AIL9S5-lw6Xifa8RoWk,9818
 sgis/networkanalysis/directednetwork.py,sha256=Mrc2zHip4P5RNxnyffKm-xU832AVQeSHz-YZueAc0pM,11413
 sgis/networkanalysis/finding_isolated_networks.py,sha256=Wg4ILhm7uS9RLOGcL0WN8uZBMJYjdljJc8L5DU5nIPY,3754
 sgis/networkanalysis/network.py,sha256=zV9bAbVdTgTohg2o2RFGy2uhOJrd3Ma57hwIAStxMAQ,7847
-sgis/networkanalysis/networkanalysis.py,sha256=KkmMt_AH4iRBGe2acNbhABVpyDV8FP_O5TKnDoZFLpM,68692
+sgis/networkanalysis/networkanalysis.py,sha256=P2kqE1kBxabBnv4h6ort1IiO4W0XlsJn5DrT7IbeG5w,68651
 sgis/networkanalysis/networkanalysisrules.py,sha256=9sXigaCzvKhXFwpeVNMtOiIK3_Hzp9yDpFklmEEAPak,12956
 sgis/networkanalysis/nodes.py,sha256=atFSpqz-_uJHMrf6MC0zhrrcWIydRMFZrsaHC2xr1GU,3374
 sgis/networkanalysis/traveling_salesman.py,sha256=Jjo6bHY4KJ-eK0LycyTy0sWxZjgITs5MBllZ_G9FhTE,5655
@@ -61,7 +61,7 @@ sgis/raster/indices.py,sha256=efJmgfPg_VuSzXFosXV661IendF8CwPFWtMhyP4TMUg,222
 sgis/raster/regex.py,sha256=4idTJ9vFtsGtbxcjJrx2VrpJJuDMP3bLdqF93Vc_cmY,3752
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.2.13.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.2.13.dist-info/METADATA,sha256=gMENChDEpgyyDfQrbE7uPqXy1t59IHXmUMX8_ZIMt2Q,11741
-ssb_sgis-1.2.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.2.13.dist-info/RECORD,,
+ssb_sgis-1.2.14.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.2.14.dist-info/METADATA,sha256=Hhvwb5ydmsvVBuINCUdiElVrH2SZaZ-XThmYG_rtGA4,11741
+ssb_sgis-1.2.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.2.14.dist-info/RECORD,,