Rename 'b' result to 'value_bool' in josm API calls.

7 files changed, 11 insertions, 11 deletions

diff --git a/web/lib/api/josm.rb b/web/lib/api/josm.rb
index 22249f7..e050ac4 100644
--- a/web/lib/api/josm.rb
+++ b/web/lib/api/josm.rb
@@ -117,7 +117,7 @@ class Taginfo < Sinatra::Base
         :result => {
             :key        => :STRING,
             :value      => :STRING,
-            :b          => :STRING,
+            :value_bool => :STRING,
             :rule       => :STRING,
             :area_color => :STRING,
             :line_color => :STRING,
diff --git a/web/lib/api/key.rb b/web/lib/api/key.rb
index 3fff6b6..e49897e 100644
--- a/web/lib/api/key.rb
+++ b/web/lib/api/key.rb
@@ -268,7 +268,7 @@ class Taginfo < Sinatra::Base
         :result => {
             :key        => :STRING,
             :value      => :STRING,
-            :b          => :STRING,
+            :value_bool => :STRING,
             :rule       => :STRING,
             :area_color => :STRING,
             :line_color => :STRING,
diff --git a/web/lib/api/tag.rb b/web/lib/api/tag.rb
index 3aa577c..b61cca2 100644
--- a/web/lib/api/tag.rb
+++ b/web/lib/api/tag.rb
@@ -167,7 +167,7 @@ class Taginfo < Sinatra::Base
         :result => {
             :key        => :STRING,
             :value      => :STRING,
-            :b          => :STRING,
+            :value_bool => :STRING,
             :rule       => :STRING,
             :area_color => :STRING,
             :line_color => :STRING,
diff --git a/web/lib/utils.rb b/web/lib/utils.rb
index 384e9c6..06a9646 100644
--- a/web/lib/utils.rb
+++ b/web/lib/utils.rb
@@ -203,14 +203,14 @@ def get_josm_style_rules_result(total, res)
         :rp    => @ap.results_per_page,
         :total => total,
         :data  => res.map{ |row| {
-            :key => row['k'],
-            :value => row['v'],
-            :b => row['b'],
-            :rule => h(row['rule']),
+            :key        => row['k'],
+            :value      => row['v'],
+            :value_bool => row['b'],
+            :rule       => h(row['rule']),
             :area_color => row['area_color'] ? h(row['area_color'].sub(/^.*#/, '#')) : '',
             :line_color => row['line_color'] ? h(row['line_color'].sub(/^.*#/, '#')) : '',
             :line_width => row['line_width'] ? row['line_width'].to_i : 0,
-            :icon => row['icon_source'] && row['icon_source'] != 'misc/deprecated.png' && row['icon_source'] != 'misc/no_icon.png' ? h(row['icon_source']) : ''
+            :icon       => row['icon_source'] && row['icon_source'] != 'misc/deprecated.png' && row['icon_source'] != 'misc/no_icon.png' ? h(row['icon_source']) : ''
         } }
     }.to_json
 end
diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb
index bbf142c..e83bbdd 100644
--- a/web/viewsjs/key.js.erb
+++ b/web/viewsjs/key.js.erb
@@ -133,7 +133,7 @@ var create_flexigrid_for = {
             preProcess: function(data) {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
-                        row.value ? link_to_value(row.key, row.value) : row.b ? (row.b + ' (Boolean)') : '*',
+                        row.value ? link_to_value(row.key, row.value) : row.value_bool ? (row.value_bool + ' (Boolean)') : '*',
                         row.icon ? '<img src="/api/4/josm/style/image?style=standard&image=' + row.icon + '" title="' + row.icon + '" alt=""/>' : '',
                         '<div>' + (row.line_width > 0 ? '<div title="' + row.line_color + '" style="height: ' + row.line_width + 'px; margin-top: ' + (10 - Math.round(row.line_width/2)) + 'px; padding: 0; background-color: ' + row.line_color + '"></div>' : '') + '</div>',
                         row.area_color ? '<div title="' + row.area_color + '" style="height: 18px; background-color: ' + row.area_color + '"></div>' : ''
diff --git a/web/viewsjs/reports/josm_styles.js.erb b/web/viewsjs/reports/josm_styles.js.erb
index a8ce85e..54992c3 100644
--- a/web/viewsjs/reports/josm_styles.js.erb
+++ b/web/viewsjs/reports/josm_styles.js.erb
@@ -21,7 +21,7 @@ function create_flexigrid_with_option(stylename) {
             data.rows = jQuery.map(data.data, function(row, i) {
                 return { 'cell': [
                     link_to_key(row.key),
-                    row.value ? link_to_value(row.key, row.value) : row.b ? (row.b + ' (Boolean)') : '*',
+                    row.value ? link_to_value(row.key, row.value) : row.value_bool ? (row.value_bool + ' (Boolean)') : '*',
                     row.icon ? '<img src="/api/4/josm/style/image?style=standard&image=' + row.icon + '" title="' + row.icon + '" alt=""/>' : '',
                     '<div>' + (row.line_width > 0 ? '<div title="' + row.line_color + '" style="height: ' + row.line_width + 'px; margin-top: ' + (10 - Math.round(row.line_width/2)) + 'px; padding: 0; background-color: ' + row.line_color + '"></div>' : '') + '</div>',
                     row.area_color ? '<div title="' + row.area_color + '" style="height: 18px; background-color: ' + row.area_color + '"></div>' : ''
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index 173fab0..c098d64 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -106,7 +106,7 @@ var create_flexigrid_for = {
             preProcess: function(data) {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
-                        row.value ? link_to_value(row.key, row.value) : row.b ? (row.b + ' (Boolean)') : '*',
+                        row.value ? link_to_value(row.key, row.value) : row.value_bool ? (row.value_bool + ' (Boolean)') : '*',
                         row.icon ? '<img src="/api/4/josm/style/image?style=standard&image=' + row.icon + '" title="' + row.icon + '" alt=""/>' : '',
                         '<div>' + (row.line_width > 0 ? '<div title="' + row.line_color + '" style="height: ' + row.line_width + 'px; margin-top: ' + (10 - Math.round(row.line_width/2)) + 'px; padding: 0; background-color: ' + row.line_color + '"></div>' : '') + '</div>',
                         row.area_color ? '<div title="' + row.area_color + '" style="height: 18px; background-color: ' + row.area_color + '"></div>' : ''