diff options
author | Jochen Topf <jochen@topf.org> | 2013-01-07 15:56:10 +0100 |
---|---|---|
committer | Jochen Topf <jochen@topf.org> | 2013-01-07 15:56:10 +0100 |
commit | 9cadfd89c12c9223e7c572646680d0bcce57310c (patch) | |
tree | 4a138a0f9b3f97c08db26a94bd6fb2411ffb8709 /web | |
parent | a334668751ca122e0e34c77d297f60818e951df6 (diff) | |
download | taginfo-9cadfd89c12c9223e7c572646680d0bcce57310c.tar taginfo-9cadfd89c12c9223e7c572646680d0bcce57310c.tar.gz |
Commented out unused merkaartor queries
Diffstat (limited to 'web')
-rw-r--r-- | web/lib/ui/keys_tags.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/web/lib/ui/keys_tags.rb b/web/lib/ui/keys_tags.rb index 8c59e17..feaf90d 100644 --- a/web/lib/ui/keys_tags.rb +++ b/web/lib/ui/keys_tags.rb @@ -44,15 +44,15 @@ class Taginfo < Sinatra::Base @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" width="16" height="16" alt="' + name + '" title="' + name + '"/>' - }.join(' ') - - @merkaartor_values = @db.select('SELECT value FROM merkaartor.tags').condition('key=?', @key).order_by([:value], 'ASC').execute().map{ |row| row['value'] } - - @merkaartor_desc = @db.select('SELECT lang, description FROM key_descriptions').condition('key=?', @key).order_by([:lang], 'DESC').execute() +# (@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" width="16" height="16" alt="' + name + '" title="' + name + '"/>' +# }.join(' ') +# +# @merkaartor_values = @db.select('SELECT value FROM merkaartor.tags').condition('key=?', @key).order_by([:value], 'ASC').execute().map{ |row| row['value'] } +# +# @merkaartor_desc = @db.select('SELECT lang, description FROM key_descriptions').condition('key=?', @key).order_by([:lang], 'DESC').execute() @img_width = TaginfoConfig.get('geodistribution.width') * TaginfoConfig.get('geodistribution.scale_image') @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image') |