Commit: a7bfcd8cca29db5520944993851b6c685d113a55 - osmCutter (git)

巨大森林を分割する

Commit MetaInfo

• Revisão: a7bfcd8cca29db5520944993851b6c685d113a55 (tree)
• Hora: 2013-08-03 11:34:10
• Autor: hayashi.yuu <hayashi.yuu@gmai...>
• Commiter: hayashi.yuu

Mensagem de Log

WAYのaction='delete' に対応

Mudança Sumário

• modified: src/osm/jp/DbBigrelation.java
• modified: src/osm/jp/OsmNode.java
• modified: src/osm/jp/RelationCutter.java
• modified: src/osm/jp/Way.java

Diff

--- a/src/osm/jp/DbBigrelation.java
+++ b/src/osm/jp/DbBigrelation.java
@@ -61,6 +61,8 @@ public class DbBigrelation
 	 * @throws SQLException
 	 */
 	public static void create(Connection con) throws SQLException {
+		drop(con);
+
 		if (!isTable(con, "NODE")) {
 			create_NODE(con);
 		}
@@ -99,6 +101,7 @@ public class DbBigrelation
 	 * 
 	 * 		idref BIGINT NOT NULL
 	 * 		osmtype INTEGER
+	 * 		action	INT
 	 * 		timestamp VARCHAR(20)
 	 * 		uid BIGINT
 	 * 		user VARCHAR(64)
@@ -112,7 +115,7 @@ public class DbBigrelation
 	 * @throws SQLException
 	 */
 	public static boolean create_NODE(Connection con) throws SQLException {
-		String createSt = "CREATE TABLE NODE (idref BIGINT NOT NULL, osmtype INTEGER, timestamp VARCHAR(20), uid BIGINT, usr VARCHAR(64), visible VARCHAR(8), version VARCHAR(32), changeset BIGINT, lat DOUBLE, lon DOUBLE, CONSTRAINT node_pk PRIMARY KEY(idref));";
+		String createSt = "CREATE TABLE NODE (idref BIGINT NOT NULL, osmtype INTEGER, action INT, timestamp VARCHAR(20), uid BIGINT, usr VARCHAR(64), visible VARCHAR(8), version VARCHAR(32), changeset BIGINT, lat DOUBLE, lon DOUBLE, CONSTRAINT node_pk PRIMARY KEY(idref));";
 		Logger.logger.info(createSt);
 		PreparedStatement ps = con.prepareStatement(createSt);
 		try {
@@ -198,12 +201,12 @@ public class DbBigrelation
 	 * 		role VARCHAR(128)
 	 * 		relationid		BIGINT
 	 * 		cnt		DOUBLE
-	 * 
+	 * 		action INT
 	 * @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), relationid BIGINT, cnt DOUBLE);";
+		String createSt = "create table MEMBER (idref BIGINT NOT NULL, ref BIGINT NOT NULL, type VARCHAR(128), role VARCHAR(128), relationid BIGINT, cnt DOUBLE, action INT);";
 		Logger.logger.info(createSt);
 		PreparedStatement ps = con.prepareStatement(createSt);
 		try {
@@ -226,11 +229,18 @@ public class DbBigrelation
 	 * @throws SQLException
 	 */
 	public static void drop(Connection con) throws SQLException {
-		drop(con, "NODE");
-		drop(con, "TAG");
-		drop(con, "NDREF");
-		drop(con, "MEMBER");
-		drop(con, "WAY");
+		if (isTable(con, "NODE")) {
+			drop(con, "NODE");
+		}
+		if (isTable(con, "TAG")) {
+			drop(con, "TAG");
+		}
+		if (isTable(con, "NDREF")) {
+			drop(con, "NDREF");
+		}
+		if (isTable(con, "MEMBER")) {
+			drop(con, "MEMBER");
+		}
 	}
 	
 	/**
@@ -246,60 +256,6 @@ public class DbBigrelation
 		ps.close();
 	}
 		
-	/**
-	 * 
-	 * @param con
-	 * @param id
-	 * @param timestampStr
-	 * @param uidStr
-	 * @param userStr
-	 * @param visibleStr
-	 * @param versionStr
-	 * @param changesetStr
-	 * @param latStr
-	 * @param lonStr
-	 * @param osmtype
-	 * @throws SQLException
-	 */
-	public static void insert_NODE(Connection con,
-			String idStr,
-			String timestampStr,
-			String uidStr,
-			String userStr,
-			String visibleStr,
-			String versionStr,
-			String changesetStr,
-			String latStr,
-			String lonStr,
-			int osmtype) throws SQLException 
-	{
-		long idref = Long.parseLong(idStr);
-		if (idref == 0L) {
-			idref = DbBigrelation.getOsmnode_MinId(con);
-			idref = idref - 1L;
-			if (idref > 0) {
-				idref = -1;
-			}
-		}
-		PreparedStatement ps6 = con.prepareStatement("INSERT INTO node (idref,timestamp,uid,usr,visible,version,changeset,lat,lon,osmtype) VALUES (?,?,?,?,?,?,?,?,?,?)");
-		double lat = Double.parseDouble(latStr);
-		double lon = Double.parseDouble(lonStr); 
-		long uid = Long.parseLong(uidStr);
-		long changeset = Long.parseLong(changesetStr);
-		ps6.setLong(1, idref);
-		ps6.setString(2, timestampStr);
-		ps6.setLong(3, uid);
-		ps6.setString(4, userStr);
-		ps6.setString(5, visibleStr);
-		ps6.setString(6, versionStr);
-		ps6.setLong(7, changeset);
-		ps6.setDouble(8, lat);
-		ps6.setDouble(9, lon);
-		ps6.setInt(10, osmtype);
-		//System.out.println("INSERT INTO node(type="+ osmtype +" id="+ idStr +" lat="+ lat +", lon="+ lon +")");
-		ps6.executeUpdate();
-		ps6.close();
-	}
 
 	public static void insert_NODE(Connection con, OsmNode node) throws SQLException 
 	{
@@ -310,7 +266,7 @@ public class DbBigrelation
 				node.idref = -1;
 			}
 		}
-		PreparedStatement ps = con.prepareStatement("INSERT INTO node (idref,timestamp,uid,usr,visible,version,changeset,lat,lon,osmtype) VALUES (?,?,?,?,?,?,?,?,?,?)");
+		PreparedStatement ps = con.prepareStatement("INSERT INTO node (idref,timestamp,uid,usr,visible,version,changeset,lat,lon,osmtype,action) VALUES (?,?,?,?,?,?,?,?,?,?,?)");
 		ps.setLong(1, node.idref);
 		ps.setString(2, node.timestampStr);
 		ps.setLong(3, node.uid);
@@ -321,13 +277,21 @@ public class DbBigrelation
 		ps.setDouble(8, node.lat);
 		ps.setDouble(9, node.lon);
 		ps.setInt(10, DbBigrelation.OSM_NODE);
+		ps.setInt(11, node.action);
 		ps.executeUpdate();
 		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 (?,?,?,?,?,?,?,?)");
+		if (way.idref == 0L) {
+			way.idref = DbBigrelation.getWAY_MinId(con);
+			way.idref = way.idref - 1L;
+			if (way.idref >= 0) {
+				way.idref = -1;
+			}
+		}
+		PreparedStatement ps = con.prepareStatement("INSERT INTO node (idref,timestamp,uid,usr,visible,version,changeset,osmtype,action) VALUES (?,?,?,?,?,?,?,?,?)");
 		ps.setLong(1, way.idref);
 		ps.setString(2, way.timestampStr);
 		ps.setLong(3, way.uid);
@@ -336,6 +300,22 @@ public class DbBigrelation
 		ps.setString(6, way.versionStr);
 		ps.setLong(7, way.changeset);
 		ps.setInt(8, DbBigrelation.OSM_WAY);
+		ps.setInt(9, way.action);
+		ps.executeUpdate();
+		ps.close();
+	}
+
+	public static void insert_RELATION(Connection con, Relation node) throws SQLException 
+	{
+		PreparedStatement ps = con.prepareStatement("INSERT INTO node (idref,timestamp,uid,usr,visible,version,changeset,osmtype) VALUES (?,?,?,?,?,?,?,?)");
+		ps.setLong(1, node.id);
+		ps.setString(2, node.timestampStr);
+		ps.setLong(3, node.uid);
+		ps.setString(4, node.userStr);
+		ps.setString(5, node.visibleStr);
+		ps.setString(6, node.versionStr);
+		ps.setLong(7, node.changeset);
+		ps.setInt(8, DbBigrelation.OSM_RELATION);
 		ps.executeUpdate();
 		ps.close();
 	}
@@ -420,6 +400,29 @@ public class DbBigrelation
 		ps6.executeUpdate();
 		ps6.close();
 	}
+	
+	/**
+	 * WAYをOSMデータから削除する
+	 * 別途、WAYノードを事前に削除する必要があります。
+	 * 別途、リレーションのメンバーから削除する必要があります。
+	 * @param con
+	 * @param way
+	 * @throws SQLException
+	 */
+	public static void delete_WAY(Connection con, Way way) throws SQLException 
+	{
+		PreparedStatement ps = con.prepareStatement("update NODE set action=? where idref=? and osmtype=?");
+		ps.setInt(1, OsmNode.ACTION_DELETE);
+		ps.setLong(2, way.idref);
+		ps.setInt(3, DbBigrelation.OSM_WAY);
+		ps.executeUpdate();
+		ps.close();
+
+		ps = con.prepareStatement("delete from NDREF where idref=?");
+		ps.setLong(1, way.idref);
+		ps.executeUpdate();
+		ps.close();
+	}
 
 	/**
 	 * 'table.NODE'の内容をCSV形式にして標準出力に出力する
@@ -801,6 +804,7 @@ public class DbBigrelation
 			way.visibleStr = rset.getString("NODE.visible");
 			way.versionStr = rset.getString("NODE.version");
 			way.changeset = rset.getLong("NODE.changeset");
+			way.action = rset.getInt("NODE.action");
 			
 			ArrayList<NDref> nds = new ArrayList<NDref>();
 			DbBigrelation.getNDs(con, nds, way.idref);

--- a/src/osm/jp/OsmNode.java
+++ b/src/osm/jp/OsmNode.java
@@ -3,6 +3,10 @@ package osm.jp;
 import java.util.ArrayList;
 
 public class OsmNode {
+	public static final int ACTION_NON = 0;
+	public static final int ACTION_MODIFY = 1;
+	public static final int ACTION_DELETE = 2;
+
 	public long idref = 0L;
 	public String timestampStr = "";
 	public long uid = 0L;
@@ -12,6 +16,7 @@ public class OsmNode {
 	public double	lat = 0.0D;
 	public double lon = 0.0D;
 	public long changeset = 0L;
+	public int action = OsmNode.ACTION_NON;			
 	private double cnt = 0.0D;		// Table.NDREF (index counter)
 	
 	public ArrayList<Tag> tags = new ArrayList<Tag>();
@@ -27,6 +32,7 @@ public class OsmNode {
 		this.lon = 0.0D;
 		this.changeset = 0L;
 		this.cnt = 0.0D;
+		this.action = OsmNode.ACTION_NON;
 	}
 	
 	public OsmNode(OsmNode osmnode) {
@@ -41,10 +47,9 @@ public class OsmNode {
 		this.lon = osmnode.lon;
 		this.changeset = osmnode.changeset;
 		this.cnt = osmnode.cnt;
+		this.action = osmnode.action;
 	}
 	
-
-	
 	public void setCounter(double cnt) {
 		this.cnt = cnt;
 	}
@@ -75,8 +80,12 @@ public class OsmNode {
 		if (idref < 0) {
 			return ("id='"+ idref +"' action='modify' visible='"+ visibleStr +"' lat='"+ lat +"' lon='"+ lon +"'");
 		}
-		else {
-			return ("id='"+ idref +"' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"' lat='"+ lat +"' lon='"+ lon +"'");
+		if (action == OsmNode.ACTION_MODIFY) {
+			return ("id='"+ idref +"' action='modify' visible='"+ visibleStr +"' lat='"+ lat +"' lon='"+ lon +"'");
+		}
+		if (action == OsmNode.ACTION_DELETE) {
+			return ("id='"+ idref +"' action='delete' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"' lat='"+ lat +"' lon='"+ lon +"'");
 		}
+		return ("id='"+ idref +"' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"' lat='"+ lat +"' lon='"+ lon +"'");
 	}
 }

--- a/src/osm/jp/RelationCutter.java
+++ b/src/osm/jp/RelationCutter.java
@@ -167,6 +167,8 @@ public class RelationCutter {
 								}
 								
 								// 元のWAYをDBから削除する
+								DbBigrelation.delete_WAY(con, way);
+								way.waynodes = new ArrayList<OsmNode>();
 							}
 							else {
 								if (isLatBoundary(osmnode.lat)) {
@@ -486,7 +488,6 @@ public class RelationCutter {
 		String changesetStr = "";
 		String latStr = "0.0";
 		String lonStr = "0.0";
-		int osmtype = DbBigrelation.OSM_NODE;
 
 		NamedNodeMap nodeMap = node.getAttributes();
 		if ( null != nodeMap ) {
@@ -520,15 +521,40 @@ public class RelationCutter {
 			}
 			
 			if (node.getNodeName().equals("node")) {
-				osmtype = DbBigrelation.OSM_NODE;
+				OsmNode osm = new OsmNode();
+				osm.idref = Long.parseLong(idStr);
+				osm.timestampStr = timestampStr;
+				osm.uid = Long.parseLong(uidStr);
+				osm.userStr = userStr;
+				osm.visibleStr = visibleStr;
+				osm.versionStr = versionStr;
+				osm.changeset = Long.parseLong(changesetStr);
+				osm.lat = Double.parseDouble(latStr);
+				osm.lon = Double.parseDouble(lonStr);
+				DbBigrelation.insert_NODE(con, osm);
 			}
 			else if (node.getNodeName().equals("way")) {
-				osmtype = DbBigrelation.OSM_WAY;
+				Way osm = new Way();
+				osm.idref = Long.parseLong(idStr);
+				osm.timestampStr = timestampStr;
+				osm.uid = Long.parseLong(uidStr);
+				osm.userStr = userStr;
+				osm.visibleStr = visibleStr;
+				osm.versionStr = versionStr;
+				osm.changeset = Long.parseLong(changesetStr);
+				DbBigrelation.insert_WAY(con, osm);
 			}
 			else if (node.getNodeName().equals("relation")) {
-				osmtype = DbBigrelation.OSM_RELATION;
+				Relation osm = new Relation();
+				osm.id = Long.parseLong(idStr);
+				osm.timestampStr = timestampStr;
+				osm.uid = Long.parseLong(uidStr);
+				osm.userStr = userStr;
+				osm.visibleStr = visibleStr;
+				osm.versionStr = versionStr;
+				osm.changeset = Long.parseLong(changesetStr);
+				DbBigrelation.insert_RELATION(con, osm);
 			}
-			DbBigrelation.insert_NODE(con, idStr, timestampStr, uidStr, userStr, visibleStr, versionStr, changesetStr, latStr, lonStr, osmtype);
 		}
 	}
 

--- a/src/osm/jp/Way.java
+++ b/src/osm/jp/Way.java
@@ -25,6 +25,7 @@ public class Way {
 	public String visibleStr = "";
 	public String versionStr = "";
 	public long changeset = 0L;
+	public int action = OsmNode.ACTION_NON;
 	
 	ArrayList<Tag> tags = new ArrayList<Tag>();
 	ArrayList<OsmNode> waynodes = new ArrayList<OsmNode>();
@@ -37,6 +38,7 @@ public class Way {
 		this.visibleStr = "";
 		this.versionStr = "";
 		this.changeset = 0L;
+		this.action = OsmNode.ACTION_NON;
 	}
 	
 	public Way(Way source) {
@@ -47,6 +49,7 @@ public class Way {
 		this.visibleStr = source.visibleStr;
 		this.versionStr = source.versionStr;
 		this.changeset = source.changeset;
+		this.action = source.action;
 		
 		this.tags = new ArrayList<Tag>();
 		Iterator<Tag> itag = tags.iterator();
@@ -67,12 +70,15 @@ public class Way {
 		if (idref < 0) {
 			return ("id='"+ idref +"' action='modify' visible='"+ visibleStr +"'");
 		}
-		else {
-			return ("id='"+ idref +"' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"'");
+		if (action == OsmNode.ACTION_MODIFY) {
+			return ("id='"+ idref +"' action='modify' visible='"+ visibleStr +"'");
 		}
-		
+		if (action == OsmNode.ACTION_DELETE) {
+			return ("id='"+ idref +"' action='delete' timestamp='"+ timestampStr +"' uid='"+ uid +"' user='"+ userStr +"' visible='"+ visibleStr +"' version='"+ versionStr +"' changeset='"+ changeset +"'");
+		}
+		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);