Commit: d657905b22beef4786d7ef00164f20023c50be58 - osmCutter (git)

巨大森林を分割する

Commit MetaInfo

• Revisão: d657905b22beef4786d7ef00164f20023c50be58 (tree)
• Hora: 2013-07-28 20:55:44
• Autor: hayashi.yuu <hayashi.yuu@gmai...>
• Commiter: hayashi.yuu

Mensagem de Log

分割点でWAYを分割

Mudança Sumário

• modified: osmCutter.sh
• modified: src/osm/jp/DbBigrelation.java
• modified: src/osm/jp/Member.java
• modified: src/osm/jp/OsmNode.java
• modified: src/osm/jp/Relation.java
• modified: src/osm/jp/RelationCutter.java
• modified: src/osm/jp/Way.java

Diff

--- a/osmCutter.sh
+++ b/osmCutter.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 rm -r database
-java -cp .:OsmCutter.jar:../hayashi_0225.jar:../hsqldb.jar osm.jp.RelationCutter natural_wood_kanagawa.osm
+# java -cp .:OsmCutter.jar:../hayashi_0225.jar:../hsqldb.jar osm.jp.RelationCutter natural_wood_kanagawa.osm
+java -cp .:OsmCutter.jar:../hayashi_0225.jar:../hsqldb.jar osm.jp.RelationCutter koubouyama159740689.osm
\ No newline at end of file

--- a/src/osm/jp/DbBigrelation.java
+++ b/src/osm/jp/DbBigrelation.java
@@ -167,12 +167,14 @@ public class DbBigrelation
 	 * 		ref BIGINT NOT NULL
 	 * 		type VARCHAR(128)
 	 * 		role VARCHAR(128)
+	 * 		relationid		BIGINT
+	 * 		cnt		DOUBLE
 	 * 
 	 * @param con
 	 * @throws SQLException
 	 */
 	public static void create_MEMBER(Connection con) throws SQLException {
-		String createSt = "create table MEMBER (idref BIGINT NOT NULL, ref BIGINT NOT NULL, type VARCHAR(128), role VARCHAR(128));";
+		String createSt = "create table MEMBER (idref BIGINT NOT NULL, ref BIGINT NOT NULL, type VARCHAR(128), role VARCHAR(128), relationid BIGINT, cnt DOUBLE);";
 		Logger.logger.info(createSt);
 		PreparedStatement ps = con.prepareStatement(createSt);
 		try {
@@ -280,6 +282,21 @@ public class DbBigrelation
 		ps.close();
 	}
 	
+	public static void insert_WAY(Connection con, Way way) throws SQLException 
+	{
+		PreparedStatement ps = con.prepareStatement("INSERT INTO node (idref,timestamp,uid,usr,visible,version,changeset,osmtype) VALUES (?,?,?,?,?,?,?,?)");
+		ps.setLong(1, way.idref);
+		ps.setString(2, way.timestampStr);
+		ps.setLong(3, way.uid);
+		ps.setString(4, way.userStr);
+		ps.setString(5, way.visibleStr);
+		ps.setString(6, way.versionStr);
+		ps.setLong(7, way.changeset);
+		ps.setInt(8, DbBigrelation.OSM_WAY);
+		ps.executeUpdate();
+		ps.close();
+	}
+
 	/**
 	 * 
 	 * 		idref BIGINT NOT NULL
@@ -339,27 +356,25 @@ public class DbBigrelation
 	 * 		role VARCHAR(128)
 	 * 
 	 * @param con
-	 * @param idStr
-	 * @param keyStr
-	 * @param valueStr
+	 * @param member
 	 * @throws SQLException
 	 */
-	public static void insert_MEMBER(Connection con,
-			long id,
-			long ref,
-			String type,
-			String role) throws SQLException 
+	public static void insert_MEMBER(Connection con, Member member) throws SQLException 
 	{
-		PreparedStatement ps6 = con.prepareStatement("INSERT INTO MEMBER (idref,ref,type,role) VALUES (?,?,?,?)");
-		ps6.setLong(1, id);
-		ps6.setLong(2, ref);
-		ps6.setString(3, type);
-		ps6.setString(4, role);
-		//System.out.println("MEMBER(id="+ id +" ref="+ ref +" type="+ type +" role="+ role +")");
+		if (member.cnt == 0.0D) {
+			member.cnt = DbBigrelation.getMEMBER_maxCNT(con, member.relationid) + 1.0D;
+		}
+		PreparedStatement ps6 = con.prepareStatement("INSERT INTO MEMBER (idref,ref,type,role,relationid,cnt) VALUES (?,?,?,?,?,?)");
+		ps6.setLong(1, member.idref);
+		ps6.setLong(2, member.ref);
+		ps6.setString(3, member.typeStr);
+		ps6.setString(4, member.roleStr);
+		ps6.setLong(5, member.relationid);
+		ps6.setDouble(6, member.cnt);
 		ps6.executeUpdate();
 		ps6.close();
 	}
-	
+
 	/**
 	 * 'table.NODE'の内容をCSV形式にして標準出力に出力する
 	 * 'table.TAG'の内容をCSV形式にして標準出力に出力する
@@ -813,7 +828,7 @@ public class DbBigrelation
 				ow.newLine();
 				while (ii.hasNext()) {
 					Tag tag = ii.next();
-					ow.write("    <node "+ tag.show() +" />");
+					ow.write("    <tag "+ tag.show() +" />");
 					ow.newLine();
 				}
 				ow.write("  </node>");
@@ -840,4 +855,55 @@ public class DbBigrelation
 		rset.close();
 		return idref;
 	}
+
+	/**
+	 * Table.NODE からNODE.IDが最小のID値を取り出す。
+	 * @param con
+	 * @return
+	 * @throws SQLException 
+	 */
+	public static long getWAY_MinId(Connection con) throws SQLException {
+		long idref = 0x7fffffffffffffffL;
+		PreparedStatement ps = con.prepareStatement("select min(idref) from NODE where osmtype="+ OSM_WAY);
+		ResultSet rset = ps.executeQuery();
+		if (rset.next()) {
+			idref = rset.getLong(1);
+		}
+		rset.close();
+		return idref;
+	}
+
+	/**
+	 * Table.MEMBER からMEMBER.IDが最小のID値を取り出す。
+	 * @param con
+	 * @return
+	 * @throws SQLException 
+	 */
+	public static long getMEMBER_MinId(Connection con) throws SQLException {
+		long idref = 0x7fffffffffffffffL;
+		PreparedStatement ps = con.prepareStatement("select min(idref) from MEMBER");
+		ResultSet rset = ps.executeQuery();
+		if (rset.next()) {
+			idref = rset.getLong(1);
+		}
+		rset.close();
+		return idref;
+	}
+	
+	/**
+	 * Table.MEMBER からMEMBER.IDが最小のID値を取り出す。
+	 * @param con
+	 * @return
+	 * @throws SQLException 
+	 */
+	public static double getMEMBER_maxCNT(Connection con, long relationid) throws SQLException {
+		double maxCnt = 0.0D;
+		PreparedStatement ps = con.prepareStatement("select max(cnt) from MEMBER where relationid="+ relationid);
+		ResultSet rset = ps.executeQuery();
+		if (rset.next()) {
+			maxCnt = rset.getLong(1);
+		}
+		rset.close();
+		return maxCnt;
+	}
 }
\ No newline at end of file

--- a/src/osm/jp/Member.java
+++ b/src/osm/jp/Member.java
@@ -10,8 +10,33 @@ public class Member {
 	public long ref = 0L;
 	public String typeStr = "";
 	public String roleStr = "";
+	public long relationid = 0L;
+	public double cnt = 0.0D;
 	
+	public Member() {
+		this.idref = 0L;
+		this.ref = 0L;
+		this.typeStr = "";
+		this.roleStr = "";
+		this.relationid = 0L;
+		this.cnt = 0.0D;
+	}
+	
+	public Member(Member source) {
+		this.idref = source.idref;
+		this.ref = source.ref;
+		this.typeStr = source.typeStr;
+		this.roleStr = source.roleStr;
+		this.relationid = source.relationid;
+		this.cnt = source.cnt;
+	}
+	
+	/**
+	 * <member type='way' ref='-223310' role='outer' />
+	 * <member type='way' ref='90563930' role='inner' />
+	 * @return
+	 */
 	public String show() {
-		return ("id='"+ idref +"' ref='"+ ref +"' type='"+ typeStr +"' role='"+ roleStr +"'");
+		return ("id='"+ idref +"' type='"+ typeStr +"' ref='"+ ref +"' role='"+ roleStr +"'");
 	}
 }

--- a/src/osm/jp/OsmNode.java
+++ b/src/osm/jp/OsmNode.java
@@ -1,5 +1,7 @@
 package osm.jp;
 
+import java.util.ArrayList;
+
 public class OsmNode {
 	public long idref = 0L;
 	public String timestampStr = "";
@@ -12,6 +14,8 @@ public class OsmNode {
 	public long changeset = 0L;
 	private double cnt = 0.0D;		// Table.NDREF (index counter)
 	
+	public ArrayList<Tag> tags = new ArrayList<Tag>();
+	
 	public OsmNode() {
 		this.idref = 0L;
 		this.timestampStr = "";
@@ -39,6 +43,8 @@ public class OsmNode {
 		this.cnt = osmnode.cnt;
 	}
 	
+
+	
 	public void setCounter(double cnt) {
 		this.cnt = cnt;
 	}
@@ -57,7 +63,7 @@ public class OsmNode {
 		//if (!this.timestampStr.equals(osmnode.timestampStr)) return false;
 		//if (this.uid != osmnode.uid) return false;
 		//if (!this.userStr.equals(osmnode.userStr)) return false;
-		//if (!this.visibleStr.equals(osmnode.visibleStr)) return false;
+		if (!this.visibleStr.equals(osmnode.visibleStr)) return false;
 		//if (!this.versionStr.equals(osmnode.versionStr)) return false;
 		if (this.lat != osmnode.lat) return false;
 		if (this.lon != osmnode.lon) return false;

--- a/src/osm/jp/Relation.java
+++ b/src/osm/jp/Relation.java
@@ -1,5 +1,9 @@
 package osm.jp;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+
 public class Relation {
 	public long id = 0L;
 	public String timestampStr = "";
@@ -9,7 +13,33 @@ public class Relation {
 	public String versionStr = "";
 	public long changeset = 0L;
 	
+	public ArrayList<Tag> tags = new ArrayList<Tag>();
+	public ArrayList<Member> members = new ArrayList<Member>();
+	
+	public int loadTag(Connection con) throws SQLException {
+		tags = new ArrayList<Tag>();
+		DbBigrelation.getTags(con, tags, this.id);
+		return tags.size();
+	}
+	
+	public int loadMember(Connection con) throws SQLException {
+		members = new ArrayList<Member>();
+		DbBigrelation.getMembers(con, members, this.id);
+		return members.size();
+	}
+	
+	/**
+	 * <relation id='-223340' action='modify' visible='true'>
+	 * <relation id='1331167' timestamp='2012-12-17T09:52:06Z' uid='621319' user='hayashi' visible='true' version='11' changeset='14303816'>
+	 * @return
+	 */
 	public String show() {
-		return ("id='"+ id +"' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"'");
+		if (this.id == 0L) {
+			// action='modify'
+			return ("id='"+ id +"' action='modify' visible='"+ visibleStr +"'");
+		}
+		else {
+			return ("id='"+ id +"' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"'");
+		}
 	}
 }

--- a/src/osm/jp/RelationCutter.java
+++ b/src/osm/jp/RelationCutter.java
@@ -10,12 +10,8 @@ import org.xml.sax.*;
 
 import java.io.*;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.Iterator;
 
 
@@ -42,7 +38,7 @@ public class RelationCutter {
 		/**
 		 * アプリケーション [ConvBusstop]
 		 * > java -jar ConvBusstop.jar <オプション>
-		 * 	オプション： -exp	実行する直前にデータベースを初期化する（省略可能）
+		 * 	オプション：	実行する直前にデータベースを初期化する（省略可能）
 		 */
 		if (args.length <= 0) {
 			Logger.logger.warning("インポートファイルが指定されていません。");
@@ -101,27 +97,111 @@ public class RelationCutter {
 								before = new OsmNode(osmnode);
 								continue;
 							}
+							OsmNode newnode = null;
 							do {
-								OsmNode newnode = bundary(con, before, osmnode);
+								newnode = bundary(con, before, osmnode);
 								if (newnode == null) {
 									before = new OsmNode(osmnode);
 								}
 								else {
-									// WAYにbundaryノードを挿入する
+									// WAYにboundaryノードを挿入する
 									newnode.setCounter((before.getCounter() + osmnode.getCounter()) / 2.0D);
 									DbBigrelation.insert_NDREF(con, way.idref, newnode.idref, newnode.getCounter());
 									
 									before = new OsmNode(newnode);
 								}
 							}
-							while (before.lat != osmnode.lat);
+							while (newnode != null);
 						}
 					}
 				}
 			}
 			
 			/*
-			 * Output wite from DATABASE to OUTPUT file.
+			 * 
+			 */
+			Logger.logger.info("リレーションを読み出します。");
+			Iterator<Relation> irelations = relations.iterator();
+			while (irelations.hasNext()) {
+				Relation relation = irelations.next();
+				relation.loadMember(con);
+				System.out.println("RELATION: "+ relation.show());
+				
+				Iterator<Member> iii = relation.members.iterator();
+				while (iii.hasNext()) {
+					Member member = iii.next();
+					
+					// MEMBER->WAY
+					Way way = new Way();
+					if (DbBigrelation.getWay(con, way, member.ref)) {
+						DbBigrelation.getTags(con, way.tags, way.idref);
+						DbBigrelation.getOsmnodes(con, way.waynodes, way.idref);
+						
+						Way newway = new Way(way);
+						newway.waynodes = new ArrayList<OsmNode>();
+						
+						// 分割点を調べて、分割点でWAYを分割する。
+						// WAYNODEの最初と最後は調べない
+						for (int i = 0; i < way.waynodes.size(); i++) {
+							OsmNode osmnode = way.waynodes.get(i);
+							if (i == 0) {
+								// 最初のノード
+								newway.waynodes.add(osmnode);
+							}
+							else if ((i+1) == way.waynodes.size()) {
+								// 最終のノード
+								newway.waynodes.add(osmnode);
+								
+								// 分割WAYをDATABASEに保存する
+								if (newway.idref <= 0) {
+									insertWAY2db(con, newway);
+									System.out.println("\tNew WAY: "+ newway.show());
+									
+									// NEWWAYをMEMBERに追加する
+									Member newmember = new Member(member);
+									newmember.idref = DbBigrelation.getMEMBER_MinId(con);
+									newmember.ref = newway.idref;
+									newmember.relationid = relation.id;
+									insertMEMBER2db(con, newmember);
+								}
+								
+								// 元のWAYをDBから削除する
+							}
+							else {
+								if (isLatBoundary(osmnode.lat)) {
+									// WAYをboundaryノードで分割する
+									OsmNode newnode = new OsmNode(osmnode);
+									newnode.idref = DbBigrelation.getOsmnode_MinId(con);
+									DbBigrelation.insert_NODE(con, newnode);
+									newway.waynodes.add(newnode);
+									
+									// NEWWAYをDBに追加する
+									insertWAY2db(con, newway);
+									System.out.println("\tNew WAY: "+ newway.show());
+									
+									// NEWWAYをMEMBERに追加する
+									Member newmember = new Member(member);
+									newmember.idref = DbBigrelation.getMEMBER_MinId(con);
+									newmember.ref = newway.idref;
+									newmember.relationid = relation.id;
+									insertMEMBER2db(con, newmember);
+									
+									// この分割ノードから開始される新しいWAYを生成する
+									newway = new Way(way);
+									newway.waynodes = new ArrayList<OsmNode>();
+									newway.waynodes.add(osmnode);
+								}
+								else {
+									newway.waynodes.add(osmnode);
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			/*
+			 * Output write from DATABASE to OUTPUT file.
 			 */
 			outputDb(con, "new.osm");
 		}
@@ -131,66 +211,84 @@ public class RelationCutter {
 	}
 	
 	public static OsmNode bundary(Connection con, OsmNode before, OsmNode osmnode) throws IOException, SQLException {
-		// exp) lat=35.549817,  lon=139.137575
 		double lat1 = getLatBundary(before.lat);
-		//double lon1 = getLonBundary(before.lon);
 		double lat2 = getLatBundary(osmnode.lat);
-		//double lon2 = getLonBundary(osmnode.lon);
 		if (lat1 == lat2) {
 			return null;
 		}
-		OsmNode bundary;
+		//double lon1 = getLonBundary(before.lon);
+		//double lon2 = getLonBundary(osmnode.lon);
 
-		if ((lat2 - lat1) < 0) {
-			// East to West
+		OsmNode bundary = null;
+
+		if ((lat2 - lat1) < 0.0D) {
+			// North to South
 			if ((lat1 == osmnode.lat) || (lat1 == before.lat)) {
 				return null;
 			}
 			
-			double delta = (lat1 - osmnode.lat) / (before.lat - osmnode.lat);
-			double dLon = (before.lon - osmnode.lon) * delta;
-			dLon = (double)(((long)(dLon * 10000000L)) / 10000000.0D);
-			
-			// Bundary (LAT,LON) = (lat1, dLon)
-			bundary = new OsmNode(before);
-			bundary.lat = lat1;
-			bundary.lon = osmnode.lon + dLon;
-			
-			System.out.println("["+ osmnode.lat +" <==("+ bundary.lat +":"+ bundary.lon +")<== "+ before.lat +"]");
+			double delta = (before.lat - lat1) / (before.lat - osmnode.lat);
+			if ((osmnode.lon - before.lon) >= 0.0D) {
+				// West to East
+				double dLon = (osmnode.lon - before.lon) * delta;
+				dLon = (double)(((long)(dLon * 10000000L)) / 10000000.0D);
+				bundary = new OsmNode(before);
+				bundary.lat = lat1;
+				bundary.lon = before.lon + dLon;
+			}
+			else {
+				// East to West
+				double dLon = (before.lon - osmnode.lon) * delta;
+				dLon = (double)(((long)(dLon * 10000000L)) / 10000000.0D);
+				bundary = new OsmNode(before);
+				bundary.lat = lat1;
+				bundary.lon = before.lon - dLon;
+			}
 		}
 		else {
-			// West to East
+			// South to North
 			if ((lat2 == before.lat) || (lat2 == osmnode.lat)) {
 				return null;
 			}
 			
 			double delta = (lat2 - before.lat) / (osmnode.lat - before.lat);
-			double dLon = (osmnode.lon - before.lon) * delta;
-			dLon = (double)(((long)(dLon * 10000000L)) / 10000000.0D);
-			
-			// Bundary (LAT,LON) = (lat2, dLon)
-			bundary = new OsmNode(before);
-			bundary.lat = lat2;
-			bundary.lon = before.lon + dLon;
-			
-			System.out.println("["+ before.lat +" ==>("+ bundary.lat +":"+ bundary.lon +")==> "+ osmnode.lat +"]");
+			if ((osmnode.lon - before.lon) >= 0.0D) {
+				// West to East
+				double dLon = (osmnode.lon - before.lon) * delta;
+				dLon = (double)(((long)(dLon * 10000000L)) / 10000000.0D);
+				bundary = new OsmNode(before);
+				bundary.lat = lat2;
+				bundary.lon = before.lon + dLon;
+			}
+			else {
+				// East to West
+				double dLon = (before.lon - osmnode.lon) * delta;
+				dLon = (double)(((long)(dLon * 10000000L)) / 10000000.0D);
+				bundary = new OsmNode(before);
+				bundary.lat = lat2;
+				bundary.lon = before.lon - dLon;
+			}
 		}
+		System.out.println("["+ before.lat +" ==>("+ bundary.lat +":"+ bundary.lon +")==> "+ osmnode.lat +"]");
 		
-		// 新規WAYをDBに追加する
+		// 新規NODEをDBに追加する
 		long nodeid = insertOsmNode2db(con, bundary);
 		System.out.println("\tNew Bundary node: "+ bundary.show());
 		bundary.idref = nodeid;
 		return bundary;
 	}
 	
+	public static boolean isLatBoundary(double lat) {
+		double latd = (lat - (int)lat) * 48.0D;
+		latd = (double)((int)latd / 48.0D);
+		latd = (double)(((long)(latd * 10000000L)) / 10000000.0D);
+		return (lat == latd);
+	}
+	
 	public static double getLatBundary(double lat) {
 		double latd = (lat - (int)lat) * 48.0D;
 		latd = (double)((int)latd / 48.0D);
 		latd = (double)(((long)(latd * 10000000L)) / 10000000.0D);
-		double bound = (double)((int)lat + latd);
-		if (bound == lat) {
-			return (bound - 0.0208333D);
-		}
 		return (double)((int)lat + latd);
 	}
 	
@@ -198,10 +296,6 @@ public class RelationCutter {
 		double lond = (lon - (int)lon) * 32.0D;
 		lond = (double)((int)lond / 32.0D);
 		lond = (double)(((long)(lond * 10000000L)) / 10000000.0D);
-		double bound = (double)((int)lon + lond);
-		if (bound == lon) {
-			return (bound - 0.0312500D);
-		}
 		return (double)((int)lon + lond);
 	}
 	
@@ -475,7 +569,7 @@ public class RelationCutter {
 	 * @throws IOException
 	 * @throws SQLException
 	 */
-	public static void importMEMBER(Connection con, Node node, long id) throws IOException, SQLException {
+	public static void importMEMBER(Connection con, Node node, long relationid) throws IOException, SQLException {
 		// node = MEMBER
 		String refStr = "";
 		String typeStr = "";
@@ -493,8 +587,14 @@ public class RelationCutter {
 			if ((attr = nodeMap.getNamedItem("role")) != null) {
 				roleStr = attr.getNodeValue();
 			}
+			Member member = new Member();
+			member.idref = DbBigrelation.getMEMBER_MinId(con);
+			member.ref = Long.parseLong(refStr);
+			member.typeStr = typeStr;
+			member.roleStr = roleStr;
+			member.relationid = relationid;
 			
-			DbBigrelation.insert_MEMBER(con, id, Long.parseLong(refStr), typeStr, roleStr);
+			DbBigrelation.insert_MEMBER(con, member);
 		}
 	}
 
@@ -521,78 +621,80 @@ public class RelationCutter {
 		}
 	}
 
+	/**
+	 * create new OSMNODE in database  
+	 * @param con
+	 * @param node
+	 * @return
+	 * @throws IOException
+	 * @throws SQLException
+	 */
 	public static long insertOsmNode2db(Connection con, OsmNode node) throws IOException, SQLException {
-		long id = DbBigrelation.getOsmnode_MinId(con);
-		if (id < 0) {
-			id = id - 1L;
-		}
-		else {
-			id = -1;
+		if (node.idref == 0L) {
+			long id = DbBigrelation.getOsmnode_MinId(con);
+			if (id < 0) {
+				id = id - 1L;
+			}
+			else {
+				id = -1;
+			}
+			node.idref = id;
 		}
-		node.idref = id;
 		DbBigrelation.insert_NODE(con, node);
-		return id;
+		DbBigrelation.insert_TAG(con, node.idref, "fixme", "node(id="+ node.idref +")");
+		return node.idref;
 	}
 	
 	/**
-	 * <gml:Point gml:id="n1">
-	 * 	<gml:pos>35.14591397 139.10569573</gml:pos>
-	 * </gml:Point>
-	 *
+	 * create new WAY in database  
 	 * @param con
-	 * @param node
+	 * @param way
+	 * @return
 	 * @throws IOException
 	 * @throws SQLException
 	 */
-	public static void showGmlPoint(Connection con, Node node) throws IOException, SQLException {
-		String positionStr = "";
-		String latStr = "";
-		String lonStr = "";
-		String idStr = "";
-
-		NamedNodeMap nodeMap = node.getAttributes();
-		if ( null != nodeMap ) {
-			for ( int j=0; j<nodeMap.getLength(); j++ ) {
-				if (nodeMap.item(j).getNodeName().equals("gml:id")) {
-					idStr = nodeMap.item(j).getNodeValue();
-				}
+	public static long insertWAY2db(Connection con, Way way) throws IOException, SQLException {
+		if (way.idref == 0L) {
+			long id = DbBigrelation.getOsmnode_MinId(con);
+			if (id < 0) {
+				id = id - 1L;
 			}
-		}
-
-		NodeList nodes = node.getChildNodes();
-		for (int i=0; i < nodes.getLength(); i++) {
-			Node node2 = nodes.item(i);
-			if (node2.getNodeName().equals("gml:pos")) {
-				positionStr = node2.getTextContent().trim();
-				String[] str4Ary = positionStr.split(" ");
-				latStr = str4Ary[0];
-				lonStr = str4Ary[1];
-				
-				PreparedStatement ps6 = con.prepareStatement("UPDATE bus_stop SET lat=?,lon=?,fixed=? WHERE idref=?");
-				double lat = Double.parseDouble(latStr);
-				double lon = Double.parseDouble(lonStr);
-				Logger.logger.info("UPDATE bus_stop SET lat='"+ latStr +"',lon='"+ lonStr +"',fixed='"+ 0 +"' WHERE idref='"+ idStr +"'");
-
-				ps6.setDouble(1, lat);
-				ps6.setDouble(2, lon);
-				ps6.setInt(3, 0);
-				ps6.setString(4, idStr);
-				ps6.executeUpdate();
-				ps6.close();
+			else {
+				id = -1;
 			}
+			way.idref = id;
 		}
+		DbBigrelation.insert_WAY(con, way);
+		DbBigrelation.insert_TAG(con, way.idref, "fixme", "way(id="+ way.idref +")");
+		
+		way.waynodes = new ArrayList<OsmNode>();
+		for (int i=0; i < way.waynodes.size(); i++) {
+			OsmNode waynode = way.waynodes.get(i);
+			DbBigrelation.insert_NDREF(con, way.idref, waynode.idref, (double)i);
+		}
+		return way.idref;
 	}
 
-	static boolean checkFile(File f) {
-		String name = f.getName();
-		if (!name.startsWith("P11-")) {
-			return false;
-		}
-		if (!name.toUpperCase().endsWith(".XML")) {
-			return false;
+	/**
+	 * create new WAY in database  
+	 * @param con
+	 * @param way
+	 * @return
+	 * @throws IOException
+	 * @throws SQLException
+	 */
+	public static long insertMEMBER2db(Connection con, Member member) throws IOException, SQLException {
+		if (member.idref == 0L) {
+			long id = DbBigrelation.getMEMBER_MinId(con);
+			if (id < 0) {
+				id = id - 1L;
+			}
+			else {
+				id = -1;
+			}
+			member.idref = id;
 		}
-		return true;
+		DbBigrelation.insert_MEMBER(con, member);
+		return member.idref;
 	}
-
-
 }
\ No newline at end of file

--- a/src/osm/jp/Way.java
+++ b/src/osm/jp/Way.java
@@ -1,5 +1,10 @@
 package osm.jp;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
 /**
  * 
  * <way id='161839750' 
@@ -21,8 +26,50 @@ public class Way {
 	public String versionStr = "";
 	public long changeset = 0L;
 	
+	ArrayList<Tag> tags = new ArrayList<Tag>();
+	ArrayList<OsmNode> waynodes = new ArrayList<OsmNode>();
+	
+	public Way() {
+		this.idref = 0L;
+		this.timestampStr = "";
+		this.uid = 0L;
+		this.userStr = "";
+		this.visibleStr = "";
+		this.versionStr = "";
+		this.changeset = 0L;
+	}
+	
+	public Way(Way source) {
+		this.idref = source.idref;
+		this.timestampStr = source.timestampStr;
+		this.uid = source.uid;
+		this.userStr = source.userStr;
+		this.visibleStr = source.visibleStr;
+		this.versionStr = source.versionStr;
+		this.changeset = source.changeset;
+		
+		this.tags = new ArrayList<Tag>();
+		Iterator<Tag> itag = tags.iterator();
+		while (itag.hasNext()) {
+			Tag tag = itag.next();
+			this.tags.add(tag);
+		}
+		
+		this.waynodes = new ArrayList<OsmNode>();
+		Iterator<OsmNode> inode = waynodes.iterator();
+		while (inode.hasNext()) {
+			OsmNode waynode = inode.next();
+			this.waynodes.add(waynode);
+		}
+	}
+	
 	public String show() {
 		return ("id='"+ idref +"' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"'");
 	}
 
+	public int loadTag(Connection con) throws SQLException {
+		tags = new ArrayList<Tag>();
+		DbBigrelation.getTags(con, tags, this.idref);
+		return tags.size();
+	}
 }