Commit: ef1cf628906f00ee0943f393458a628e82c1e8b0 - osmCutter (git)

巨大森林を分割する

Commit MetaInfo

• Révision: ef1cf628906f00ee0943f393458a628e82c1e8b0 (tree)
• l'heure: 2013-10-29 08:45:32
• Auteur: hayashi.yuu <hayashi.yuu@gmai...>
• Commiter: hayashi.yuu

Message de Log

WAYの接続を改良

Change Summary

• add: src/hsqlmanager.sh
• modified: src/osm/jp/DbBigrelation.java
• modified: src/osm/jp/RelationCutter.java
• modified: src/osm/jp/Way.java

Modification

--- /dev/null
+++ b/src/hsqlmanager.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd database
+java -cp .:../../hsqldb.jar org.hsqldb.util.DatabaseManagerSwing
\ No newline at end of file

--- a/src/osm/jp/DbBigrelation.java
+++ b/src/osm/jp/DbBigrelation.java
@@ -404,6 +404,37 @@ public class DbBigrelation
 		ps6.executeUpdate();
 		ps6.close();
 	}
+	
+	/**
+	 * WAYを接続する
+	 * @param addway
+	 * @throws SQLException 
+	 */
+	public static void connect_WAY(Connection con, long firstwayid, long secondwayid) throws SQLException {
+		PreparedStatement ps1 = con.prepareStatement("select max(CNT) from NDREF where (idref = ?)");
+		ps1.setLong(1, firstwayid);
+		ResultSet rset1 = ps1.executeQuery();
+		if (rset1.next()) {
+			double firstcnt = rset1.getDouble(1);
+			
+			PreparedStatement ps2 = con.prepareStatement("select * from NDREF where (idref = ?)");
+			ps2.setLong(1, secondwayid);
+			ResultSet rset2 = ps2.executeQuery();
+			while (rset2.next()) {
+				double secondcnt = rset2.getDouble("CNT");
+				
+				PreparedStatement ps3 = con.prepareStatement("UPDATE NDREF SET idref=?, cnt=? WHERE (idref=?) and (CNT=?)");
+				ps3.setLong(1, firstwayid);
+				ps3.setDouble(2, firstcnt + secondcnt + 1.0d);
+				ps3.setLong(3, secondwayid);
+				ps3.setDouble(4, secondcnt);
+				ps3.executeUpdate();
+				ps3.close();
+			}
+			rset2.close();
+		}
+		rset1.close();
+	}
 
 	/**
 	 * 		idref BIGINT			member.idref
@@ -442,17 +473,25 @@ public class DbBigrelation
 	 */
 	public static void delete_NODE(Connection con, OsmNode node) throws SQLException 
 	{
-		PreparedStatement ps = con.prepareStatement("update NODE set action=? where idref=? and osmtype=?");
-		ps.setInt(1, OsmNode.ACTION_DELETE);
-		ps.setLong(2, node.idref);
-		ps.setInt(3, DbBigrelation.OSM_NODE);
-		ps.executeUpdate();
-		ps.close();
+		if (node.idref < 0) {
+			PreparedStatement ps1 = con.prepareStatement("delete from NODE where idref=?");
+			ps1.setLong(1, node.idref);
+			ps1.executeUpdate();
+			ps1.close();			
+		}
+		else {
+			PreparedStatement ps1 = con.prepareStatement("update NODE set action=? where idref=? and osmtype=?");
+			ps1.setInt(1, OsmNode.ACTION_DELETE);
+			ps1.setLong(2, node.idref);
+			ps1.setInt(3, DbBigrelation.OSM_NODE);
+			ps1.executeUpdate();
+			ps1.close();
+		}
 
-		ps = con.prepareStatement("delete from NDREF where idref=?");
-		ps.setLong(1, node.idref);
-		ps.executeUpdate();
-		ps.close();
+		PreparedStatement ps2 = con.prepareStatement("delete from NDREF where idref=?");
+		ps2.setLong(1, node.idref);
+		ps2.executeUpdate();
+		ps2.close();
 	}
 
 	/**
@@ -465,17 +504,25 @@ public class DbBigrelation
 	 */
 	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();
+		if (way.idref < 0) {
+			PreparedStatement ps1 = con.prepareStatement("delete from NODE where idref=?");
+			ps1.setLong(1, way.idref);
+			ps1.executeUpdate();
+			ps1.close();
+		}
+		else {
+			PreparedStatement ps1 = con.prepareStatement("update NODE set action=? where idref=? and osmtype=?");
+			ps1.setInt(1, OsmNode.ACTION_DELETE);
+			ps1.setLong(2, way.idref);
+			ps1.setInt(3, DbBigrelation.OSM_WAY);
+			ps1.executeUpdate();
+			ps1.close();
+		}
 
-		ps = con.prepareStatement("delete from NDREF where idref=?");
-		ps.setLong(1, way.idref);
-		ps.executeUpdate();
-		ps.close();
+		PreparedStatement ps2 = con.prepareStatement("delete from NDREF where idref=?");
+		ps2.setLong(1, way.idref);
+		ps2.executeUpdate();
+		ps2.close();
 	}
 
 	/**
@@ -778,6 +825,7 @@ public class DbBigrelation
 			result.visibleStr = rset.getString("visible");
 			result.versionStr = rset.getString("version");
 			result.changeset = rset.getLong("changeset");
+			result.action = rset.getInt("action");
 		}
 		rset.close();
 		return is;

--- a/src/osm/jp/RelationCutter.java
+++ b/src/osm/jp/RelationCutter.java
@@ -366,6 +366,7 @@ public class RelationCutter {
 				// MEMBER->WAY
 				Way way = new Way();
 				if (!DbBigrelation.getWay(con, way, member.ref)) {
+					Logger.logger.warning("WAY以外のメンバーがあります。(member:id="+ member.ref +")");
 					continue;
 				}
 			
@@ -382,6 +383,8 @@ public class RelationCutter {
 				OsmNode startNode = way.waynodes.get(0);
 				OsmNode endNode = way.waynodes.get(way.waynodes.size() -1);
 				if ((startNode.lat.compareTo(endNode.lat) == 0) && (startNode.lon.compareTo(endNode.lon) == 0)) {
+					// 既に始点と終点が一致しており、AREAとして閉じています。
+					Logger.logger.info("AREAとして閉じています。(wayid="+ way.idref +")");
 					continue;
 				}
 				else {

--- a/src/osm/jp/Way.java
+++ b/src/osm/jp/Way.java
@@ -93,6 +93,7 @@ public class Way {
 	
 	/**
 	 * WAYを接続する
+	 * 別途、リレーションのメンバーから削除する必要があります。
 	 * @param addway
 	 * @throws SQLException 
 	 */
@@ -103,5 +104,13 @@ public class Way {
 		if (lastnode.idref != addway.waynodes.get(0).idref) {
 			DbBigrelation.delete_NODE(con, lastnode);
 		}
+		
+		for (int i =0; i < addway.waynodes.size(); i++) {
+			this.waynodes.add(addway.waynodes.get(i));
+		}
+		addway.action = OsmNode.ACTION_DELETE;
+
+		// pending! データベース上のデータも更新する必要がある
+		DbBigrelation.connect_WAY(con, this.idref, addway.idref);
 	}
 }