Merge branch 'release/1.6.0'

CHANGES.rst

@@ -2,6 +2,14 @@
 Changes
 -------
 
+1.6.0
+~~~~~
+
+New feature: see https://github.com/clld/clld/issues/86
+
+Bugfix: see https://github.com/clld/clld/issues/85
+
+
 1.5.1
 ~~~~~
 

clld/__init__.py

@@ -5,7 +5,7 @@
 from clld import interfaces
 
 
-__version__ = "1.5.1"
+__version__ = "1.6.0"
 
 
 class Resource(namedtuple('Resource', 'name model interface with_index with_rdfdump')):

clld/web/adapters/geojson.py

@@ -191,7 +191,8 @@ def get_language(self, ctx, req, valueset):
     def feature_properties(self, ctx, req, valueset):
         return {
             'values': list(valueset.values),
-            'label': ', '.join(nfilter(v.name for v in valueset.values))}
+            'label': ', '.join(nfilter(v.name for v in valueset.values))
+            or self.get_language(ctx, req, valueset).name}
 
 
 class GeoJsonParameterMultipleValueSets(GeoJsonParameter):

clld/web/static/js/clld.js

@@ -535,7 +535,11 @@ CLLD.Map = function(eid, layers, options) {
         hash = new L.Hash(this.map);
     }
 
-    L.control.layers.provided(baseLayers, []).addTo(this.map);
+    if (this.options.tile_layer != undefined) {
+        L.tileLayer(this.options.tile_layer.url_pattern, this.options.tile_layer.options).addTo(this.map);
+    } else {
+        L.control.layers.provided(baseLayers, []).addTo(this.map);
+    }
 
     this.marker_map = {};
     this.layer_map = {};

docs/conf.py

@@ -51,10 +51,10 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = '1.5.1'
+release = '1.6.0'
 
 # The short X.Y version.
-version = '1.5.1'
+version = '1.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -81,7 +81,7 @@
 
 setup(
     name='clld',
-    version='1.5.1',
+    version='1.6.0',
     description=(
         'Python library supporting the development of cross-linguistic databases'),
     long_description=README + '\n\n' + CHANGES,