Remove part of the Merkaartor code. This was never used and the Merkaartor editor is no longer maintained.

4 files changed, 3 insertions, 19 deletions

diff --git a/sources/master/interesting_tags.sql b/sources/master/interesting_tags.sql
index ee87402..160e1fb 100644
--- a/sources/master/interesting_tags.sql
+++ b/sources/master/interesting_tags.sql
@@ -12,7 +12,6 @@ ATTACH DATABASE '__DIR__/db/taginfo-db.db'                 AS db;
 ATTACH DATABASE '__DIR__/wiki/taginfo-wiki.db'             AS wiki;
 ATTACH DATABASE '__DIR__/josm/taginfo-josm.db'             AS josm; 
 ATTACH DATABASE '__DIR__/potlatch/taginfo-potlatch.db'     AS potlatch; 
-ATTACH DATABASE '__DIR__/merkaartor/taginfo-merkaartor.db' AS merkaartor; 
 
 -- ============================================================================
 
diff --git a/sources/master/master.sql b/sources/master/master.sql
index 1167d3a..8de9db0 100644
--- a/sources/master/master.sql
+++ b/sources/master/master.sql
@@ -13,7 +13,6 @@ ATTACH DATABASE '__DIR__/wiki/taginfo-wiki.db'             AS wiki;
 ATTACH DATABASE '__DIR__/languages/taginfo-languages.db'   AS languages;
 ATTACH DATABASE '__DIR__/josm/taginfo-josm.db'             AS josm; 
 ATTACH DATABASE '__DIR__/potlatch/taginfo-potlatch.db'     AS potlatch; 
-ATTACH DATABASE '__DIR__/merkaartor/taginfo-merkaartor.db' AS merkaartor; 
 
 -- ============================================================================
 
@@ -35,8 +34,7 @@ INSERT INTO sources SELECT 1, 1, * FROM db.source
               UNION SELECT 2, 1, * FROM wiki.source
               UNION SELECT 3, 1, * FROM languages.source
               UNION SELECT 4, 1, * FROM josm.source
-              UNION SELECT 5, 0, * FROM potlatch.source
-              UNION SELECT 6, 0, * FROM merkaartor.source;
+              UNION SELECT 5, 0, * FROM potlatch.source;
 
 DROP TABLE IF EXISTS master_stats;
 CREATE TABLE master_stats (
@@ -47,21 +45,18 @@ CREATE TABLE master_stats (
 INSERT INTO master_stats SELECT * FROM db.stats
                    UNION SELECT * FROM wiki.stats
                    UNION SELECT * FROM josm.stats
-                   UNION SELECT * FROM potlatch.stats
-                   UNION SELECT * FROM merkaartor.stats;
+                   UNION SELECT * FROM potlatch.stats;
 
 -- ============================================================================
 
 INSERT INTO db.keys (key) SELECT DISTINCT key FROM wiki.wikipages        WHERE key NOT IN (SELECT key FROM db.keys);
 INSERT INTO db.keys (key) SELECT DISTINCT k   FROM josm.josm_style_rules WHERE k   NOT IN (SELECT key FROM db.keys);
 -- potlatch XXX
--- INSERT INTO db.keys (key) SELECT DISTINCT key FROM merkaartor.keys       WHERE key NOT IN (SELECT key FROM db.keys);
 
 UPDATE db.keys SET in_wiki=1    WHERE key IN (SELECT distinct key FROM wiki.wikipages WHERE value IS NULL);
 UPDATE db.keys SET in_wiki_en=1 WHERE key IN (SELECT distinct key FROM wiki.wikipages WHERE value IS NULL AND lang='en');
 UPDATE db.keys SET in_josm=1    WHERE key IN (SELECT distinct k   FROM josm.josm_style_rules);
 -- potlatch XXX
-UPDATE db.keys SET in_merkaartor=1 WHERE key IN (SELECT key FROM merkaartor.keys);
 
 -- ============================================================================
 
diff --git a/taginfo-config-example.json b/taginfo-config-example.json
index 0e92424..fab2cb7 100644
--- a/taginfo-config-example.json
+++ b/taginfo-config-example.json
@@ -50,7 +50,7 @@
         // Note that this will NOT work for the "db" source! Well, you can download it,
         // but it will fail later, because the database is changed by the master.sql
         // scripts.
-        "download": "languages josm potlatch merkaartor wiki",
+        "download": "languages josm potlatch wiki",
         // These sources will be created from the actual sources.
         "create": "db",
         "db": {
diff --git a/web/lib/ui/keys.rb b/web/lib/ui/keys.rb
index f53c73b..1ffc8eb 100644
--- a/web/lib/ui/keys.rb
+++ b/web/lib/ui/keys.rb
@@ -49,16 +49,6 @@ 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('&nbsp;')
-#
-#        @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')