Index: applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java =================================================================== --- applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java (revision 22295) +++ applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java (revision 22364) @@ -29,224 +29,218 @@ import org.openstreetmap.josm.tools.Shortcut; - public class MichiganLeft extends Plugin { - JMenuItem MichiganLeft; - - public MichiganLeft(PluginInformation info) { - super(info); - MichiganLeft = MainMenu.add(Main.main.menu.toolsMenu, new MichiganLeftAction()); - - } - - - private class MichiganLeftAction extends JosmAction { - /** + JMenuItem MichiganLeft; + + public MichiganLeft(PluginInformation info) { + super(info); + MichiganLeft = MainMenu.add(Main.main.menu.toolsMenu, + new MichiganLeftAction()); + + } + + private class MichiganLeftAction extends JosmAction { + /** * */ - private static final long serialVersionUID = 1L; - private LinkedList cmds = new LinkedList(); - - public MichiganLeftAction() { - super(tr("Michigan Left"), "michigan_left", tr("Adds no left turn for sets of 4 or 5 ways."), Shortcut.registerShortcut("tools:michigan_left", tr("Tool: {0}", tr("Michigan Left")), - KeyEvent.VK_M, Shortcut.GROUP_EDIT, KeyEvent.SHIFT_DOWN_MASK|KeyEvent.ALT_DOWN_MASK), true); - } - - public void actionPerformed(ActionEvent e) { - Collection selection = Main.main.getCurrentDataSet().getSelected(); - - int ways = 0; - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) ways++; - } - - if ((ways != 4) && (ways !=5)) { - JOptionPane.showMessageDialog(Main.parent, tr("Please select 4 or 5 ways to assign no left turns.")); + private static final long serialVersionUID = 1L; + private LinkedList cmds = new LinkedList(); + + public MichiganLeftAction() { + super(tr("Michigan Left"), "michigan_left", + tr("Adds no left turn for sets of 4 or 5 ways."), Shortcut + .registerShortcut("tools:michigan_left", tr("Tool: {0}", + tr("Michigan Left")), KeyEvent.VK_M, Shortcut.GROUP_EDIT, + KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK), true); + } + + public void actionPerformed(ActionEvent e) { + Collection selection = Main.main.getCurrentDataSet() + .getSelected(); + + int ways = 0; + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) + ways++; + } + + if ((ways != 4) && (ways != 5)) { + JOptionPane.showMessageDialog(Main.parent, + tr("Please select 4 or 5 ways to assign no left turns.")); + return; + } + + if (ways == 4) { + // Find extremities of ways + Hashtable ExtremNodes = new Hashtable(); + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + incrementHashtable(ExtremNodes, way.firstNode()); + incrementHashtable(ExtremNodes, way.lastNode()); + } + } + // System.out.println(tr("{0} extrem nodes.", ExtremNodes.size())); + if (ExtremNodes.size() != 4) { + JOptionPane.showMessageDialog(Main.parent, + tr("Please select 4 ways that form a closed relation.")); return; } - if (ways == 4) - { - // Find extremities of ways - Hashtable ExtremNodes=new Hashtable(); - for (OsmPrimitive prim : selection) - { - if (prim instanceof Way) - { - Way way = (Way) prim; - incrementHashtable(ExtremNodes, way.firstNode()); - incrementHashtable(ExtremNodes, way.lastNode()); + // order the ways + ArrayList orderedWays = new ArrayList(); + Way currentWay = (Way) selection.iterator().next(); + orderedWays.add((Way) currentWay); + selection.remove(currentWay); + while (selection.size() > 0) { + boolean found = false; + Node nextNode = currentWay.lastNode(); + for (OsmPrimitive prim : selection) { + Way tmpWay = (Way) prim; + if (tmpWay.firstNode() == nextNode) { + orderedWays.add(tmpWay); + selection.remove(prim); + currentWay = tmpWay; + found = true; + break; } } - //System.out.println(tr("{0} extrem nodes.", ExtremNodes.size())); - if (ExtremNodes.size() != 4) - { - JOptionPane.showMessageDialog(Main.parent, tr("Please select 4 ways that form a closed relation.")); + if (!found) { + JOptionPane.showMessageDialog(Main.parent, + tr("Unable to order the ways. Please verify their directions")); return; } - - // order the ways - ArrayList orderedWays=new ArrayList(); - Way currentWay=(Way) selection.iterator().next(); - orderedWays.add((Way) currentWay); - selection.remove(currentWay); - while (selection.size()>0) - { - boolean found=false; - Node nextNode=currentWay.lastNode(); - for (OsmPrimitive prim : selection) - { - Way tmpWay=(Way) prim; - if (tmpWay.firstNode() == nextNode) - { - orderedWays.add(tmpWay); - selection.remove(prim); - currentWay=tmpWay; - found=true; - break; - } - } - if (!found) - { - JOptionPane.showMessageDialog(Main.parent, tr("Unable to order the ways. Please verify their directions")); - return; - } - } - - // Build relations - for (int index=0 ; index<4 ; index++) - { - Way firstWay=orderedWays.get(index); - Way lastWay=orderedWays.get( (index+1) % 4); - Node lastNode = firstWay.lastNode(); - - buildRelation(firstWay, lastWay, lastNode); - } - Command c = new SequenceCommand(tr("Create Michigan left turn restriction"), cmds); - Main.main.undoRedo.add(c); - cmds.clear(); - } - - if (ways == 5) - { - // Find extremities of ways - Hashtable ExtremNodes=new Hashtable(); - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) - { - Way way = (Way) prim; - incrementHashtable(ExtremNodes, way.firstNode()); - incrementHashtable(ExtremNodes, way.lastNode()); - } - } - //System.out.println(tr("{0} extrem nodes.", ExtremNodes.size())); - - ArrayList viaNodes=new ArrayList(); - // find via nodes (they have 3 occurences in the list) - for (Enumeration enumKey = ExtremNodes.keys() ; enumKey.hasMoreElements(); ) - { - Node extrem=enumKey.nextElement(); - Integer nb=(Integer) ExtremNodes.get(extrem); - //System.out.println(tr("Via node {0}, {1}", extrem.getId(), nb.intValue())); - if (nb.intValue() == 3) - { - viaNodes.add(extrem); - } - } - //System.out.println(tr("{0} via nodes.", viaNodes.size())); - - if (viaNodes.size() != 2) { - JOptionPane.showMessageDialog(Main.parent, tr("Unable to find via nodes. Please check your selection")); - return; - } - - Node viaFirst = viaNodes.get(0); - Node viaLast = viaNodes.get(1); // Find middle segment - - Way middle = null; - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) - { - Way way = (Way) prim; + } + + // Build relations + for (int index = 0; index < 4; index++) { + Way firstWay = orderedWays.get(index); + Way lastWay = orderedWays.get((index + 1) % 4); + Node lastNode = firstWay.lastNode(); + + buildRelation(firstWay, lastWay, lastNode); + } + Command c = new SequenceCommand( + tr("Create Michigan left turn restriction"), cmds); + Main.main.undoRedo.add(c); + cmds.clear(); + } + + if (ways == 5) { + // Find extremities of ways + Hashtable ExtremNodes = new Hashtable(); + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + incrementHashtable(ExtremNodes, way.firstNode()); + incrementHashtable(ExtremNodes, way.lastNode()); + } + } + // System.out.println(tr("{0} extrem nodes.", ExtremNodes.size())); + + ArrayList viaNodes = new ArrayList(); + // find via nodes (they have 3 occurences in the list) + for (Enumeration enumKey = ExtremNodes.keys(); enumKey + .hasMoreElements();) { + Node extrem = enumKey.nextElement(); + Integer nb = (Integer) ExtremNodes.get(extrem); + // System.out.println(tr("Via node {0}, {1}", extrem.getId(), + // nb.intValue())); + if (nb.intValue() == 3) { + viaNodes.add(extrem); + } + } + // System.out.println(tr("{0} via nodes.", viaNodes.size())); + + if (viaNodes.size() != 2) { + JOptionPane.showMessageDialog(Main.parent, + tr("Unable to find via nodes. Please check your selection")); + return; + } + + Node viaFirst = viaNodes.get(0); + Node viaLast = viaNodes.get(1); // Find middle segment + + Way middle = null; + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + Node first = way.firstNode(); + Node last = way.lastNode(); + + if ((first.equals(viaFirst) && last.equals(viaLast)) + || (first.equals(viaLast) && last.equals(viaFirst))) + middle = way; + } + } + // System.out.println(tr("Middle way: {0}", middle.getId())); + + // Build relations + for (OsmPrimitive prim : selection) { + if (prim instanceof Way) { + Way way = (Way) prim; + if (way != middle) { Node first = way.firstNode(); Node last = way.lastNode(); - - if ((first.equals(viaFirst) && last.equals(viaLast)) || (first.equals(viaLast) && last.equals(viaFirst))) - middle=way; + if (first == viaFirst) + buildRelation(middle, way, viaNodes.get(0)); + else if (first == viaLast) + buildRelation(middle, way, viaNodes.get(1)); + else if (last == viaFirst) + buildRelation(way, middle, viaNodes.get(0)); + else if (last == viaLast) + buildRelation(way, middle, viaNodes.get(1)); } } - //System.out.println(tr("Middle way: {0}", middle.getId())); - - // Build relations - for (OsmPrimitive prim : selection) { - if (prim instanceof Way) - { - Way way = (Way) prim; - if (way != middle) - { - Node first = way.firstNode(); - Node last = way.lastNode(); - - if (first==viaFirst) - buildRelation(middle, way, viaNodes.get(0)); - else if (first==viaLast) - buildRelation(middle, way, viaNodes.get(1)); - else if (last==viaFirst) - buildRelation(way, middle, viaNodes.get(0)); - else if (last==viaLast) - buildRelation(way, middle, viaNodes.get(1)); - } - } - } - Command c = new SequenceCommand(tr("Create Michigan left turn restriction"), cmds); - Main.main.undoRedo.add(c); - cmds.clear(); - } - } - - public void incrementHashtable(Hashtable hash, Node node) - { - //System.out.println(tr("Processing {0}", node.getId())); - if (hash.containsKey(node)) - { - Integer nb=(Integer) hash.get(node); - hash.put(node, new Integer (nb.intValue()+1)); - //System.out.println(tr("Old value", nb.intValue())); - } - else - hash.put(node, new Integer (1)); - } - - public void buildRelation(Way fromWay, Way toWay, Node viaNode) - { - //System.out.println(tr("Relation: from {0} to {1} via {2}", fromWay.getId(), toWay.getId(), viaNode.getId())); - - Relation relation = new Relation(); - - RelationMember from = new RelationMember("from", fromWay); - relation.addMember(from); - - RelationMember to = new RelationMember("to", toWay); - relation.addMember(to); - - RelationMember via = new RelationMember("via", viaNode); - relation.addMember(via); - - relation.put("type", "restriction"); - relation.put("restriction", "no_left_turn"); - - cmds.add(new AddCommand(relation)); - } - @Override - protected void updateEnabledState() { - setEnabled(getEditLayer() != null); - } - - @Override - protected void updateEnabledState( - Collection selection) { - // do nothing - } - -} + } + Command c = new SequenceCommand( + tr("Create Michigan left turn restriction"), cmds); + Main.main.undoRedo.add(c); + cmds.clear(); + } + } + + public void incrementHashtable(Hashtable hash, Node node) { + // System.out.println(tr("Processing {0}", node.getId())); + if (hash.containsKey(node)) { + Integer nb = (Integer) hash.get(node); + hash.put(node, new Integer(nb.intValue() + 1)); + // System.out.println(tr("Old value", nb.intValue())); + } else + hash.put(node, new Integer(1)); + } + + public void buildRelation(Way fromWay, Way toWay, Node viaNode) { + // System.out.println(tr("Relation: from {0} to {1} via {2}", + // fromWay.getId(), toWay.getId(), viaNode.getId())); + + Relation relation = new Relation(); + + RelationMember from = new RelationMember("from", fromWay); + relation.addMember(from); + + RelationMember to = new RelationMember("to", toWay); + relation.addMember(to); + + RelationMember via = new RelationMember("via", viaNode); + relation.addMember(via); + + relation.put("type", "restriction"); + relation.put("restriction", "no_left_turn"); + + cmds.add(new AddCommand(relation)); + } + + @Override + protected void updateEnabledState() { + setEnabled(getEditLayer() != null); + } + + @Override + protected void updateEnabledState( + Collection selection) { + // do nothing + } + + } }