diff --git a/src/osm/jp/api/HttpPOST.java b/src/osm/jp/api/HttpPOST.java
index a8d0092..c354073 100644
--- a/src/osm/jp/api/HttpPOST.java
+++ b/src/osm/jp/api/HttpPOST.java
@@ -18,10 +18,14 @@
 		double maxlat = 35.66d;
         double minlon = 138.99d;
 		double maxlon = 139.79d;
-        getCapabilities(new File("."), minlat, maxlat, minlon, maxlon);
+        getCapabilities(new File("output.xml"), "highway", "bus_stop", minlat, maxlat, minlon, maxlon);
+        getCapabilities(new File("output.xml"), "highway", "disused:bus_stop", minlat, maxlat, minlon, maxlon);
+        getCapabilities(new File("output.xml"), "amenity", "bus_station", minlat, maxlat, minlon, maxlon);
+        getCapabilities(new File("output.xml"), "public_transport", "platform", minlat, maxlat, minlon, maxlon);
+        getCapabilities(new File("output.xml"), "public_transport", "stop_position", minlat, maxlat, minlon, maxlon);
     }
 	
-	public static void getCapabilities(File oFile, double minLat, double maxLat, double minLon, double maxLon) throws MalformedURLException, ProtocolException, IOException {
+	public static void getCapabilities(File oFile, String key, String value, double minLat, double maxLat, double minLon, double maxLon) throws MalformedURLException, ProtocolException, IOException {
 		System.out.println(host + "/api/interpreter");
         URL url = new URL(host + "/api/interpreter");
 
@@ -37,36 +41,10 @@
         PrintWriter pw = new PrintWriter(new BufferedWriter(new OutputStreamWriter(urlconn.getOutputStream(), "utf-8")));
         outputWriter(pw, "<osm-script timeout=\"900\" element-limit=\"1073741824\">");
         outputWriter(pw, " <union>");
-        /*
         outputWriter(pw, "  <query type=\"node\">");
-        outputWriter(pw, "   <has-kv k=\"amenity\" v=\"bus_station\"/>");
+        outputWriter(pw, "   <has-kv k=\""+ key +"\" v=\""+ value +"\"/>");
         outputWriter(pw, "   <bbox-query s=\"" + minLat + "\" n=\"" + maxLat + "\" w=\"" + minLon + "\" e=\"" + maxLon + "\"/>");
         outputWriter(pw, "  </query>");
-         */
-        outputWriter(pw, "  <query type=\"node\">");
-        outputWriter(pw, "   <has-kv k=\"highway\" v=\"bus_stop\"/>");
-        outputWriter(pw, "   <bbox-query s=\"" + minLat + "\" n=\"" + maxLat + "\" w=\"" + minLon + "\" e=\"" + maxLon + "\"/>");
-        outputWriter(pw, "  </query>");
-        /*
-        outputWriter(pw, "  <query type=\"node\">");
-        outputWriter(pw, "   <has-kv k=\"public_transport\" v=\"platform\"/>");
-        outputWriter(pw, "   <has-kv k=\"bus\" v=\"yes\"/>");
-        outputWriter(pw, "   <bbox-query s=\"" + minLat + "\" n=\"" + maxLat + "\" w=\"" + minLon + "\" e=\"" + maxLon + "\"/>");
-        outputWriter(pw, "  </query>");
-        */
-        /*
-        outputWriter(pw, "  <query type=\"node\">");
-        outputWriter(pw, "   <has-kv k=\"public_transport\" v=\"stop_position\"/>");
-        outputWriter(pw, "   <has-kv k=\"bus\" v=\"yes\"/>");
-        outputWriter(pw, "   <bbox-query s=\"" + minLat + "\" n=\"" + maxLat + "\" w=\"" + minLon + "\" e=\"" + maxLon + "\"/>");
-        outputWriter(pw, "  </query>");
-         */
-        /*
-        outputWriter(pw, "  <query type=\"node\">");
-        outputWriter(pw, "   <has-kv k=\"highway\" v=\"disused:bus_stop\"/>");
-        outputWriter(pw, "   <bbox-query s=\"" + minLat + "\" n=\"" + maxLat + "\" w=\"" + minLon + "\" e=\"" + maxLon + "\"/>");
-        outputWriter(pw, "  </query>");
-         */
         outputWriter(pw, " </union>");
         outputWriter(pw, " <print/>");
         outputWriter(pw, "</osm-script>");
diff --git a/src/osm/jp/coverage/busstop/Busstop.java b/src/osm/jp/coverage/busstop/Busstop.java
index ee4e8fc..287fbcc 100644
--- a/src/osm/jp/coverage/busstop/Busstop.java
+++ b/src/osm/jp/coverage/busstop/Busstop.java
@@ -27,7 +27,6 @@
 
 	// 近くのバス停を探す範囲（バス停を中心としたNEER×２ｍ四方の領域
 	static final int NEER = 150;		// 150m(0.15km)
-	static boolean nocheck = false;
 	static boolean update = false;
 	
 	public static SimpleDateFormat timeStampFmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
@@ -36,7 +35,6 @@
 	 * メイン
 	 *
 	 *	java -cp .:ConvBusstop.jar:hayashi_0225.jar:hsqldb_2.2.9.jar osm.jp.ConvBusstop <option>
-	 *		OPTION: -nocheck	OSMデータ上に既存のバス停が存在するかどうかをチェックしない
 	 *		OPTION: -check	OSMデータ上に既存のバス停が存在するかどうかをチェックする
 	 *
 	 * @throws IOException
@@ -49,12 +47,6 @@
 	public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException, TransformerException
 	{
 		for (int i=0; i < args.length; i++) {
-			if (args[i].equals("-check")) {
-				Busstop.nocheck = false;
-			}
-			else if (args[i].equals("-nocheck")) {
-				Busstop.nocheck = true;
-			}
 			if (args[i].equals("-update")) {
 				Busstop.update = true;
 			}
@@ -137,58 +129,56 @@
 				 * 既存のOSMバス停を読み込む
 				 * 		--> 'existing.xml'
 				 */
-				if (!Busstop.nocheck) {
-					/*
-					 * 既存のOSMデータファイルがなければ、新たにダウンロードする。
-					 * OSMデータファイルがあるときは、ダウンロードしないでそれを使う。
-					 */
-					File existingFile = new File(gmldir, String.format("existing_%02d.xml", areacode));
-					if (!existingFile.isFile() || Busstop.update) {
-						if (existingFile.isFile()) {
-							existingFile.delete();
-						}
-						
-						/**
-						 * インポートしたデータの緯度経度範囲を読み取る
-						 */
-						double maxLat = -90.0D;
-						double minLat = 90.0D;
-						double maxLon = -180.0D;
-						double minLon = 180.0D;
-						PreparedStatement ps8;
-						if (Busstop.update) {
-							ps8 = conPost.prepareStatement("SELECT gid,name,fixed,ST_X(geom) lon, ST_Y(geom) lat FROM t_busstop WHERE area=?");
-							ps8.setInt(1, areacode);
-						}
-						else {
-							ps8 = con.prepareStatement("SELECT lat,lon FROM bus_stop");
-						}
-						ResultSet rset8 = ps8.executeQuery();
-						while (rset8.next()) {
-							Double lat = rset8.getDouble("lat");
-							Double lon = rset8.getDouble("lon");
-
-							if (lat > maxLat) {
-								maxLat = lat;
-							}
-							if (lon > maxLon) {
-								maxLon = lon;
-							}
-							if (lat < minLat) {
-								minLat = lat;
-							}
-							if (lon < minLon) {
-								minLon = lon;
-							}
-						}
-						rset8.close();
-						
-						/**
-						 * OSM OverPassAPI を使って、既存のOSMバス停のデータを取得して、「existing.xml」に出力する
-						 */
-						System.out.println("AREA: "+ areacode);
-						HttpPOST.getCapabilities(existingFile, minLat, maxLat, minLon, maxLon);
+				/*
+				 * 既存のOSMデータファイルがなければ、新たにダウンロードする。
+				 * OSMデータファイルがあるときは、ダウンロードしないでそれを使う。
+				 */
+				File existingFile = new File(gmldir, String.format("existing_%02d.xml", areacode));
+				if (!existingFile.isFile() || Busstop.update) {
+					if (existingFile.isFile()) {
+						existingFile.delete();
 					}
+					
+					/**
+					 * インポートしたデータの緯度経度範囲を読み取る
+					 */
+					double maxLat = -90.0D;
+					double minLat = 90.0D;
+					double maxLon = -180.0D;
+					double minLon = 180.0D;
+					PreparedStatement ps8;
+					if (Busstop.update) {
+						ps8 = conPost.prepareStatement("SELECT gid,name,fixed,ST_X(geom) lon, ST_Y(geom) lat FROM t_busstop WHERE area=?");
+						ps8.setInt(1, areacode);
+					}
+					else {
+						ps8 = con.prepareStatement("SELECT lat,lon FROM bus_stop");
+					}
+					ResultSet rset8 = ps8.executeQuery();
+					while (rset8.next()) {
+						Double lat = rset8.getDouble("lat");
+						Double lon = rset8.getDouble("lon");
+
+						if (lat > maxLat) {
+							maxLat = lat;
+						}
+						if (lon > maxLon) {
+							maxLon = lon;
+						}
+						if (lat < minLat) {
+							minLat = lat;
+						}
+						if (lon < minLon) {
+							minLon = lon;
+						}
+					}
+					rset8.close();
+					
+					/**
+					 * OSM OverPassAPI を使って、既存のOSMバス停のデータを取得して、「existing.xml」に出力する
+					 */
+					System.out.println("AREA: "+ areacode);
+					HttpPOST.getCapabilities(existingFile, minLat, maxLat, minLon, maxLon);
 					readExistingFile(con, existingFile);
 					
 					PreparedStatement ps1;