eodash_catalog 0.0.13__py3-none-any.whl → 0.0.15__py3-none-any.whl

eodash_catalog/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Daniel Santillan <daniel.santillan@eox.at>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.13"
+__version__ = "0.0.15"

eodash_catalog/endpoints.py

@@ -10,19 +10,21 @@ from operator import itemgetter
 
 import requests
 from dateutil import parser
-from pystac import Catalog, Collection, Item, Link, SpatialExtent, Summaries
+from pystac import Asset, Catalog, Collection, Item, Link, SpatialExtent, Summaries
 from pystac_client import Client
 
 from eodash_catalog.sh_endpoint import get_SH_token
 from eodash_catalog.stac_handling import (
     add_collection_information,
     add_example_info,
+    add_projection_info,
     get_collection_times_from_config,
     get_or_create_collection,
 )
 from eodash_catalog.thumbnails import generate_thumbnail
 from eodash_catalog.utils import (
     Options,
+    create_geojson_from_bbox,
     create_geojson_point,
     generate_veda_cog_link,
     retrieveExtentFromWMSWMTS,
@@ -104,29 +106,17 @@ def handle_STAC_based_endpoint(
             catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
         )
         for location in collection_config["Locations"]:
-            if "FilterDates" in location:
-                collection = process_STACAPI_Endpoint(
-                    catalog_config=catalog_config,
-                    endpoint_config=endpoint_config,
-                    collection_config=collection_config,
-                    catalog=catalog,
-                    options=options,
-                    headers=headers,
-                    bbox=",".join(map(str, location["Bbox"])),
-                    filter_dates=location["FilterDates"],
-                    root_collection=root_collection,
-                )
-            else:
-                collection = process_STACAPI_Endpoint(
-                    catalog_config=catalog_config,
-                    endpoint_config=endpoint_config,
-                    collection_config=collection_config,
-                    catalog=catalog,
-                    options=options,
-                    headers=headers,
-                    bbox=",".join(map(str, location["Bbox"])),
-                    root_collection=root_collection,
-                )
+            collection = process_STACAPI_Endpoint(
+                catalog_config=catalog_config,
+                endpoint_config=endpoint_config,
+                collection_config=collection_config,
+                catalog=catalog,
+                options=options,
+                headers=headers,
+                filter_dates=location.get("FilterDates"),
+                bbox=",".join(map(str, location["Bbox"])),
+                root_collection=root_collection,
+            )
             # Update identifier to use location as well as title
             # TODO: should we use the name as id? it provides much more
             # information in the clients
@@ -157,25 +147,18 @@ def handle_STAC_based_endpoint(
             if isinstance(c_child, Collection):
                 root_collection.extent.spatial.bboxes.append(c_child.extent.spatial.bboxes[0])
     else:
+        bbox = None
         if "Bbox" in endpoint_config:
-            root_collection = process_STACAPI_Endpoint(
-                catalog_config=catalog_config,
-                endpoint_config=endpoint_config,
-                collection_config=collection_config,
-                catalog=catalog,
-                options=options,
-                headers=headers,
-                bbox=",".join(map(str, endpoint_config["Bbox"])),
-            )
-        else:
-            root_collection = process_STACAPI_Endpoint(
-                catalog_config=catalog_config,
-                endpoint_config=endpoint_config,
-                collection_config=collection_config,
-                catalog=catalog,
-                options=options,
-                headers=headers,
-            )
+            bbox = ",".join(map(str, endpoint_config["Bbox"]))
+        root_collection = process_STACAPI_Endpoint(
+            catalog_config=catalog_config,
+            endpoint_config=endpoint_config,
+            collection_config=collection_config,
+            catalog=catalog,
+            options=options,
+            headers=headers,
+            bbox=bbox,
+        )
 
     add_example_info(root_collection, collection_config, endpoint_config, catalog_config)
     return root_collection
@@ -197,6 +180,12 @@ def process_STACAPI_Endpoint(
     collection = get_or_create_collection(
         catalog, endpoint_config["CollectionId"], collection_config, catalog_config, endpoint_config
     )
+    datetime_query = ["1900-01-01T00:00:00Z", "3000-01-01T00:00:00Z"]
+    if query := endpoint_config.get("Query"):
+        if start := query.get("Start"):
+            datetime_query[0] = start
+        if end := query.get("End"):
+            datetime_query[1] = end
 
     api = Client.open(endpoint_config["EndPoint"], headers=headers)
     if bbox is None:
@@ -204,7 +193,7 @@ def process_STACAPI_Endpoint(
     results = api.search(
         collections=[endpoint_config["CollectionId"]],
         bbox=bbox,
-        datetime=["1900-01-01T00:00:00Z", "3000-01-01T00:00:00Z"],
+        datetime=datetime_query,  # type: ignore
     )
     # We keep track of potential duplicate times in this list
     added_times = {}
@@ -263,7 +252,10 @@ def process_STACAPI_Endpoint(
         else:
             link.extra_fields["start_datetime"] = item.properties["start_datetime"]
             link.extra_fields["end_datetime"] = item.properties["end_datetime"]
-
+        add_projection_info(
+            endpoint_config,
+            item,
+        )
     collection.update_extent_from_items()
 
     # replace SH identifier with catalog identifier
@@ -346,6 +338,7 @@ def handle_SH_WMS_endpoint(
                         "https://stac-extensions.github.io/web-map-links/v1.1.0/schema.json",
                     ],
                 )
+                add_projection_info(endpoint_config, item)
                 add_visualization_info(item, collection_config, endpoint_config, time=time)
                 item_link = collection.add_item(item)
                 item_link.extra_fields["datetime"] = time
@@ -529,6 +522,7 @@ def handle_WMS_endpoint(
                     "https://stac-extensions.github.io/web-map-links/v1.1.0/schema.json",
                 ],
             )
+            add_projection_info(endpoint_config, item)
             add_visualization_info(item, collection_config, endpoint_config, time=t)
             link = collection.add_item(item)
             link.extra_fields["datetime"] = t
@@ -557,7 +551,7 @@ def generate_veda_tiles_link(endpoint_config: dict, item: str | None) -> str:
     if "NoData" in endpoint_config:
         no_data = "&no_data={}".format(endpoint_config["NoData"])
     item = f"&item={item}" if item else ""
-    target_url = f"https://staging-raster.delta-backend.com/stac/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{collection}{item}{assets}{color_formula}{no_data}"
+    target_url = f"https://openveda.cloud/stac/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{collection}{item}{assets}{color_formula}{no_data}"
     return target_url
 
 
@@ -644,7 +638,10 @@ def add_visualization_info(
             if "Rescale" in endpoint_config:
                 vmin = endpoint_config["Rescale"][0]
                 vmax = endpoint_config["Rescale"][1]
-            crs = endpoint_config.get("Crs", "EPSG:3857")
+            # depending on numerical input only
+            data_projection = endpoint_config.get("DataProjection", 3857)
+            epsg_prefix = "" if "EPSG:" in data_projection else "EPSG:"
+            crs = f"{epsg_prefix}{data_projection}"
             target_url = (
                 "{}/tiles/{}/{}/{{z}}/{{y}}/{{x}}" "?crs={}&time={{time}}&vmin={}&vmax={}&cbar={}"
             ).format(
@@ -764,3 +761,60 @@ def handle_custom_endpoint(
         collection_config,
     )
     return collection
+
+
+def handle_raw_source(
+    catalog_config: dict,
+    endpoint_config: dict,
+    collection_config: dict,
+    catalog: Catalog,
+) -> Collection:
+    collection = get_or_create_collection(
+        catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
+    )
+    if len(endpoint_config.get("TimeEntries", [])) > 0:
+        for time_entry in endpoint_config["TimeEntries"]:
+            assets = {}
+            media_type = "application/geo+json"
+            style_type = "text/vector-styles"
+            if endpoint_config["Name"] == "COG source":
+                style_type = "text/cog-styles"
+                media_type = "image/tiff"
+            for a in time_entry["Assets"]:
+                asset = Asset(
+                    href=a["File"], roles=["data"], media_type=media_type, extra_fields={}
+                )
+                add_projection_info(endpoint_config, asset)
+                assets[a["Identifier"]] = asset
+            bbox = endpoint_config.get("Bbox", [-180, -85, 180, 85])
+            item = Item(
+                id=time_entry["Time"],
+                bbox=bbox,
+                properties={},
+                geometry=create_geojson_from_bbox(bbox),
+                datetime=parser.isoparse(time_entry["Time"]),
+                assets=assets,
+                extra_fields={},
+            )
+            add_projection_info(
+                endpoint_config,
+                item,
+            )
+            if ep_st := endpoint_config.get("Style"):
+                style_link = Link(
+                    rel="style",
+                    target=ep_st
+                    if ep_st.startswith("http")
+                    else f"{catalog_config['assets_endpoint']}/{ep_st}",
+                    media_type=style_type,
+                    extra_fields={
+                        "asset:keys": list(assets),
+                    },
+                )
+                item.add_link(style_link)
+            link = collection.add_item(item)
+            link.extra_fields["datetime"] = time_entry["Time"]
+            link.extra_fields["assets"] = [a["File"] for a in time_entry["Assets"]]
+    add_collection_information(catalog_config, collection, collection_config)
+    collection.update_extent_from_items()
+    return collection

eodash_catalog/generate_indicators.py

@@ -20,6 +20,7 @@ from eodash_catalog.endpoints import (
     handle_collection_only,
     handle_custom_endpoint,
     handle_GeoDB_endpoint,
+    handle_raw_source,
     handle_SH_endpoint,
     handle_SH_WMS_endpoint,
     handle_VEDA_endpoint,
@@ -30,6 +31,7 @@ from eodash_catalog.stac_handling import (
     add_base_overlay_info,
     add_collection_information,
     add_extra_fields,
+    add_projection_info,
     get_or_create_collection,
 )
 from eodash_catalog.utils import (
@@ -240,10 +242,15 @@ def process_collection_file(
                         collection_config,
                         catalog,
                     )
+                elif resource["Name"] in ["COG source", "GeoJSON source"]:
+                    collection = handle_raw_source(
+                        catalog_config, resource, collection_config, catalog
+                    )
                 else:
                     raise ValueError("Type of Resource is not supported")
                 if collection:
                     add_single_item_if_collection_empty(collection)
+                    add_projection_info(resource, collection)
                     add_to_catalog(collection, catalog, resource, collection_config)
                 else:
                     raise Exception(f"No collection was generated for resource {resource}")

eodash_catalog/stac_handling.py

@@ -9,6 +9,7 @@ from pystac import (
     Catalog,
     Collection,
     Extent,
+    Item,
     Link,
     Provider,
     SpatialExtent,
@@ -87,36 +88,39 @@ def get_or_create_collection(
     return collection
 
 
-def create_web_map_link(layer: dict, role: str) -> Link:
+def create_web_map_link(layer_config: dict, role: str) -> Link:
     extra_fields = {
         "roles": [role],
-        "id": layer["id"],
+        "id": layer_config["id"],
     }
-    if layer.get("default"):
+    if layer_config.get("default"):
         extra_fields["roles"].append("default")
-    if layer.get("visible"):
+    if layer_config.get("visible"):
         extra_fields["roles"].append("visible")
-    if "visible" in layer and not layer["visible"]:
+    if "visible" in layer_config and not layer_config["visible"]:
         extra_fields["roles"].append("invisible")
 
-    match layer["protocol"]:
+    match layer_config["protocol"].lower():
         case "wms":
             # handle wms special config options
-            extra_fields["wms:layers"] = layer["layers"]
-            if "styles" in layer:
-                extra_fields["wms:styles"] = layer["styles"]
-            # TODO: handle wms dimensions extra_fields["wms:dimensions"]
+            extra_fields["wms:layers"] = layer_config["layers"]
+            if "styles" in layer_config:
+                extra_fields["wms:styles"] = layer_config["styles"]
+            if "dimensions" in layer_config:
+                extra_fields["wms:dimensions"] = layer_config["dimensions"]
         case "wmts":
-            extra_fields["wmts:layer"] = layer["layer"]
-            # TODO: handle wmts dimensions extra_fields["wmts:dimensions"]
+            extra_fields["wmts:layer"] = layer_config["layer"]
+            if "dimensions" in layer_config:
+                extra_fields["wmts:dimensions"] = layer_config["dimensions"]
 
     wml = Link(
-        rel=layer["protocol"],
-        target=layer["url"],
-        media_type=layer.get("media_type", "image/png"),
-        title=layer["name"],
+        rel=layer_config["protocol"],
+        target=layer_config["url"],
+        media_type=layer_config.get("media_type", "image/png"),
+        title=layer_config["name"],
         extra_fields=extra_fields,
     )
+    add_projection_info(layer_config, wml)
     return wml
 
 
@@ -321,25 +325,26 @@ def add_collection_information(
 def add_base_overlay_info(
     collection: Collection, catalog_config: dict, collection_config: dict
 ) -> None:
-    # check if default base layers defined
-    if "default_base_layers" in catalog_config:
+    # add custom baselayers specially for this indicator
+    if "BaseLayers" in collection_config:
+        for layer in collection_config["BaseLayers"]:
+            collection.add_link(create_web_map_link(layer, role="baselayer"))
+    # alternatively use default base layers defined
+    elif "default_base_layers" in catalog_config:
         with open(f'{catalog_config["default_base_layers"]}.yaml') as f:
             base_layers = yaml.load(f, Loader=SafeLoader)
             for layer in base_layers:
                 collection.add_link(create_web_map_link(layer, role="baselayer"))
+    # add custom overlays just for this indicator
+    if "OverlayLayers" in collection_config:
+        for layer in collection_config["OverlayLayers"]:
+            collection.add_link(create_web_map_link(layer, role="overlay"))
     # check if default overlay layers defined
-    if "default_overlay_layers" in catalog_config:
+    elif "default_overlay_layers" in catalog_config:
         with open("{}.yaml".format(catalog_config["default_overlay_layers"])) as f:
             overlay_layers = yaml.load(f, Loader=SafeLoader)
             for layer in overlay_layers:
                 collection.add_link(create_web_map_link(layer, role="overlay"))
-    if "BaseLayers" in collection_config:
-        for layer in collection_config["BaseLayers"]:
-            collection.add_link(create_web_map_link(layer, role="baselayer"))
-    if "OverlayLayers" in collection_config:
-        for layer in collection_config["OverlayLayers"]:
-            collection.add_link(create_web_map_link(layer, role="overlay"))
-    # TODO: possibility to overwrite default base and overlay layers
 
 
 def add_extra_fields(stac_object: Collection | Catalog | Link, collection_config: dict) -> None:
@@ -357,8 +362,6 @@ def add_extra_fields(stac_object: Collection | Catalog | Link, collection_config
         stac_object.extra_fields["sensor"] = collection_config["Sensor"]
     if "Agency" in collection_config:
         stac_object.extra_fields["agency"] = collection_config["Agency"]
-    if "yAxis" in collection_config:
-        stac_object.extra_fields["yAxis"] = collection_config["yAxis"]
     if "EodashIdentifier" in collection_config:
         stac_object.extra_fields["subcode"] = collection_config["EodashIdentifier"]
     if "DataSource" in collection_config:
@@ -375,6 +378,8 @@ def add_extra_fields(stac_object: Collection | Catalog | Link, collection_config
             stac_object.extra_fields["insituSources"] = collection_config["DataSource"]["InSitu"]
         if "Other" in collection_config["DataSource"]:
             stac_object.extra_fields["otherSources"] = collection_config["DataSource"]["Other"]
+    if "MapProjection" in collection_config:
+        stac_object.extra_fields["mapProjection"] = collection_config["MapProjection"]
 
 
 def get_collection_times_from_config(endpoint_config: dict) -> list[str]:
@@ -388,3 +393,29 @@ def get_collection_times_from_config(endpoint_config: dict) -> list[str]:
             timedelta_config = endpoint_config["DateTimeInterval"].get("Timedelta", {"days": 1})
             times = generateDateIsostringsFromInterval(start, end, timedelta_config)
     return times
+
+
+def add_projection_info(
+    endpoint_config: dict, stac_object: Item | Asset | Collection | Link
+) -> None:
+    if proj := endpoint_config.get("DataProjection"):
+        if isinstance(proj, str):
+            if proj.lower().startswith("epsg"):
+                # consider input such as "EPSG:4326"
+                proj = proj.lower().split("EPSG:")[1]
+            # consider a number only
+            proj = int(proj)
+        if isinstance(proj, int):
+            # only set if not existing on source stac_object
+            if not stac_object.extra_fields.get("proj:epsg"):
+                # handling EPSG code for "proj:epsg"
+                stac_object.extra_fields["proj:epsg"] = proj
+        elif isinstance(proj, dict):
+            # custom handling due to incompatibility of proj4js supported syntax (WKT1)
+            # and STAC supported syntax (projjson or WKT2)
+            # so we are taking over the DataProjection as is and deal with it in the eodash client
+            # in a non-standard compliant way
+            # https://github.com/proj4js/proj4js/issues/400
+            stac_object.extra_fields["proj4_def"] = proj
+        else:
+            raise Exception(f"Incorrect type of proj definition {proj}")

eodash_catalog/utils.py

@@ -35,6 +35,21 @@ def create_geojson_point(lon: int | float, lat: int | float) -> dict[str, Any]:
     return {"type": "Feature", "geometry": point, "properties": {}}
 
 
+def create_geojson_from_bbox(bbox: list[float | int]) -> dict:
+    coordinates = [
+        [bbox[0], bbox[1]],
+        [bbox[2], bbox[1]],
+        [bbox[2], bbox[3]],
+        [bbox[0], bbox[3]],
+        [bbox[0], bbox[1]],
+    ]
+    polygon = {"type": "Polygon", "coordinates": [coordinates]}
+
+    feature = {"type": "Feature", "geometry": polygon, "properties": {}}
+    feature_collection = {"type": "FeatureCollection", "features": [feature]}
+    return feature_collection
+
+
 def retrieveExtentFromWMSWMTS(
     capabilities_url: str, layer: str, version: str = "1.1.1", wmts: bool = False
 ) -> tuple[list[float], list[str]]:
@@ -206,7 +221,7 @@ def generate_veda_cog_link(endpoint_config: dict, file_url: str | None) -> str:
 
     file_url = f"url={file_url}&" if file_url else ""
 
-    target_url = f"https://staging-raster.delta-backend.com/cog/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{file_url}resampling_method=nearest{bidx}{colormap}{colormap_name}{rescale}"
+    target_url = f"https://openveda.cloud/cog/tiles/WebMercatorQuad/{{z}}/{{x}}/{{y}}?{file_url}resampling_method=nearest{bidx}{colormap}{colormap_name}{rescale}"
     return target_url
 
 

{eodash_catalog-0.0.13.dist-info → eodash_catalog-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.13
+Version: 0.0.15
 Summary: This package is intended to help create a compatible STAC catalog for the eodash dashboard client. It supports configuration of multiple endpoint types for information extraction.
 Project-URL: Documentation, https://github.com/eodash/eodash_catalog#readme
 Project-URL: Issues, https://github.com/eodash/eodash_catalog/issues

eodash_catalog-0.0.15.dist-info/RECORD

@@ -0,0 +1,14 @@
+eodash_catalog/__about__.py,sha256=IVDENoZTPvh5evYDrfWrEHJJnzkDZ1pH3Gf9Il5ZGjg,138
+eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
+eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
+eodash_catalog/endpoints.py,sha256=UQtrhtxl5jNd_5SXBQrtRopLphX4mkro7tcpnOY3Ny8,32723
+eodash_catalog/generate_indicators.py,sha256=DlbgMuNVPGdg8roYO7raXIeTmsMRpsyN71DYnRATATI,18790
+eodash_catalog/sh_endpoint.py,sha256=vELooJwk269v1DNnOzb32vil96vL_SRCio8UBlx10N0,618
+eodash_catalog/stac_handling.py,sha256=BKFFhM2JhrBnEd6EbEESAIUcFncDaAb5N4aHx0uZBv4,18197
+eodash_catalog/thumbnails.py,sha256=31Wk38oNQDxfhSUbMLBpHuZFhsR8v_7luYr65XQtDf0,2213
+eodash_catalog/utils.py,sha256=FZIn3iwMNjdaGAlbaIHPffYkAhlIHpNU2vkMJmEcYRQ,8427
+eodash_catalog-0.0.15.dist-info/METADATA,sha256=AKHmY9ssYxP9hqIxVy4WY0w8VETzC7K_8aaCkjc8ZzQ,3203
+eodash_catalog-0.0.15.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+eodash_catalog-0.0.15.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
+eodash_catalog-0.0.15.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
+eodash_catalog-0.0.15.dist-info/RECORD,,

eodash_catalog-0.0.13.dist-info/RECORD

@@ -1,14 +0,0 @@
-eodash_catalog/__about__.py,sha256=pjS2CWOvmdNpuLtKmxKPRK9fnsjxmFPBSNe01nFtPms,138
-eodash_catalog/__init__.py,sha256=_W_9emPYf6FUqc0P8L2SmADx6hGSd7PlQV3yRmCk5uM,115
-eodash_catalog/duration.py,sha256=B6XOZfvNU7SuqpxuVtT1kNKODoOQJXDI6mocvA_U1ik,10816
-eodash_catalog/endpoints.py,sha256=o0m0dMmfvZ2ybRnHW-am4g4vjoQhFMNbnQ_xI2kE_D8,30658
-eodash_catalog/generate_indicators.py,sha256=aTh7RHhUVfDjaWNH4GYiLuzC7Z8fQEfJGfckdkjwFOs,18454
-eodash_catalog/sh_endpoint.py,sha256=vELooJwk269v1DNnOzb32vil96vL_SRCio8UBlx10N0,618
-eodash_catalog/stac_handling.py,sha256=TCvHD1vfw0lCmdzb9e4fk7M0ssmZ1nceogzOGpK7apM,16637
-eodash_catalog/thumbnails.py,sha256=31Wk38oNQDxfhSUbMLBpHuZFhsR8v_7luYr65XQtDf0,2213
-eodash_catalog/utils.py,sha256=JnXrXtq3bOmECPlSn86Mz35sDTOkgptz87lrISfE1Uo,7968
-eodash_catalog-0.0.13.dist-info/METADATA,sha256=Bf2eY10ukpx7IvloyIRZQEw3QEGTKWrRfNJQtwCfyFk,3203
-eodash_catalog-0.0.13.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-eodash_catalog-0.0.13.dist-info/entry_points.txt,sha256=kuUQrDG1PtYd8kPjf5XM6H_NtQd9Ozwl0jjiGtAvZSM,87
-eodash_catalog-0.0.13.dist-info/licenses/LICENSE.txt,sha256=oJCW5zQxnFD-J0hGz6Zh5Lkpdk1oAndmWhseTmV224E,1107
-eodash_catalog-0.0.13.dist-info/RECORD,,