Changeset 8510 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
r7937 r8510 45 45 DataSet source = new DataSet(); 46 46 Node n1 = new Node(1); 47 Node n2 = new Node(new LatLon(10.0, 10.0));48 n2.put("name", "n2");47 Node n2 = new Node(new LatLon(10.0, 10.0)); 48 n2.put("name", "n2"); 49 49 Node n3 = new Node(3); 50 Node n4 = new Node(new LatLon(20.0, 20.0));51 n4.put("name", "n4");50 Node n4 = new Node(new LatLon(20.0, 20.0)); 51 n4.put("name", "n4"); 52 52 source.addPrimitive(n1); 53 53 source.addPrimitive(n2); 54 54 source.addPrimitive(n3); 55 55 source.addPrimitive(n4); 56 source.setSelected(n1, n2);56 source.setSelected(n1, n2); 57 57 58 58 MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); … … 61 61 assertEquals(2, hull.getNodes().size()); 62 62 63 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE);63 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE); 64 64 assertNotNull(p); 65 65 assertEquals(p.getClass(), Node.class); 66 66 67 p = hull.getPrimitiveById(3, OsmPrimitiveType.NODE);67 p = hull.getPrimitiveById(3, OsmPrimitiveType.NODE); 68 68 assertNull(p); 69 69 … … 74 74 assertNull(p); 75 75 } 76 77 76 78 77 @Test … … 95 94 assertEquals(2, hull.getNodes().size()); 96 95 97 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE);96 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE); 98 97 assertNotNull(p); 99 98 assertEquals(p.getClass(), Node.class); 100 99 101 p = hull.getPrimitiveById(2, OsmPrimitiveType.NODE);100 p = hull.getPrimitiveById(2, OsmPrimitiveType.NODE); 102 101 assertNotNull(p); 103 102 assertEquals(p.getClass(), Node.class); … … 119 118 source.addPrimitive(n2); 120 119 source.addPrimitive(w1); 121 source.setSelected(w1, n1,n2);120 source.setSelected(w1, n1, n2); 122 121 123 122 MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); … … 127 126 assertEquals(2, hull.getNodes().size()); 128 127 129 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE);128 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE); 130 129 assertNotNull(p); 131 130 assertEquals(p.getClass(), Node.class); … … 135 134 assertEquals(p.getClass(), Node.class); 136 135 137 p = hull.getPrimitiveById(3, OsmPrimitiveType.WAY);136 p = hull.getPrimitiveById(3, OsmPrimitiveType.WAY); 138 137 assertNotNull(p); 139 138 assertEquals(p.getClass(), Way.class); … … 164 163 Node n20 = new Node(20, 1); 165 164 n20.setCoor(new LatLon(0, 0)); 166 r1.addMember(new RelationMember("node-20", n20));165 r1.addMember(new RelationMember("node-20", n20)); 167 166 Way w30 = new Way(30, 1); 168 167 Node n21 = new Node(21); … … 170 169 Node n22 = new Node(22); 171 170 w30.addNode(n22); 172 r1.addMember(new RelationMember("way-30", w30));171 r1.addMember(new RelationMember("way-30", w30)); 173 172 Relation r40 = new Relation(40); 174 173 r1.addMember(new RelationMember("relation-40", r40)); … … 179 178 source.addPrimitive(r40); 180 179 source.addPrimitive(r1); 181 source.setSelected(r1, n20,w30,r40);180 source.setSelected(r1, n20, w30, r40); 182 181 183 182 MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); … … 192 191 assertEquals(p.getClass(), Relation.class); 193 192 194 Way w = (Way) hull.getPrimitiveById(30,OsmPrimitiveType.WAY);193 Way w = (Way) hull.getPrimitiveById(30, OsmPrimitiveType.WAY); 195 194 assertNotNull(w); 196 195 assertEquals(2, w.getNodesCount()); 197 Node n = (Node) hull.getPrimitiveById(21, OsmPrimitiveType.NODE);196 Node n = (Node) hull.getPrimitiveById(21, OsmPrimitiveType.NODE); 198 197 assertNotNull(n); 199 198 assertTrue(w.containsNode(n)); 200 199 201 n = (Node) hull.getPrimitiveById(22,OsmPrimitiveType.NODE);200 n = (Node) hull.getPrimitiveById(22, OsmPrimitiveType.NODE); 202 201 assertNotNull(n); 203 202 assertTrue(w.containsNode(n)); 204 203 205 Relation r = (Relation) hull.getPrimitiveById(40,OsmPrimitiveType.RELATION);206 assertNotNull(r); 207 208 r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);204 Relation r = (Relation) hull.getPrimitiveById(40, OsmPrimitiveType.RELATION); 205 assertNotNull(r); 206 207 r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 209 208 assertNotNull(r); 210 209 assertEquals(3, r.getMembersCount()); 211 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20, OsmPrimitiveType.NODE));210 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20, OsmPrimitiveType.NODE)); 212 211 assertTrue(r.getMembers().contains(m)); 213 212 m = new RelationMember("way-30", hull.getPrimitiveById(30, OsmPrimitiveType.WAY)); … … 222 221 Relation r1 = new Relation(1, 1); 223 222 Node n20 = new Node(20); 224 r1.addMember(new RelationMember("node-20", n20));223 r1.addMember(new RelationMember("node-20", n20)); 225 224 Way w30 = new Way(30, 1); 226 225 Node n21; … … 228 227 Node n22; 229 228 w30.addNode(n22 = new Node(22)); 230 r1.addMember(new RelationMember("way-30", w30));229 r1.addMember(new RelationMember("way-30", w30)); 231 230 Relation r40 = new Relation(40); 232 231 r1.addMember(new RelationMember("relation-40", r40)); … … 250 249 assertEquals(p.getClass(), Relation.class); 251 250 252 Way w = (Way) hull.getPrimitiveById(30, OsmPrimitiveType.WAY);251 Way w = (Way) hull.getPrimitiveById(30, OsmPrimitiveType.WAY); 253 252 assertNotNull(w); 254 253 assertTrue(w.isIncomplete()); 255 254 256 255 257 Node n = (Node) hull.getPrimitiveById(21,OsmPrimitiveType.NODE);256 Node n = (Node) hull.getPrimitiveById(21, OsmPrimitiveType.NODE); 258 257 assertNull(n); 259 258 260 n = (Node) hull.getPrimitiveById(22, OsmPrimitiveType.NODE);259 n = (Node) hull.getPrimitiveById(22, OsmPrimitiveType.NODE); 261 260 assertNull(n); 262 261 263 Relation r = (Relation) hull.getPrimitiveById(40, OsmPrimitiveType.RELATION);262 Relation r = (Relation) hull.getPrimitiveById(40, OsmPrimitiveType.RELATION); 264 263 assertNotNull(r); 265 264 assertTrue(r.isIncomplete()); 266 265 267 r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);266 r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 268 267 assertNotNull(r); 269 268 assertEquals(3, r.getMembersCount()); … … 281 280 Relation r1 = new Relation(); 282 281 r1.put("name", "r1"); 283 Node n20 = new Node(new LatLon(20.0, 20.0));282 Node n20 = new Node(new LatLon(20.0, 20.0)); 284 283 n20.put("name", "n20"); 285 r1.addMember(new RelationMember("node-20", n20));284 r1.addMember(new RelationMember("node-20", n20)); 286 285 287 286 Way w30 = new Way(); 288 287 w30.put("name", "w30"); 289 288 Node n21; 290 w30.addNode(n21 = new Node(new LatLon(21.0, 21.0)));291 n21.put("name", "n21");289 w30.addNode(n21 = new Node(new LatLon(21.0, 21.0))); 290 n21.put("name", "n21"); 292 291 Node n22; 293 w30.addNode(n22 = new Node(new LatLon(22.0, 22.0)));294 n22.put("name", "n22");295 r1.addMember(new RelationMember("way-30", w30));292 w30.addNode(n22 = new Node(new LatLon(22.0, 22.0))); 293 n22.put("name", "n22"); 294 r1.addMember(new RelationMember("way-30", w30)); 296 295 Relation r40 = new Relation(); 297 296 r40.put("name", "r40"); … … 317 316 assertEquals(p.getClass(), Relation.class); 318 317 319 Way w = (Way) lookupByName(hull.getWays(), "w30");318 Way w = (Way) lookupByName(hull.getWays(), "w30"); 320 319 assertNotNull(w); 321 320 assertEquals(2, w.getNodesCount()); 322 321 323 Node n = (Node) lookupByName(hull.getNodes(), "n21");322 Node n = (Node) lookupByName(hull.getNodes(), "n21"); 324 323 assertNotNull(n); 325 324 assertTrue(w.containsNode(n)); 326 325 327 n = (Node) lookupByName(hull.getNodes(), "n22");326 n = (Node) lookupByName(hull.getNodes(), "n22"); 328 327 assertNotNull(n); 329 328 assertTrue(w.containsNode(n)); 330 329 331 Relation r = (Relation) lookupByName(hull.getRelations(), "r40");332 assertNotNull(r); 333 334 r = (Relation) lookupByName(hull.getRelations(), "r1");330 Relation r = (Relation) lookupByName(hull.getRelations(), "r40"); 331 assertNotNull(r); 332 333 r = (Relation) lookupByName(hull.getRelations(), "r1"); 335 334 assertNotNull(r); 336 335 assertEquals(3, r.getMembersCount()); … … 347 346 DataSet source = new DataSet(); 348 347 Relation r1 = new Relation(1, 1); 349 r1.addMember(new RelationMember("relation-1", r1));348 r1.addMember(new RelationMember("relation-1", r1)); 350 349 source.addPrimitive(r1); 351 350 source.setSelected(r1); … … 356 355 assertEquals(1, hull.getRelations().size()); 357 356 358 Relation r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);357 Relation r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 359 358 assertNotNull(r); 360 359 assertEquals(1, r.getMembersCount()); 361 assertTrue(r.getMembers().contains(new RelationMember("relation-1", r)));360 assertTrue(r.getMembers().contains(new RelationMember("relation-1", r))); 362 361 } 363 362 … … 367 366 Relation r1 = new Relation(); 368 367 r1.put("name", "r1"); 369 r1.addMember(new RelationMember("relation-1", r1));368 r1.addMember(new RelationMember("relation-1", r1)); 370 369 source.addPrimitive(r1); 371 370 source.setSelected(r1); … … 376 375 assertEquals(1, hull.getRelations().size()); 377 376 378 Relation r = (Relation) lookupByName(hull.getRelations(), "r1");377 Relation r = (Relation) lookupByName(hull.getRelations(), "r1"); 379 378 assertNotNull(r); 380 379 assertEquals(1, r.getMembersCount()); 381 assertTrue(r.getMembers().contains(new RelationMember("relation-1", r)));380 assertTrue(r.getMembers().contains(new RelationMember("relation-1", r))); 382 381 } 383 382 … … 389 388 Relation r2 = new Relation(2, 3); 390 389 source.addPrimitive(r2); 391 r1.addMember(new RelationMember("relation-2", r2));392 r2.addMember(new RelationMember("relation-1", r1));393 source.setSelected(r1, r2);390 r1.addMember(new RelationMember("relation-2", r2)); 391 r2.addMember(new RelationMember("relation-1", r1)); 392 source.setSelected(r1, r2); 394 393 395 394 MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); … … 398 397 assertEquals(2, hull.getRelations().size()); 399 398 400 r1 = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);399 r1 = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 401 400 assertNotNull(r1); 402 r2 = (Relation) hull.getPrimitiveById(2, OsmPrimitiveType.RELATION);401 r2 = (Relation) hull.getPrimitiveById(2, OsmPrimitiveType.RELATION); 403 402 assertNotNull(r2); 404 403 assertEquals(1, r1.getMembersCount()); 405 assertTrue(r1.getMembers().contains(new RelationMember("relation-2", r2)));404 assertTrue(r1.getMembers().contains(new RelationMember("relation-2", r2))); 406 405 assertEquals(1, r2.getMembersCount()); 407 assertTrue(r2.getMembers().contains(new RelationMember("relation-1", r1)));406 assertTrue(r2.getMembers().contains(new RelationMember("relation-1", r1))); 408 407 } 409 408 }
Note:
See TracChangeset
for help on using the changeset viewer.