diff --git a/ckanext/odsh/helpers.py b/ckanext/odsh/helpers.py index 672ff8208dbd99c17da4e17dcb0ed01bc36cbc40..06d83e403ae637cf8f704280171fba318d9fb8e4 100644 --- a/ckanext/odsh/helpers.py +++ b/ckanext/odsh/helpers.py @@ -92,6 +92,9 @@ def compute_bounding_box(coords): if len(coords) == 0: return None + if type(coords[0]) != list: + return [coords[0], coords[0], coords[1], coords[1]] + coords = [c for sublist in coords for c in sublist] if type(coords[0][0]) == list: # multipolygon diff --git a/ckanext/odsh/templates/snippets/search_form.html b/ckanext/odsh/templates/snippets/search_form.html index 9e1ea9ed0bb4d3b4941c5f72d83dcbeca6e9521a..b0a7b0c1c2153110ba42ffa4af987fa02a6dbaca 100644 --- a/ckanext/odsh/templates/snippets/search_form.html +++ b/ckanext/odsh/templates/snippets/search_form.html @@ -71,7 +71,7 @@ {% endblock %} {% block search_facets %} - {% if facets %} + {% if facets and facets.search %} <p class="filter-list"> {% for field in facets.fields %} {% set search_facets_items = facets.search.get(field)['items'] %} @@ -202,4 +202,4 @@ {% trans %} <p id="search-error"><strong>There was an error while searching.</strong> Please try again.</p> {% endtrans %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py index b57933968fc19251a12c727347a6aaf5e570655c..1ecaee16ddf11300c5d86c75de270a8ef6fb36de 100644 --- a/ckanext/odsh/validation.py +++ b/ckanext/odsh/validation.py @@ -201,8 +201,8 @@ def known_spatial_uri(key, data, errors, context): poly = pkg.extras.get('spatial', None) if (not poly) and require_spatial_uri: raise toolkit.Invalid(error_message_spatial_uri_empty) - if has_old_uri and require_spatial_uri: - raise toolkit.Invalid(error_message_spatial_uri_empty) + #if has_old_uri and require_spatial_uri: + # raise toolkit.Invalid(error_message_spatial_uri_empty) else: if poly: new_index = next_extra_index(data)