aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/lib/ui/keys_tags.rb107
-rwxr-xr-xweb/taginfo.rb114
2 files changed, 112 insertions, 109 deletions
diff --git a/web/lib/ui/keys_tags.rb b/web/lib/ui/keys_tags.rb
new file mode 100644
index 0000000..4d53e85
--- /dev/null
+++ b/web/lib/ui/keys_tags.rb
@@ -0,0 +1,107 @@
+# web/lib/ui/keys_tags.rb
+class Taginfo < Sinatra::Base
+
+ get %r{^/keys/(.*)} do |key|
+ if params[:key].nil?
+ @key = key
+ else
+ @key = params[:key]
+ end
+
+ @key_html = escape_html(@key)
+ @key_uri = escape(@key)
+ @key_json = @key.to_json
+ @key_pp = pp_key(@key)
+
+ @title = [@key_html, t.osm.keys]
+ section :keys
+
+ @filter_type = get_filter()
+ @sel = Hash.new('')
+ @sel[@filter_type] = ' selected="selected"'
+
+ @count_all_values = @db.select("SELECT count_#{@filter_type} 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 = "<span class='empty'>#{ t.pages.key.no_description_in_wiki }</span>" if @desc == ''
+
+ @prevalent_values = @db.select("SELECT value, count_#{@filter_type} AS count FROM tags").
+ condition('key=?', @key).
+ condition('count > ?', @count_all_values * 0.02).
+ order_by(:count, 'DESC').
+ execute().map{ |row| [{ 'value' => row['value'], 'count' => row['count'].to_i }] }
+
+ # add "(other)" label for the rest of the values
+ sum = @prevalent_values.inject(0){ |sum, x| sum += x[0]['count'] }
+ if sum < @count_all_values
+ @prevalent_values << [{ 'value' => '(other)', 'count' => @count_all_values - sum }]
+ end
+
+ @wiki_count = @db.count('wiki.wikipages').condition('value IS NULL').condition('key=?', @key).get_first_value().to_i
+ @user_count = @db.select('SELECT users_all FROM db.keys').condition('key=?', @key).get_first_value().to_i
+
+ (@merkaartor_type, @merkaartor_link, @merkaartor_selector) = @db.select('SELECT tag_type, link, selector FROM merkaartor.keys').condition('key=?', @key).get_columns(:tag_type, :link, :selector)
+ @merkaartor_images = [:node, :way, :area, :relation].map{ |type|
+ name = type.to_s.capitalize
+ '<img src="/img/types/' + (@merkaartor_selector =~ /Type is #{name}/ ? type.to_s : 'none') + '.16.png" alt="' + name + '" title="' + name + '"/>'
+ }.join('&nbsp;')
+
+ @merkaartor_values = @db.select('SELECT value FROM merkaartor.tags').condition('key=?', @key).order_by(:value).execute().map{ |row| row['value'] }
+
+ @merkaartor_desc = @db.select('SELECT lang, description FROM key_descriptions').condition('key=?', @key).order_by(:lang).execute()
+
+ @img_width = TaginfoConfig.get('geodistribution.width') * TaginfoConfig.get('geodistribution.scale_image')
+ @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image')
+
+ erb :key
+ end
+
+ #-------------------------------------
+
+ get %r{^/tags/(.*)} do |tag|
+ if tag.match(/=/)
+ kv = tag.split('=', 2)
+ else
+ kv = [ tag, '' ]
+ end
+ if params[:key].nil?
+ @key = kv[0]
+ else
+ @key = params[:key]
+ end
+ if params[:value].nil?
+ @value = kv[1]
+ else
+ @value = params[:value]
+ end
+ @tag = @key + '=' + @value
+
+ @key_html = escape_html(@key)
+ @key_uri = escape(@key)
+ @key_json = @key.to_json
+ @key_pp = pp_key(@key)
+
+ @value_html = escape_html(@value)
+ @value_uri = escape(@value)
+ @value_json = @value.to_json
+ @value_pp = pp_value(@value)
+
+ @title = [@key_html + '=' + @value_html, t.taginfo.tags]
+ section :tags
+
+ @filter_type = get_filter()
+ @sel = Hash.new('')
+ @sel[@filter_type] = ' selected="selected"'
+
+ @wiki_count = @db.count('wiki.wikipages').condition('value=?', @value).condition('key=?', @key).get_first_value().to_i
+ @count_all = @db.select('SELECT count_all FROM db.tags').condition('key = ? AND value = ?', @key, @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 == ''
+ @desc = "<span class='empty'>#{ t.pages.tag.no_description_in_wiki }</span>" if @desc == ''
+
+ erb :tag
+ end
+
+end
diff --git a/web/taginfo.rb b/web/taginfo.rb
index b4b1426..f31c93c 100755
--- a/web/taginfo.rb
+++ b/web/taginfo.rb
@@ -169,111 +169,6 @@ class Taginfo < Sinatra::Base
#-------------------------------------
- get %r{^/keys/(.*)} do |key|
- if params[:key].nil?
- @key = key
- else
- @key = params[:key]
- end
-
- @key_html = escape_html(@key)
- @key_uri = escape(@key)
- @key_json = @key.to_json
- @key_pp = pp_key(@key)
-
- @title = [@key_html, t.osm.keys]
- section :keys
-
- @filter_type = get_filter()
- @sel = Hash.new('')
- @sel[@filter_type] = ' selected="selected"'
-
- @count_all_values = @db.select("SELECT count_#{@filter_type} 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 = "<span class='empty'>#{ t.pages.key.no_description_in_wiki }</span>" if @desc == ''
-
- @prevalent_values = @db.select("SELECT value, count_#{@filter_type} AS count FROM tags").
- condition('key=?', @key).
- condition('count > ?', @count_all_values * 0.02).
- order_by(:count, 'DESC').
- execute().map{ |row| [{ 'value' => row['value'], 'count' => row['count'].to_i }] }
-
- # add "(other)" label for the rest of the values
- sum = @prevalent_values.inject(0){ |sum, x| sum += x[0]['count'] }
- if sum < @count_all_values
- @prevalent_values << [{ 'value' => '(other)', 'count' => @count_all_values - sum }]
- end
-
- @wiki_count = @db.count('wiki.wikipages').condition('value IS NULL').condition('key=?', @key).get_first_value().to_i
- @user_count = @db.select('SELECT users_all FROM db.keys').condition('key=?', @key).get_first_value().to_i
-
- (@merkaartor_type, @merkaartor_link, @merkaartor_selector) = @db.select('SELECT tag_type, link, selector FROM merkaartor.keys').condition('key=?', @key).get_columns(:tag_type, :link, :selector)
- @merkaartor_images = [:node, :way, :area, :relation].map{ |type|
- name = type.to_s.capitalize
- '<img src="/img/types/' + (@merkaartor_selector =~ /Type is #{name}/ ? type.to_s : 'none') + '.16.png" alt="' + name + '" title="' + name + '"/>'
- }.join('&nbsp;')
-
- @merkaartor_values = @db.select('SELECT value FROM merkaartor.tags').condition('key=?', @key).order_by(:value).execute().map{ |row| row['value'] }
-
- @merkaartor_desc = @db.select('SELECT lang, description FROM key_descriptions').condition('key=?', @key).order_by(:lang).execute()
-
- @img_width = TaginfoConfig.get('geodistribution.width') * TaginfoConfig.get('geodistribution.scale_image')
- @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image')
-
- erb :key
- end
-
- #-------------------------------------
-
- get %r{^/tags/(.*)} do |tag|
- if tag.match(/=/)
- kv = tag.split('=', 2)
- else
- kv = [ tag, '' ]
- end
- if params[:key].nil?
- @key = kv[0]
- else
- @key = params[:key]
- end
- if params[:value].nil?
- @value = kv[1]
- else
- @value = params[:value]
- end
- @tag = @key + '=' + @value
-
- @key_html = escape_html(@key)
- @key_uri = escape(@key)
- @key_json = @key.to_json
- @key_pp = pp_key(@key)
-
- @value_html = escape_html(@value)
- @value_uri = escape(@value)
- @value_json = @value.to_json
- @value_pp = pp_value(@value)
-
- @title = [@key_html + '=' + @value_html, t.taginfo.tags]
- section :tags
-
- @filter_type = get_filter()
- @sel = Hash.new('')
- @sel[@filter_type] = ' selected="selected"'
-
- @wiki_count = @db.count('wiki.wikipages').condition('value=?', @value).condition('key=?', @key).get_first_value().to_i
- @count_all = @db.select('SELECT count_all FROM db.tags').condition('key = ? AND value = ?', @key, @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 == ''
- @desc = "<span class='empty'>#{ t.pages.tag.no_description_in_wiki }</span>" if @desc == ''
-
- erb :tag
- end
-
- #-------------------------------------
-
get '/js/lang/:lang.js' do
expires next_update
trans = R18n::I18n.new(params[:lang], 'i18n')
@@ -330,16 +225,17 @@ class Taginfo < Sinatra::Base
#--------------------------------------------------------------------------
- load 'lib/api/main.rb'
load 'lib/api/db.rb'
- load 'lib/api/wiki.rb'
load 'lib/api/josm.rb'
+ load 'lib/api/main.rb'
load 'lib/api/reports.rb'
load 'lib/api/search.rb'
+ load 'lib/api/wiki.rb'
- load 'lib/ui/search.rb'
- load 'lib/ui/reports.rb'
load 'lib/ui/embed.rb'
+ load 'lib/ui/keys_tags.rb'
+ load 'lib/ui/reports.rb'
+ load 'lib/ui/search.rb'
load 'lib/ui/test.rb'
# run application
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-26 15:12:52 +0000