From 0bce8570acd121ffb6b65ec58d7e678cbd89798f Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 14 Sep 2014 16:32:42 +0200
Subject: Removed unused Potlatch-related code.

---
 web/lib/api/v4/keys.rb |  3 +--
 web/lib/ui/test.rb     | 34 ----------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

(limited to 'web/lib')

diff --git a/web/lib/api/v4/keys.rb b/web/lib/api/v4/keys.rb
index 98d60c6..b0072ff 100644
--- a/web/lib/api/v4/keys.rb
+++ b/web/lib/api/v4/keys.rb
@@ -13,7 +13,7 @@ class Taginfo < Sinatra::Base
         :parameters => { :query => 'Only show keys matching this query (substring match, optional).' },
         :paging => :optional,
         :filter => @@filters,
-        :sort => %w( key count_all count_nodes count_ways count_relations values_all users_all in_wiki in_josm in_potlatch length ),
+        :sort => %w( key count_all count_nodes count_ways count_relations values_all users_all in_wiki in_josm length ),
         :result => paging_results([
             [:key,                      :STRING, 'Key'],
             [:count_all,                :INT,    'Number of objects in the OSM database with this key.'],
@@ -64,7 +64,6 @@ class Taginfo < Sinatra::Base
                 o.users_all
                 o.in_wiki
                 o.in_josm
-                o.in_potlatch
                 o.length 'length(key)'
                 o.length :key
             }.
diff --git a/web/lib/ui/test.rb b/web/lib/ui/test.rb
index 59a68ed..4b79765 100644
--- a/web/lib/ui/test.rb
+++ b/web/lib/ui/test.rb
@@ -14,38 +14,4 @@ class Taginfo < Sinatra::Base
         erb :'test/wiki_import'
     end
 
-    get! '/test/potlatch' do
-        @title = 'Potlatch'
-
-        erb :'test/potlatch/index'
-    end
-
-    get '/test/potlatch/categories' do
-        @title = 'Potlatch Features'
-
-        @categories = @db.execute('SELECT * FROM potlatch.categories ORDER BY name')
-
-        erb :'test/potlatch/categories'
-    end
-
-    get '/test/potlatch/categories/:category' do
-        @category = params[:category]
-        @features = @db.execute('SELECT * FROM potlatch.features WHERE category_id=? ORDER BY name', @category)
-
-        erb :'test/potlatch/category', :layout => false
-    end
-
-    get '/test/potlatch/features/:feature' do
-        @feature_name = params[:feature]
-        @feature = @db.execute('SELECT * FROM potlatch.features WHERE name=?', @feature_name)[0]
-        @tags = @db.execute('SELECT * FROM potlatch.tags WHERE feature_name=? ORDER BY key, value', @feature_name)
-
-        erb :'test/potlatch/feature', :layout => false
-    end
-
-    get %r{/test/potlatch/icon/(.*)} do |icon|
-        content_type :png
-        send_file('../../var/sources/potlatch/resources/' + icon)
-    end
-
 end
-- 
cgit v1.2.3