diff --git a/src/osm/jp/coverage/busstop/Busstop.java b/src/osm/jp/coverage/busstop/Busstop.java
index cc8446d..9eb457b 100644
--- a/src/osm/jp/coverage/busstop/Busstop.java
+++ b/src/osm/jp/coverage/busstop/Busstop.java
@@ -464,51 +464,6 @@
- /**
- *
- *
- *
- * 1
- * 箱根登山バス
- * 小01
- *
- *
- *
- * @param briNode
- * @return
- */
- public static String[] anaCommJGD(Node briNode) {
- String[] rtn = new String[3];
- int vcnt = 0;
-
- NodeList nodes2 = briNode.getChildNodes();
- for (int i=0; i < nodes2.getLength(); i++) {
- Node node2 = nodes2.item(i);
- if (node2.getNodeName().equals("ksj:BusRouteInformation")) {
- NodeList nodes3 = node2.getChildNodes();
- for (int j=0; j < nodes3.getLength(); j++) {
- Node node3 = nodes3.item(j);
- if (node3.getNodeName().equals("ksj:busType")) {
- rtn[0] = new String(node3.getTextContent());
- vcnt++;
- }
- else if (node3.getNodeName().equals("ksj:busLineName")) {
- rtn[1] = new String(node3.getTextContent());
- vcnt++;
- }
- else if (node3.getNodeName().equals("ksj:busOperationCompany")) {
- rtn[2] = new String(node3.getTextContent());
- vcnt++;
- }
- }
- }
- }
-
- if (vcnt > 0) {
- return rtn;
- }
- return null;
- }
}
\ No newline at end of file
diff --git a/src/osm/jp/coverage/busstop/DbBusstop.java b/src/osm/jp/coverage/busstop/DbBusstop.java
index 2005bca..95b8f7f 100644
--- a/src/osm/jp/coverage/busstop/DbBusstop.java
+++ b/src/osm/jp/coverage/busstop/DbBusstop.java
@@ -16,7 +16,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import static osm.jp.coverage.busstop.Busstop.anaCommJGD;
public class DbBusstop {
public static final String TABLE_NAME = "bus_stop";
@@ -447,6 +446,56 @@
}
/**
+ *
+ *
+ *
+ * 1
+ * 箱根登山バス
+ * 小01
+ *
+ *
+ *
+ * @param briNode
+ * @return
+ */
+ public static String[] anaCommJGD(Node briNode) {
+ String[] rtn = new String[3];
+ int vcnt = 0;
+
+ NodeList nodes2 = briNode.getChildNodes();
+ for (int i=0; i < nodes2.getLength(); i++) {
+ Node node2 = nodes2.item(i);
+ if (node2.getNodeName().equals("ksj:BusRouteInformation")) {
+ NodeList nodes3 = node2.getChildNodes();
+ for (int j=0; j < nodes3.getLength(); j++) {
+ Node node3 = nodes3.item(j);
+ switch (node3.getNodeName()) {
+ case "ksj:busType":
+ rtn[0] = node3.getTextContent();
+ vcnt++;
+ break;
+ case "ksj:busLineName":
+ rtn[1] = node3.getTextContent();
+ vcnt++;
+ break;
+ case "ksj:busOperationCompany":
+ rtn[2] = node3.getTextContent();
+ vcnt++;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+
+ if (vcnt > 0) {
+ return rtn;
+ }
+ return null;
+ }
+
+ /**
* 'table.BUS_STOP'を新規に作る
* 既にテーブルが存在する時には何もしない
* @param conHsql