Skip to content
Snippets Groups Projects
Commit e0be32ac authored by Jesper Zedlitz's avatar Jesper Zedlitz
Browse files

Merge branch 'fixup-0000-local-changes' into 'v1.3'

Fixup with local changes from transitional operation

See merge request !3
parents 36bd620e fd74a304
Branches
Tags
2 merge requests!17Stage System soll in Zukunft Master Branch erhalten,!3Fixup with local changes from transitional operation
...@@ -92,6 +92,9 @@ def compute_bounding_box(coords): ...@@ -92,6 +92,9 @@ def compute_bounding_box(coords):
if len(coords) == 0: if len(coords) == 0:
return None 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] coords = [c for sublist in coords for c in sublist]
if type(coords[0][0]) == list: if type(coords[0][0]) == list:
# multipolygon # multipolygon
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
{% endblock %} {% endblock %}
{% block search_facets %} {% block search_facets %}
{% if facets %} {% if facets and facets.search %}
<p class="filter-list"> <p class="filter-list">
{% for field in facets.fields %} {% for field in facets.fields %}
{% set search_facets_items = facets.search.get(field)['items'] %} {% set search_facets_items = facets.search.get(field)['items'] %}
......
...@@ -201,8 +201,8 @@ def known_spatial_uri(key, data, errors, context): ...@@ -201,8 +201,8 @@ def known_spatial_uri(key, data, errors, context):
poly = pkg.extras.get('spatial', None) poly = pkg.extras.get('spatial', None)
if (not poly) and require_spatial_uri: if (not poly) and require_spatial_uri:
raise toolkit.Invalid(error_message_spatial_uri_empty) raise toolkit.Invalid(error_message_spatial_uri_empty)
if has_old_uri and require_spatial_uri: #if has_old_uri and require_spatial_uri:
raise toolkit.Invalid(error_message_spatial_uri_empty) # raise toolkit.Invalid(error_message_spatial_uri_empty)
else: else:
if poly: if poly:
new_index = next_extra_index(data) new_index = next_extra_index(data)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment