Selects layer in cookie by layer ID.

Author: dkastl

assets/javascripts/app.js

@@ -64,28 +64,21 @@ var App = (function ($, publ) {
     contents.layers.forEach(function(layer,idx) {
       var s = layer.type.split(".");
       var l = new ol.layer.Tile({
-        index: idx,
+        lid: layer.id,
         title: layer.name,
         baseLayer: true,
         visible: false,
         source: new ol[s[1]][s[2]](layer.options)
       });
       l.on("change:visible", function(e) {
         if (e.target.getVisible()) {
-          document.cookie = "_redmine_gtt_basemap=" + e.target.get("index") + ";path=/";
+          document.cookie = "_redmine_gtt_basemap=" +
+                            e.target.get("lid") + ";path=/";
         }
       });
       layerArr.push(l);
     });
-
-    // Decide which baselayer to show
-    var idx = getCookie("_redmine_gtt_basemap") || 0;
-    if (layerArr.length > idx) {
-      layerArr[idx].setVisible(true);
-    }
-    else {
-      layerArr[0].setVisible(true);
-    }
+    publ.setBasemap(layerArr);
 
     // Layer for vector features
     vector = new ol.layer.Vector({
@@ -202,6 +195,42 @@ var App = (function ($, publ) {
     map.addControl(new ol.control.LayerPopup());
   };
 
+  /**
+   * Decide which baselayer to show
+   */
+  publ.setBasemap = function (layers) {
+
+    if (layers.length === 0) {
+      console.error("There is no baselayer availaable!");
+      return;
+    }
+
+    var index = 0;
+    var cookie = parseInt(
+      getCookie("_redmine_gtt_basemap")
+    );
+
+    if (cookie) {
+      var lid = 0;
+      // Check if layer ID exists in available layers
+      layers.forEach(function(layer){
+        if (cookie === layer.get("lid")) {
+          lid = cookie;
+        }
+      });
+
+      // Set selected layer visible
+      layers.forEach(function(layer,idx){
+        if (lid === layer.get("lid")) {
+          index = idx;
+        }
+      });
+    }
+
+    // Set layer visible
+    layers[index].setVisible(true);
+  };
+
   publ.getColor = function (feature) {
     // console.log(feature.get("tracker_id"));
     color = "#f80";

lib/redmine_gtt/hooks/view_layouts_base_html_head_hook.rb

@@ -12,7 +12,7 @@ def view_layouts_base_html_head(context={})
         tags << stylesheet_link_tag("ol3-ext.min.css", :plugin => "redmine_gtt", :media => "all")
         tags << stylesheet_link_tag("app.css", :plugin => "redmine_gtt", :media => "all")
 
-        tags << javascript_include_tag('ol-debug.js', :plugin => 'redmine_gtt')
+        tags << javascript_include_tag('ol.js', :plugin => 'redmine_gtt')
         tags << javascript_include_tag('ol3-ext.min.js', :plugin => 'redmine_gtt')
         tags << javascript_include_tag('app.js', :plugin => 'redmine_gtt')
         return tags.join("\n")