only add json-collection when 2geojson defined

wmo-im · Mar 3, 2025 · 63dfd43 · 63dfd43
1 parent afbd419
commit 63dfd43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/wis2box-management/wis2box/data/__init__.py b/wis2box-management/wis2box/data/__init__.py
@@ -99,7 +99,6 @@ def gcm(mcf: Union[dict, str]) -> dict:
     return {
         'id': generated['id'],
         'type': 'feature',
-        'topic_hierarchy': generated['properties']['wmo:topicHierarchy'].replace('origin/a/wis2/', '').replace('/', '.'),  # noqa: E501
         'title': f'Observations in json format for {generated["id"]}',
         'description': f'Observations in json format for {generated["id"]}', # noqa
         'keywords': generated['properties']['keywords'],

diff --git a/wis2box-management/wis2box/pubsub/subscribe.py b/wis2box-management/wis2box/pubsub/subscribe.py
@@ -34,7 +34,7 @@
 from wis2box.api import (setup_collection, upsert_collection_item,
                          delete_collection_item, remove_collection)
 
-from wis2box.data_mappings import get_data_mappings
+from wis2box.data_mappings import get_data_mappings, get_plugins
 from wis2box.data.message import MessageData
 
 from wis2box.env import (DATADIR, DOCKER_BROKER,
@@ -190,7 +190,12 @@ def on_message_handler(self, client, userdata, msg):
             LOGGER.debug('Publishing dataset')
             metadata = message
             discovery_metadata.publish_discovery_metadata(metadata)
-            data_.add_collection_data(metadata)
+            has_2geojson = any('2geojson' in plugin for plugin in get_plugins(metadata)) # noqa
+            if has_2geojson:
+                try:
+                    data_.add_collection_data(metadata)
+                except Exception as err:
+                    click.echo(f'ERROR adding data-collection for: {metadata["id"]}: {err}') # noqa
             self.data_mappings = get_data_mappings()
         elif topic.startswith('wis2box/dataset/unpublication'):
             LOGGER.debug('Unpublishing dataset')