spatial_uri is now a list of options instead of a text field

ckanext/odsh/helpers.py

@@ -11,6 +11,7 @@ from dateutil import parser
 from ckan.common import config
 import urllib
 import hashlib
+import ckanext.odsh.model.spatial as _spatial
 
 get_action = logic.get_action
 log = logging.getLogger(__name__)
@@ -153,3 +154,15 @@ def odsh_extract_value_from_extras(extras, key):
             if 'value' in item:
                 return item['value']
             return None
+
+
+def spatial_options():
+    '''
+    Returns [(l.spatial_text, l.spatial_uri), ...] for the licenses configured to be
+    offered.
+    '''
+    register = _spatial.SpatialRegister()
+    sorted_spatials = sorted(register.values(), key=lambda x: x.text)
+    spatial_uris = [spatial.uri for spatial in sorted_spatials]
+    return [(spatial_uri, register[spatial_uri].text if spatial_uri in register else spatial_uri)
+            for spatial_uri in spatial_uris]

ckanext/odsh/model/__init__.py

 from ckanext.odsh.model.statistiknord import *
+from spatial import Spatial, SpatialRegister
\ No newline at end of file

ckanext/odsh/model/spatial.py

+# encoding: utf-8
+
+from ckan.common import config
+from ckan.common import json
+import urllib2
+
+log = __import__('logging').getLogger(__name__)
+
+
+class Spatial(object):
+    def __init__(self, uri, text):
+        self.uri = uri
+        self.text = text
+
+
+class SpatialRegister(object):
+    def __init__(self):
+        spatial_url = config.get('ckanext.odsh.spatial.mapping', None)
+        if spatial_url:
+            self.load_spatial(spatial_url)
+        else:
+            default_spatial_dict = dict()
+            self._create_spatial_list(default_spatial_dict)
+
+    def load_spatial(self, spatial_url):
+        try:
+            response = urllib2.urlopen(spatial_url)
+            response_body = response.read()
+        except Exception as inst:
+            msg = "Couldn't connect to spatial service %r: %s" % (spatial_url, inst)
+            raise Exception(msg)
+        try:
+            spatial_data = json.loads(response_body)
+        except Exception as inst:
+            msg = "Couldn't read response from spatial service %r: %s" % (response_body, inst)
+            raise Exception(inst)
+        self._create_spatial_list(spatial_data, spatial_url)
+
+    def _create_spatial_list(self, spatial_data, spatial_url=''):
+        if isinstance(spatial_data, dict):
+            self.spatials = list()
+            for entity in spatial_data:
+                self.spatials.append(Spatial(entity, spatial_data[entity]['spatial_text']))
+        else:
+            msg = "Spatials at %s must be dictionary(json)" % spatial_url
+            raise ValueError(msg)
+
+    def __getitem__(self, key, default=Exception):
+        for spatial in self.spatials:
+            if key == spatial.uri:
+                return spatial
+            if default != Exception:
+                return default
+            else:
+                raise KeyError("Spatial not found: %s" % key)
+
+    def values(self):
+        return self.spatials

ckanext/odsh/plugin.py

@@ -229,7 +229,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
                 'odsh_encodeurl': odsh_helpers.odsh_encodeurl,
                 'odsh_extract_error': odsh_helpers.odsh_extract_error,
                 'odsh_extract_value_from_extras': odsh_helpers.odsh_extract_value_from_extras,
-                'odsh_create_checksum': odsh_helpers.odsh_create_checksum
+                'odsh_create_checksum': odsh_helpers.odsh_create_checksum,
+                'spatial_options': odsh_helpers.spatial_options
                 }
 
     def before_map(self, map):

ckanext/odsh/templates/package/snippets/package_basic_fields.html

@@ -190,7 +190,13 @@ is_required=true,placeholder=_('Enter title')) }}
         <div class="controls">
             <div class="row-fluid">
                 <div class="span6">
-                    {{ form.input_extra(field, value=value, index=h.odsh_create_checksum(field), type='text', placeholder=_('Enter spatial uri')) }}
+                    <select id="field-spatial_uri" name="spatial_uri">
+                        {% for spatial_uri, spatial_text in h.spatial_options() %}
+                        <option value="{{ spatial_uri }}" {% if value==spatial_uri %}selected="selected" {% endif %}>
+                            {{ spatial_text }}
+                        </option>
+                        {% endfor %}
+                    </select>
                 </div>
                 <div class="span6 inline-error">
                     {% if error %}