From 0e77fc6c6ef443970c8de9dea1fc9a5c315c899a Mon Sep 17 00:00:00 2001
From: Norbert Renner <norbert.renner@gmx.de>
Date: Fri, 30 May 2014 11:55:25 +0200
Subject: [PATCH]  build profile option list dynamically from config.js

---
 config.js                    | 13 +++++++++++++
 index.html                   | 15 +++------------
 js/control/RoutingOptions.js | 17 ++++++++++++++++-
 js/index.js                  | 10 +++++-----
 4 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 config.js

diff --git a/config.js b/config.js
new file mode 100644
index 0000000..7152f80
--- /dev/null
+++ b/config.js
@@ -0,0 +1,13 @@
+BR.conf = {
+    profiles: [
+        'trekking',
+        'fastbike',
+        'shortest',
+        'all',
+        /* "does not contain expressions for context node" (?)
+        'softaccess',
+        */
+        'moped',
+        'car-test'
+    ]
+};
diff --git a/index.html b/index.html
index 50971b4..1db5b77 100644
--- a/index.html
+++ b/index.html
@@ -34,18 +34,8 @@
         <table>
             <tr><td>Profile:</td>
                 <td><select id="profile">
-                        <!-- sample profiles -->
-                        <option value="" disabled>&lt;custom&gt;</custom></option>
-                        <option value="trekking">trekking</option>
-                        <option value="fastbike">fastbike</option>
-                        <option value="safety">safety</option>
-                        <option value="shortest">shortest</option>
-                        <option value="trekking-ignore-cr">trekking-ignore-cr</option>
-                        <option value="trekking-steep">trekking-steep</option>
-                        <option value="trekking-noferries">trekking-noferries</option>
-                        <option value="trekking-nosteps">trekking-nosteps</option>
-                        <option value="moped">moped</option>
-                        <option value="car-test">car-test</option>
+                        <option value="" disabled>&lt;custom&gt;</option>
+                        <!-- profile option list built dynamically from config -->
                     </select></td></tr>
             <tr><td>Alternative:</td>
                 <td><select id="alternative">
@@ -95,6 +85,7 @@
         // global package prefix for BRouter web application
         BR = {};
     </script>
+    <script src="config.js"></script>
     <script src="js/router/BRouter.js"></script>
     <!-- <script src="js/router/brouterCgi.js"></script> -->
     <script src="js/control/Control.js"></script>
diff --git a/js/control/RoutingOptions.js b/js/control/RoutingOptions.js
index 1320b58..2c4c870 100644
--- a/js/control/RoutingOptions.js
+++ b/js/control/RoutingOptions.js
@@ -5,9 +5,24 @@ BR.RoutingOptions = BR.Control.extend({
     },
 
     onAdd: function (map) {
-        L.DomUtil.get('profile').onchange = this._getChangeHandler();
+        var select = L.DomUtil.get('profile'),
+            i,
+            option;
+
+        select.onchange = this._getChangeHandler();
         L.DomUtil.get('alternative').onchange = this._getChangeHandler();
 
+        // build option list from config
+        var profiles = BR.conf.profiles;
+        for (i = 0; i < profiles.length; i++) {
+            option = document.createElement("option");
+            option.value = profiles[i];
+            option.text = profiles[i];
+            select.add(option, null);
+        }
+        // <custom> option disabled, select next
+        select.options[1].selected = true;
+
         return BR.Control.prototype.onAdd.call(this, map);
     },
 
diff --git a/js/index.js b/js/index.js
index 1286cd5..c91d470 100644
--- a/js/index.js
+++ b/js/index.js
@@ -106,10 +106,6 @@
         nogos = new BR.NogoAreas();
         nogos.on('update', updateRoute);
 
-        // initial option settings
-        router.setOptions(nogos.getOptions());
-        router.setOptions(routingOptions.getOptions());
-
         stats = new BR.TrackStats();
         download = new BR.Download();
         elevation = new BR.Elevation();
@@ -173,7 +169,11 @@
 
         nogos.addTo(map);
         routing.addTo(map);
-        
+
+        // initial option settings (after controls are added and initialized with onAdd, before permalink)
+        router.setOptions(nogos.getOptions());
+        router.setOptions(routingOptions.getOptions());
+
         map.addControl(new L.Control.Permalink({
             text: 'Permalink',
             position: 'bottomright',