Changeset 2381 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
- Timestamp:
- 2009-11-02T07:51:28+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r2327 r2381 304 304 Node minPrimitive = null; 305 305 DataSet ds = getCurrentDataSet(); 306 if (ds == null)306 if (ds == null) 307 307 return null; 308 for (Node n : ds. nodes) {308 for (Node n : ds.getNodes()) { 309 309 if (!n.isUsable()) { 310 310 continue; … … 317 317 } 318 318 // when multiple nodes on one point, prefer new or selected nodes 319 else if (dist == minDistanceSq && minPrimitive != null319 else if (dist == minDistanceSq && minPrimitive != null 320 320 && ((n.isNew() && ds.isSelected(n)) 321 321 || (!ds.isSelected(minPrimitive) && (ds.isSelected(n) || n.isNew())))) { 322 322 minPrimitive = n; 323 323 } … … 335 335 TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>(); 336 336 DataSet ds = getCurrentDataSet(); 337 if (ds == null)337 if (ds == null) 338 338 return null; 339 for (Way w : ds. ways) {339 for (Way w : ds.getWays()) { 340 340 if (!w.isUsable()) { 341 341 continue; … … 358 358 double a = p.distanceSq(B); 359 359 double b = p.distanceSq(A); 360 double perDist = a -(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared361 if (perDist < snapDistance && a < c +snapDistance && b < c+snapDistance) {362 if (ds.isSelected(w)) {360 double perDist = a - (a - b + c) * (a - b + c) / 4 / c; // perpendicular distance squared 361 if (perDist < snapDistance && a < c + snapDistance && b < c + snapDistance) { 362 if (ds.isSelected(w)) { 363 363 perDist -= 0.00001; 364 364 } … … 459 459 Collection<OsmPrimitive> nearest = new HashSet<OsmPrimitive>(); 460 460 DataSet ds = getCurrentDataSet(); 461 if (ds == null)461 if (ds == null) 462 462 return null; 463 for (Way w : ds. ways) {463 for (Way w : ds.getWays()) { 464 464 if (!w.isUsable()) { 465 465 continue; … … 479 479 double a = p.distanceSq(B); 480 480 double b = p.distanceSq(A); 481 double perDist = a -(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared482 if (perDist < snapDistance && a < c +snapDistance && b < c+snapDistance) {481 double perDist = a - (a - b + c) * (a - b + c) / 4 / c; // perpendicular distance squared 482 if (perDist < snapDistance && a < c + snapDistance && b < c + snapDistance) { 483 483 nearest.add(w); 484 484 break; … … 487 487 } 488 488 } 489 for (Node n : ds. nodes) {489 for (Node n : ds.getNodes()) { 490 490 if (n.isUsable() 491 491 && getPoint(n).distanceSq(p) < snapDistance) { … … 507 507 Collection<Node> nearest = new HashSet<Node>(); 508 508 DataSet ds = getCurrentDataSet(); 509 if (ds == null)509 if (ds == null) 510 510 return null; 511 for (Node n : ds. nodes) {511 for (Node n : ds.getNodes()) { 512 512 if (n.isUsable() 513 513 && getPoint(n).distanceSq(p) < snapDistance) {
Note:
See TracChangeset
for help on using the changeset viewer.