From 68e8b4816be721c6be8e9a4c24e9b3bec5771624 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Sun, 2 Oct 2016 16:20:26 +0200
Subject: Small improve on layer switcher

---
 chimere/static/chimere/js/jquery.chimere.js | 18 +++++++++++-------
 chimere/templates/chimere/base.html         |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 1e6daf0..e573225 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -18,7 +18,10 @@ See the file COPYING for details.
 
 var extra_url;
 
-// Create a simple layer switcher in element div:
+// Create a simple layer switcher
+
+var default_map_lbl = '';
+
 var LayerSwitcher = function(options){
   var o = this.options = options || {};
   var map = this.map = options.map;
@@ -54,20 +57,21 @@ var LayerSwitcher = function(options){
   $.each(layers, function(i,l){
     var BL = l.get('baselayer');
     var $li = $('<div class="check">');
-      l.getVisible() ? $li.addClass('checked') : $li.removeClass('checked') ;
-      BL ? $li.addClass('radiobutton') : $li.addClass('checkbox') ;
-    var $ll = $('<label>'+l.get('name')+'</label>');
+    l.getVisible() ? $li.addClass('checked') : $li.removeClass('checked') ;
+    BL ? $li.addClass('radiobutton') : $li.addClass('checkbox') ;
+    var $ll = $('<label>' + (l.get('name') ? l.get('name') : default_map_lbl) + '</label>');
+    // toggle on click
     var $ld = $('<div class="LayerClickDiv">').click(function(){
       l.setVisible(!l.getVisible());
       l.get('baselayer') ? otherBLoff(l) :0;
-    }); //toggle viz on click
+    });
     $ld.append($li,$ll);
     BL ? $baseDiv.append($ld) : $overDiv.append($ld) ;
     // bind checkbox state to layer event:
     l.on('change:visible', function(e){
       this.getVisible() ? $li.addClass('checked') : $li.removeClass('checked') ;
-    }); // bind
-  }); // each
+    });
+  });
   if($baseDiv.children()[0] && $overDiv.children()[0]){
     $baseDiv.after('<div class="Separator">');
   }
diff --git a/chimere/templates/chimere/base.html b/chimere/templates/chimere/base.html
index 5417fea..dd70ef4 100644
--- a/chimere/templates/chimere/base.html
+++ b/chimere/templates/chimere/base.html
@@ -14,6 +14,7 @@
 <script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js" type="text/javascript"></script>
     <script type='text/javascript'>
     var has_search = {% if has_search %}true{% else %}false{% endif %};
+    var default_map_lbl = "{% trans 'Default map' %}";
     </script>
 <script src="{{ STATIC_URL }}chimere/js/interface.js" type="text/javascript"></script>
 {% endblock %}
-- 
cgit v1.2.3