diff options
| author | Jochen Topf <jochen@topf.org> | 2013-05-27 15:00:18 +0200 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2013-05-27 15:00:18 +0200 |
| commit | c456c0df0fefd5b8585fce4c12baecbe66b50b34 (patch) | |
| tree | 1c00edb37e6a0b248e83b43e2d9def9b7b3a4fbe /sources/master | |
| parent | c698a719a97fcbb43cbc317862f208dcd9ee5776 (diff) | |
| download | taginfo-c456c0df0fefd5b8585fce4c12baecbe66b50b34.tar taginfo-c456c0df0fefd5b8585fce4c12baecbe66b50b34.tar.gz | |
Remove part of the Merkaartor code. This was never used and the Merkaartor editor is no longer maintained.
Diffstat (limited to 'sources/master')
| -rw-r--r-- | sources/master/interesting_tags.sql | 1 | ||||
| -rw-r--r-- | sources/master/master.sql | 9 |
2 files changed, 2 insertions, 8 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); -- ============================================================================ |