ssb-sgis 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

sgis/raster/indices.py

@@ -1,11 +1,8 @@
 import numpy as np
 
 
-def ndvi(red: np.ndarray, nir: np.ndarray) -> np.ndarray:
-    red = red / 255
-    nir = nir / 255
-
-    ndvi_values = (nir - red) / (nir + red)
+def ndvi(red: np.ndarray, nir: np.ndarray, padding: int = 0) -> np.ndarray:
+    ndvi_values = (nir - red + padding) / (nir + red + padding)
     ndvi_values[(red + nir) == 0] = 0
 
     return ndvi_values

sgis/raster/regex.py

@@ -32,15 +32,20 @@ class _RegexError(ValueError):
     pass
 
 
-def _any_regex_matches(xml_file: str, regexes: tuple[str]) -> bool:
+def _any_regex_matches(xml_file: str, regexes: tuple[str]) -> bool | None:
+    n_matches = 0
     for regex in regexes:
         try:
             if bool(re.search(regex, xml_file)):
                 return True
+            n_matches += 1
         except (TypeError, AttributeError):
             continue
 
-    return False
+    if not n_matches:
+        return None
+    else:
+        return False
 
 
 def _get_regex_match_from_xml_in_local_dir(

sgis/raster/sentinel_config.py

@@ -1,24 +1,13 @@
-import re
-
 SENTINEL2_FILENAME_REGEX = r"""
     ^(?P<tile>T\d{2}[A-Z]{3})
     _(?P<date>\d{8})T\d{6}
-    _(?P<band>B[018][\dA])
+    _(?P<band>B[018][\dA]|SCL)
     (?:_(?P<resolution>\d+)m)?
     .*
     \..*$
 """
 
 
-SENTINEL2_CLOUD_FILENAME_REGEX = r"""
-    ^(?P<tile>T\d{2}[A-Z]{3})
-    _(?P<date>\d{8})T\d{6}
-    _(?P<band>SCL)
-    (?:_(?P<resolution>\d+)m)?
-    .*
-    \..*$
-"""
-
 SENTINEL2_IMAGE_REGEX = r"""
     ^(?P<mission_id>S2[AB])
     _MSI(?P<level>[A-Z]\d{1}[A-Z])
@@ -54,61 +43,6 @@ SENTINEL2_MOSAIC_IMAGE_REGEX = r"""
 """
 
 
-# multiple regex searches because there are different xml files with same info, but different naming
-CLOUD_COVERAGE_REGEXES: tuple[str] = (
-    r"<Cloud_Coverage_Assessment>([\d.]+)</Cloud_Coverage_Assessment>",
-    r"<CLOUDY_PIXEL_OVER_LAND_PERCENTAGE>([\d.]+)</CLOUDY_PIXEL_OVER_LAND_PERCENTAGE>",
-)
-
-BOA_QUANTIFICATION_VALUE_REGEXES: tuple[str] = (
-    r'<BOA_QUANTIFICATION_VALUE unit="none">(\d+)</BOA_QUANTIFICATION_VALUE>',
-)
-
-PROCESSING_BASELINE_REGEXES: tuple[str] = (
-    r"<PROCESSING_BASELINE>(.*?)</PROCESSING_BASELINE>",
-)
-
-
-CRS_REGEXES: tuple[str] = (r"<HORIZONTAL_CS_CODE>EPSG:(\d+)</HORIZONTAL_CS_CODE>",)
-
-BOUNDS_REGEXES: tuple[dict[str, str]] = (
-    {"minx": r"<ULX>(\d+)</ULX>", "maxy": r"<ULY>(\d+)</ULY>"},
-)
-BOUNDS_REGEXES: tuple[re.Pattern] = (
-    re.compile(r"<ULX>(?P<minx>\d+)</ULX>"),
-    re.compile(r"<ULY>(?P<maxy>\d+)</ULY>"),
-    # )
-    # SHAPE_PATTERNS: tuple[re.Pattern] = (
-    re.compile(
-        r'<Size resolution="(?P<resolution>\d+)">\s*<NROWS>(?P<nrows>\d+)</NROWS>\s*<NCOLS>(?P<ncols>\d+)</NCOLS>\s*</Size>'
-    ),
-    re.compile(
-        r"<Cloud_Coverage_Assessment>(?P<cloud_coverage_percentage>[\d.]+)</Cloud_Coverage_Assessment>"
-    ),
-    re.compile(
-        r"<CLOUDY_PIXEL_OVER_LAND_PERCENTAGE>(?P<cloud_coverage_percentage>[\d.]+)</CLOUDY_PIXEL_OVER_LAND_PERCENTAGE>"
-    ),
-)
-
-SENTINEL2_L2A_BANDS = {
-    "B01": 60,
-    "B02": 10,
-    "B03": 10,
-    "B04": 10,
-    "B05": 20,
-    "B06": 20,
-    "B07": 20,
-    "B08": 10,
-    "B8A": 20,
-    "B09": 60,
-    "B11": 20,
-    "B12": 20,
-}
-SENTINEL2_L1C_BANDS = SENTINEL2_L2A_BANDS | {"B10": 60}
-SENTINEL2_CLOUD_BANDS = {
-    "SCL": 20,  # SCL: scene classification
-}
-
 SENTINEL2_SCL_CLASSES = {
     0: "No Data (Missing data)",  # 000000
     1: "Saturated or defective pixel",  # ff0000
@@ -123,7 +57,3 @@ SENTINEL2_SCL_CLASSES = {
     10: "Thin cirrus",  # 64c8ff
     11: "Snow or ice",  # ff96ff
 }
-
-SENTINEL2_BANDS = SENTINEL2_L1C_BANDS | SENTINEL2_CLOUD_BANDS
-SENTINEL2_RBG_BANDS = ["B02", "B03", "B04"]
-SENTINEL2_NDVI_BANDS = ["B04", "B08"]

{ssb_sgis-1.0.6.dist-info → ssb_sgis-1.0.8.dist-info}/METADATA

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

{ssb_sgis-1.0.6.dist-info → ssb_sgis-1.0.8.dist-info}/RECORD

@@ -17,20 +17,20 @@ sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9h
 sgis/geopandas_tools/polygon_operations.py,sha256=FJ-dXCxLHRsmp0oXsmBOFRprFFwmhrxqOPZkW2WWWQM,50088
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
 sgis/geopandas_tools/sfilter.py,sha256=SLcMYprQwnY5DNo0R7TGXk4m6u26H8o4PRn-RPhmeZY,9345
-sgis/helpers.py,sha256=dscvGAbZyyncZbTL9qdsAHN6tb_T7SbNH7vM4ZrTeJw,8326
+sgis/helpers.py,sha256=3NqPfVBKlZcZTiMJrsTAlDv5tNKDHrJr_8NimutVzQg,8797
 sgis/io/_is_dapla.py,sha256=o_qFD5GOi3dsSGOKmW6R8wZU0htVwFgRbGX7ppJCqT4,431
 sgis/io/dapla_functions.py,sha256=8dfxBtkGUy7vltlKydXkathBsSd9DPHVIDIOe-Ctjsg,18180
 sgis/io/opener.py,sha256=BHyH7L8Ubh9C4Lsb8eBzGI6FLWg8UQFu-1bg3NEy_2k,862
 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=QEzJ9Qb5rCGS9TVGG8vZsIdVwVPAngeUvwJG2igoEio,46215
+sgis/maps/explore.py,sha256=mbSKFynLklJ3g4YfZJMDUo4K7Lg3sDoXDtnJ0l4L51w,45533
 sgis/maps/httpserver.py,sha256=7Od9JMCtntcIQKk_TchetojMHzFHT9sPw7GANahI97c,1982
 sgis/maps/legend.py,sha256=1ZOhzftq1HRKlHphhfqUm82U-Kjx_xkACieLRevxke8,26232
-sgis/maps/map.py,sha256=B5VfOdzp4xadNWbNJzHJueIfcrZYGthrM0CnSPedyUs,29392
+sgis/maps/map.py,sha256=4znVxefW2wVe_LSmGAVcJQxf3oF_6aAyppNo4EyYJH4,29431
 sgis/maps/maps.py,sha256=HbKG1OHkSFYZ2dpgpag6H-LY1tOtZKaZncNNrBQpkU4,23127
 sgis/maps/thematicmap.py,sha256=bFlZy2xSKmEOHhvM0d1pv8O9JuNjR3P_9colTJnduvE,20729
-sgis/maps/tilesources.py,sha256=aSci-0JURxnqqirIXQS5bHfNEIg3xfCM_B4gXs7GslM,2772
+sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
 sgis/networkanalysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/networkanalysis/_get_route.py,sha256=9I3t9pnccUPr4mozy3TJCOpGCCf3UOIojmsbifubZbA,6368
 sgis/networkanalysis/_od_cost_matrix.py,sha256=zkyPX7ObT996ahaFJ2oI0D0SqQWbWyfy_qLtXwValPg,3434
@@ -48,13 +48,13 @@ sgis/networkanalysis/traveling_salesman.py,sha256=Jjo6bHY4KJ-eK0LycyTy0sWxZjgITs
 sgis/parallel/parallel.py,sha256=SlC_mOwvSSyWTKUcxLMGkuWHUkEC6dXTlN0Jn5cAtxA,39687
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sgis/raster/base.py,sha256=8J6y9k-YuCAUpE83yTkg26RF2YCp9aieVvWrPi_GfUc,7697
-sgis/raster/image_collection.py,sha256=uRQ_0qimViSY0O29fP0aa1M6Z-KPjIyAZKy4W2K_65I,105123
-sgis/raster/indices.py,sha256=OoFb53xcBm-9CZIvvydFWFgrenJ_lgt25yVo-imCrSM,226
-sgis/raster/regex.py,sha256=6zhOgUFkXQv05nXBdTkkk6jdPuiIQCUgkTHBwYeE-zA,3637
-sgis/raster/sentinel_config.py,sha256=-vYglbUouMkmH3wiGTL9MVSKTIrWHQcZYjKqtXNIuQo,3255
+sgis/raster/base.py,sha256=Bdd30DS0iIv7fo93vrFoEBGC7a5PFaBXT46fcHwgORY,6558
+sgis/raster/image_collection.py,sha256=XrQddJgpP-R0KeLEWeqsOBOaMExA9lCt0_5rR7tXku8,118307
+sgis/raster/indices.py,sha256=-J1HYmnT240iozvgagvyis6K0_GHZHRuUrPOgyoeIrY,223
+sgis/raster/regex.py,sha256=I7pTAYNoOFgcPRLllR4jGMhmRk8AkOgm1D38fDSFnlg,3745
+sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=st2mWiUcdxeEiHBOZSgFOnVcP6pc4EMPJBPw537Z4V8,3837
-ssb_sgis-1.0.6.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.0.6.dist-info/METADATA,sha256=CmI9NHsFRCPUKajae6dAu2EFmacFxYSeVKCa1K9sgqw,11772
-ssb_sgis-1.0.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.0.6.dist-info/RECORD,,
+ssb_sgis-1.0.8.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.0.8.dist-info/METADATA,sha256=9Q_QyG0VOQAy9uhAi1kX64dVgb6AJ2xWwG91B_r_Nxo,11772
+ssb_sgis-1.0.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.0.8.dist-info/RECORD,,