Extent key comparison to also work for tags.

1 files changed, 59 insertions, 33 deletions

diff --git a/web/lib/ui/key_comparison.rb b/web/lib/ui/key_comparison.rb
index 5a0fcfa..9ec2fa2 100644
--- a/web/lib/ui/key_comparison.rb
+++ b/web/lib/ui/key_comparison.rb
@@ -1,40 +1,66 @@
 # web/lib/ui/key_comparison.rb
 class Taginfo < Sinatra::Base
 
-    get %r{^/key_comparison/} do
-        @keys = params[:key][0..5] # allow to compare maximum of 5 keys
-
-        @count_all = []
-        @count_nodes = []
-        @count_ways = []
-        @count_relations = []
-        @desc = []
-        @prevalent_values = []
-        @wiki_pages = []
-        @has_map = []
-
-        @keys.each_with_index do |key, num|
-            @count_all << @db.select("SELECT count_all FROM db.keys").condition('key = ?', key).get_first_value().to_i
-            @count_nodes << @db.select("SELECT count_nodes FROM db.keys").condition('key = ?', key).get_first_value().to_i
-            @count_ways << @db.select("SELECT count_ways FROM db.keys").condition('key = ?', key).get_first_value().to_i
-            @count_relations << @db.select("SELECT count_relations FROM db.keys").condition('key = ?', key).get_first_value().to_i
-
-            desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang=? AND key=? AND value IS NULL", r18n.locale.code, key).get_first_value())
-            desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang='en' AND key=? AND value IS NULL", key).get_first_value()) if desc == ''
-            @desc << desc
-
-            prevalent_values = @db.select("SELECT value, count, fraction FROM db.prevalent_values").
-                condition('key=?', key).
-                order_by([:count], 'DESC').
-                execute().map{ |row| { 'value' => row['value'], 'count' => row['count'].to_i, 'fraction' => row['fraction'].to_f } }
-            @prevalent_values << prevalent_values
-
-            wiki_pages = @db.select("SELECT DISTINCT lang FROM wiki.wikipages WHERE key=? AND value IS NULL ORDER BY lang", key).
-                execute().map{ |row| row['lang'] }
-            @wiki_pages << wiki_pages
-
-            @has_map << (@db.count('tag_distributions').condition('key = ?', key).get_first_value().to_i > 0)
+    get %r{^/key_comparison/(.*)} do |items|
+        @data = []
 
+        if !items.nil?
+            items.split('/').each do |item|
+                kv = item.split('=')
+                @data << { :key => kv[0], :value => kv[1] }
+            end
+        end
+
+        if params[:key].is_a?(Array)
+            params[:key].each_with_index do |key, index|
+                @data << {
+                    :key => key,
+                    :value => (params[:value].is_a?(Array) ? params[:value][index] : nil)
+                }
+            end
+        end
+
+        @data = @data[0..4] # allow to compare maximum of 5 items
+
+        @data.each_with_index do |data, num|
+            key   = data[:key]
+            value = data[:value]
+
+            if value.nil?
+                data[:count_all]       = @db.select("SELECT count_all FROM db.keys").condition('key = ?', key).get_first_value().to_i
+                data[:count_nodes]     = @db.select("SELECT count_nodes FROM db.keys").condition('key = ?', key).get_first_value().to_i
+                data[:count_ways]      = @db.select("SELECT count_ways FROM db.keys").condition('key = ?', key).get_first_value().to_i
+                data[:count_relations] = @db.select("SELECT count_relations FROM db.keys").condition('key = ?', key).get_first_value().to_i
+
+                desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang=? AND key=? AND value IS NULL", r18n.locale.code, key).get_first_value())
+                desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang='en' AND key=? AND value IS NULL", key).get_first_value()) if desc == ''
+                data[:desc] = desc
+
+                prevalent_values = @db.select("SELECT value, count, fraction FROM db.prevalent_values").
+                    condition('key=?', key).
+                    order_by([:count], 'DESC').
+                    execute().map{ |row| { 'value' => row['value'], 'count' => row['count'].to_i, 'fraction' => row['fraction'].to_f } }
+                data[:prevalent_values] = prevalent_values
+
+                data[:wiki_pages] = @db.select("SELECT DISTINCT lang FROM wiki.wikipages WHERE key=? AND value IS NULL ORDER BY lang", key).execute().map{ |row| row['lang'] }
+
+                data[:has_map] = data[:count_all] > 0
+            else
+                data[:count_all]       = @db.select("SELECT count_all FROM db.tags").condition('key = ?', key).condition('value = ?', value).get_first_value().to_i
+                data[:count_nodes]     = @db.select("SELECT count_nodes FROM db.tags").condition('key = ?', key).condition('value = ?', value).get_first_value().to_i
+                data[:count_ways]      = @db.select("SELECT count_ways FROM db.tags").condition('key = ?', key).condition('value = ?', value).get_first_value().to_i
+                data[:count_relations] = @db.select("SELECT count_relations FROM db.tags").condition('key = ?', key).condition('value = ?', value).get_first_value().to_i
+
+                desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang=? AND key=? AND value=?", r18n.locale.code, key, value).get_first_value())
+                desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang='en' AND key=? AND value=?", key, value).get_first_value()) if desc == ''
+                data[:desc] = desc
+
+                data[:prevalent_values] = []
+
+                data[:wiki_pages] = @db.select("SELECT DISTINCT lang FROM wiki.wikipages WHERE key=? AND value=? ORDER BY lang", key, value).execute().map{ |row| row['lang'] }
+
+                data[:has_map] = (@db.count('tag_distributions').condition('key = ?', key).condition('value = ?', value).get_first_value().to_i > 0)
+            end
         end
 
         @img_width  = TaginfoConfig.get('geodistribution.width')