Changeset 32398 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructRouteAction.java
- Timestamp:
- 2016-06-25T11:56:57+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructRouteAction.java
r32395 r32398 33 33 * @author freeExec 34 34 */ 35 public class ReconstructRouteAction 35 public class ReconstructRouteAction extends AbstractAction implements ChosenRelationListener { 36 36 private final ChosenRelation rel; 37 37 38 public ReconstructRouteAction 38 public ReconstructRouteAction(ChosenRelation rel) { 39 39 super(tr("Reconstruct route")); 40 40 putValue(SMALL_ICON, ImageProvider.get("dialogs", "filter")); … … 65 65 m.getMember()); 66 66 stopMembers.put(rm.getMember(), rm); 67 } 68 else if (PublicTransportHelper.isMemberPlatform(m)) { 67 } else if (PublicTransportHelper.isMemberPlatform(m)) { 69 68 RelationMember rm = new RelationMember( 70 69 m.hasRole() ? m.getRole() : PublicTransportHelper.PLATFORM, … … 81 80 platformMembers.put(platformName, nList); 82 81 } 83 } 84 else if (PublicTransportHelper.isMemberRouteway(m)) { 82 } else if (PublicTransportHelper.isMemberRouteway(m)) { 85 83 routeMembers.add(new RelationMember(m)); 86 84 } else { … … 93 91 Node lastNode = null; 94 92 for (int rIndex = 0; rIndex < routeMembers.size(); rIndex++) { 95 Way w = (Way)routeMembers.get(rIndex).getMember(); 93 Way w = (Way) routeMembers.get(rIndex).getMember(); 96 94 boolean dirForward = false; 97 95 if (lastNode == null) { // first segment 98 96 if (routeMembers.size() > 2) { 99 Way nextWay = (Way)routeMembers.get(rIndex + 1).getMember(); 97 Way nextWay = (Way) routeMembers.get(rIndex + 1).getMember(); 100 98 if (w.lastNode().equals(nextWay.lastNode()) || w.lastNode().equals(nextWay.firstNode())) { 101 99 dirForward = true; … … 106 104 } // else one segment - direction unknown 107 105 } else { 108 if (lastNode.equals(w.firstNode())) { dirForward = true; lastNode = w.lastNode(); } else { 106 if (lastNode.equals(w.firstNode())) { 107 dirForward = true; lastNode = w.lastNode(); 108 } else { 109 109 lastNode = w.firstNode(); 110 110 } … … 126 126 } 127 127 boolean existsPlatform = platformMembers.containsKey(stopName); 128 if (!existsPlatform) { stopName = ""; } // find of the nameless 128 if (!existsPlatform) { 129 stopName = ""; // find of the nameless 130 } 129 131 if (existsPlatform || platformMembers.containsKey(stopName)) { 130 132 List<RelationMember> lMember = platformMembers.get(stopName); … … 153 155 String stopName = PublicTransportHelper.getNameViaStoparea(stop); 154 156 boolean existsPlatform = platformMembers.containsKey(stopName); 155 if (!existsPlatform) { stopName = ""; } // find of the nameless 157 if (!existsPlatform) { 158 stopName = ""; // find of the nameless 159 } 156 160 if (existsPlatform || platformMembers.containsKey(stopName)) { 157 161 List<RelationMember> lMember = platformMembers.get(stopName); … … 224 228 } 225 229 226 private boolean isSuitableRelation 230 private boolean isSuitableRelation(Relation newRelation) { 227 231 return !(newRelation == null || !"route".equals(newRelation.get("type")) || newRelation.getMembersCount() == 0); 228 232 }
Note:
See TracChangeset
for help on using the changeset viewer.