Commit: e6692cd0b0c5142c5908bb2a1d28639724794342 - osmCutter (git)

巨大森林を分割する

Commit MetaInfo

• Revisión: e6692cd0b0c5142c5908bb2a1d28639724794342 (tree)
• Tiempo: 2013-08-18 14:15:32
• Autor: hayashi.yuu <hayashi.yuu@gmai...>
• Commiter: hayashi.yuu

Log Message

WAY分割に成功（outerのみ）

Cambiar Resumen

• modified: new.osm
• modified: src/osm/jp/RelationCutter.java

Diferencia incremental

--- a/new.osm
+++ b/new.osm
@@ -1319,6 +1319,7 @@
     <nd ref='-5' idref='-18' cnt='0.0' />
     <nd ref='1715711433' idref='-18' cnt='1.0' />
     <nd ref='-17' idref='-18' cnt='2.0' />
+    <nd ref='-1' idref='-18' cnt='3.0' />
     <tag id='-18' k='fixme' v='way(id=-18)' />
   </way>
   <way id='-16' action='modify' visible='true'>
@@ -1330,6 +1331,7 @@
     <nd ref='1715711430' idref='-16' cnt='5.0' />
     <nd ref='1715711432' idref='-16' cnt='6.0' />
     <nd ref='-15' idref='-16' cnt='7.0' />
+    <nd ref='-4' idref='-16' cnt='8.0' />
     <tag id='-16' k='fixme' v='way(id=-16)' />
   </way>
   <way id='-14' action='modify' visible='true'>
@@ -1774,12 +1776,14 @@
     <nd ref='1705779772' idref='-14' cnt='438.0' />
     <nd ref='1049473666' idref='-14' cnt='439.0' />
     <nd ref='-13' idref='-14' cnt='440.0' />
+    <nd ref='-5' idref='-14' cnt='441.0' />
     <tag id='-14' k='fixme' v='way(id=-14)' />
   </way>
   <way id='-12' action='modify' visible='true'>
     <nd ref='-2' idref='-12' cnt='0.0' />
     <nd ref='1710768775' idref='-12' cnt='1.0' />
     <nd ref='-11' idref='-12' cnt='2.0' />
+    <nd ref='-2' idref='-12' cnt='3.0' />
     <tag id='-12' k='fixme' v='way(id=-12)' />
   </way>
   <way id='-10' action='modify' visible='true'>
@@ -1796,6 +1800,7 @@
     <nd ref='1724722606' idref='-10' cnt='10.0' />
     <nd ref='1724722605' idref='-10' cnt='11.0' />
     <nd ref='-9' idref='-10' cnt='12.0' />
+    <nd ref='-3' idref='-10' cnt='13.0' />
     <tag id='-10' k='fixme' v='way(id=-10)' />
   </way>
   <way id='-8' action='modify' visible='true'>
@@ -2187,6 +2192,7 @@
     <nd ref='1710909178' idref='-8' cnt='385.0' />
     <nd ref='1050517744' idref='-8' cnt='386.0' />
     <nd ref='-7' idref='-8' cnt='387.0' />
+    <nd ref='-6' idref='-8' cnt='388.0' />
     <tag id='-8' k='fixme' v='way(id=-8)' />
   </way>
   <way id='159740689' action='delete' timestamp='2012-04-22T01:32:46Z' uid='621319' user='hayashi' visible='true' version='22' changeset='11379488'>

--- a/src/osm/jp/RelationCutter.java
+++ b/src/osm/jp/RelationCutter.java
@@ -331,13 +331,12 @@ public class RelationCutter {
 		ps.setInt(3, DbBigrelation.OSM_NODE);
 		ResultSet rset = ps.executeQuery();
 		if (rset.next()) {
-			double lon = rset.getLong("NODE.lon");
+			double lon = rset.getDouble("NODE.lon");
 			Logger.logger.info("対応する分割点があります。("+ lastnode.lat +","+ lon +")");
 			
-			PreparedStatement ps2 = con.prepareStatement("SELECT NDREF.idref FROM NDREF,NODE WHERE ((NODE.lat=?) and (NODE.lon=?) and (NODE.osmtype=?) and (NDREF.ref=NODE.idref))");
+			PreparedStatement ps2 = con.prepareStatement("SELECT NDREF.idref FROM NDREF,NODE WHERE ((NODE.lat=?) and (NODE.lon=?) and (NDREF.ref=NODE.idref))");
 			ps2.setDouble(1, lastnode.lat);
 			ps2.setDouble(2, lon);
-			ps2.setInt(3, DbBigrelation.OSM_NODE);
 			ResultSet rset2 = ps2.executeQuery();
 			while (rset2.next()) {
 				long wayid = rset2.getLong("NDREF.idref");