eodash_catalog 0.0.20__tar.gz → 0.0.22__tar.gz

{eodash_catalog-0.0.20 → eodash_catalog-0.0.22}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.20
+current_version = 0.0.22
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?

{eodash_catalog-0.0.20 → eodash_catalog-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: eodash_catalog
-Version: 0.0.20
+Version: 0.0.22
 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.20 → eodash_catalog-0.0.22}/src/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.20"
+__version__ = "0.0.22"

{eodash_catalog-0.0.20 → eodash_catalog-0.0.22}/src/eodash_catalog/endpoints.py

@@ -45,11 +45,11 @@ def process_STAC_Datacube_Endpoint(
         stac_endpoint_url = stac_endpoint_url + endpoint_config.get("StacEndpoint", "")
     # assuming /search not implemented
     api = Client.open(stac_endpoint_url)
-    collection_id = endpoint_config.get("CollectionId", "datacubes")
+    collection_id = endpoint_config.get("DatacubeId", "")
     coll = api.get_collection(collection_id)
     if not coll:
         raise ValueError(f"Collection {collection_id} not found in endpoint {endpoint_config}")
-    item_id = endpoint_config.get("DatacubeId", "")
+    item_id = endpoint_config.get("CollectionId", "datacube")
     item = coll.get_item(item_id)
     if not item:
         raise ValueError(f"Item  {item_id} not found in collection {coll}")
@@ -386,8 +386,10 @@ def handle_xcube_endpoint(
 def handle_GeoDB_endpoint(
     catalog_config: dict, endpoint_config: dict, collection_config: dict, catalog: Catalog
 ) -> Collection:
+    # ID of collection is data["Name"] instead of CollectionId to be able to 
+    # create more STAC collections from one geoDB table
     collection = get_or_create_collection(
-        catalog, endpoint_config["CollectionId"], collection_config, catalog_config, endpoint_config
+        catalog, collection_config["Name"], collection_config, catalog_config, endpoint_config
     )
     select = "?select=aoi,aoi_id,country,city,time"
     url = (
@@ -463,6 +465,7 @@ def handle_GeoDB_endpoint(
         collection_config["yAxis"] = yAxis
     add_collection_information(catalog_config, collection, collection_config)
     add_example_info(collection, collection_config, endpoint_config, catalog_config)
+    collection.extra_fields["geoDBID"] = endpoint_config["CollectionId"]
 
     collection.update_extent_from_items()
     collection.summaries = Summaries(