From c7ceff5df2dccd84ff5149f70880e303e4f0f516 Mon Sep 17 00:00:00 2001 From: anonymous <anonymous> Date: Fri, 22 Mar 2019 01:53:46 +0100 Subject: [PATCH] Allow for a spatial polygon without spatial_URI --- ckanext/odsh/validation.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py index 0c2177f3..e8bd6e0b 100644 --- a/ckanext/odsh/validation.py +++ b/ckanext/odsh/validation.py @@ -135,8 +135,13 @@ def known_spatial_uri(key, data, errors, context): value = _extract_value(data, 'spatial_uri') if not value: - raise toolkit.Invalid('spatial_uri:odsh_spatial_uri_error_label') - + # some harvesters might import a polygon directly... + poly = _extract_value(data, 'spatial') + if not poly: + raise toolkit.Invalid('spatial_uri:odsh_spatial_uri_error_label') + else: + return + mapping_file = config.get('ckanext.odsh.spatial.mapping') try: mapping_file = urllib2.urlopen(mapping_file) @@ -206,4 +211,4 @@ def get_validators(): 'known_spatial_uri': known_spatial_uri, 'odsh_tag_name_validator': tag_name_validator, 'odsh_validate_extras':validate_extras - } \ No newline at end of file + } -- GitLab