Merge pull request #34 from simranmattu14/discovery-metadata

updated elasticsearch.py:

Author: kngai

deploy/default/woudc-api-config.yml

@@ -7,8 +7,8 @@ server:
     mimetype: application/json; charset=UTF-8
     encoding: utf-8
     languages:
-        - en-CA
-        - fr-CA
+        - en
+        - fr
     # cors: true
     pretty_print: true
     limits:
@@ -21,7 +21,7 @@ server:
     ogc_schemas_location: ${WOUDC_API_OGC_SCHEMAS_LOCATION}
 
 logging:
-    level: ERROR
+    level: DEBUG
     # logfile: /tmp/woudc-api.log
 
 metadata:
@@ -101,6 +101,9 @@ resources:
               name:  woudc_api.provider.elasticsearch.ElasticsearchWOUDCProvider
               data: ${WOUDC_API_ES_URL}/${WOUDC_API_ES_INDEX_PREFIX}.discovery_metadata
               id_field: identifier
+              languages:
+                - en
+                - fr
     datasets:
         type: collection
         title: WOUDC Data Registry Datasets

woudc_api/provider/elasticsearch.py

@@ -36,7 +36,6 @@
 from pygeoapi.provider.elasticsearch_ import ElasticsearchProvider
 from pygeoapi.provider.base import (ProviderConnectionError,
                                     ProviderQueryError)
-from flask import request
 
 LOGGER = logging.getLogger(__name__)
 
@@ -123,7 +122,11 @@ def query(self, offset=0, limit=10, resulttype='results',
               select_properties=[], skip_geometry=False, q=None,
               filterq=None, **kwargs):
 
-        language = request.args.get('lang', 'en')
+        language = kwargs.get('language')
+        if language is not None:
+            language = language.language
+        else:
+            language = 'en'
 
         new_features = []
 
@@ -136,11 +139,11 @@ def query(self, offset=0, limit=10, resulttype='results',
             skip_geometry=skip_geometry,
             q=q)
 
-        if self.index_name.split('.')[-1] == 'discovery_metadata':
+        if self.index_name.endswith('discovery_metadata'):
             LOGGER.debug('Intercepting default ES response')
             for feature in records['features']:
                 if feature['id'].endswith(language):
-                    feature['id'] = feature['id'].rsplit(f"_{language}")[0]
+                    feature['id'] = feature['id'].rsplit(f'_{language}')[0]
                     new_features.append(feature)
             records['features'] = new_features
 
@@ -158,18 +161,22 @@ def get(self, identifier, **kwargs):
         :returns: dict of single GeoJSON feature
         """
 
-        language = request.args.get('lang', 'en')
+        language = kwargs.get('language')
+        if language is not None:
+            language = language.language
+        else:
+            language = 'en'
 
-        LOGGER.info("Getting identifier: %s with language: %s",
+        LOGGER.info('Getting identifier: %s with language: %s',
                     identifier, language)
 
-        if self.index_name.split('.')[-1] == 'discovery_metadata':
+        if self.index_name.endswith('discovery_metadata'):
             identifier2 = f'{identifier}_{language}'
         else:
             identifier2 = identifier
 
         dataset = super().get(identifier2, **kwargs)
 
-        dataset['id'] = dataset['id'].rsplit(f"_{language}")[0]
+        dataset['id'] = dataset['id'].rsplit(f'_{language}')[0]
 
         return dataset