From 3ffa0ee10bf7e7cacb2901a3e9859d7c5de44851 Mon Sep 17 00:00:00 2001
From: Paul Norman <penorman@mac.com>
Date: Sat, 7 Sep 2013 20:31:56 -0700
Subject: [PATCH 1/2] Re-order discarded.json for readability

Also splits the import-related into groups by import
---
 data/discarded.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/discarded.json b/data/discarded.json
index 18efdca5e..024e4cc45 100644
--- a/data/discarded.json
+++ b/data/discarded.json
@@ -1,19 +1,23 @@
 [
     "created_by",
+    "odbl",
+    "odbl:note",
+
     "tiger:upload_uuid",
     "tiger:tlid",
     "tiger:source",
     "tiger:separated",
+
     "geobase:datasetName",
     "geobase:uuid",
     "sub_sea:type",
-    "odbl",
-    "odbl:note",
+
     "yh:LINE_NAME",
     "yh:LINE_NUM",
     "yh:STRUCTURE",
     "yh:TOTYUMONO",
     "yh:TYPE",
     "yh:WIDTH_RANK",
+
     "SK53_bulk:load"
 ]

From 4cd79646878c24f3f0ece1371903a76e2366d722 Mon Sep 17 00:00:00 2001
From: Paul Norman <penorman@mac.com>
Date: Sat, 7 Sep 2013 20:32:39 -0700
Subject: [PATCH 2/2] Add KSJ2 tags to discard list

See http://lists.openstreetmap.org/pipermail/imports/2013-September/002133.html
---
 data/discarded.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/data/discarded.json b/data/discarded.json
index 024e4cc45..d31ab4698 100644
--- a/data/discarded.json
+++ b/data/discarded.json
@@ -12,6 +12,30 @@
     "geobase:uuid",
     "sub_sea:type",
 
+    "KSJ2:ADS",
+    "KSJ2:ARE",
+    "KSJ2:AdminArea",
+    "KSJ2:COP_label",
+    "KSJ2:DFD",
+    "KSJ2:INT",
+    "KSJ2:INT_label",
+    "KSJ2:LOC",
+    "KSJ2:LPN",
+    "KSJ2:OPC",
+    "KSJ2:PubFacAdmin",
+    "KSJ2:RAC",
+    "KSJ2:RAC_label",
+    "KSJ2:RIC",
+    "KSJ2:RIN",
+    "KSJ2:WSC",
+    "KSJ2:coordinate",
+    "KSJ2:curve_id",
+    "KSJ2:curve_type",
+    "KSJ2:filename",
+    "KSJ2:lake_id",
+    "KSJ2:lat",
+    "KSJ2:long",
+    "KSJ2:river_id",
     "yh:LINE_NAME",
     "yh:LINE_NUM",
     "yh:STRUCTURE",