Index: applications/editors/josm/plugins/waydownloader/build.xml =================================================================== --- applications/editors/josm/plugins/waydownloader/build.xml (revision 18601) +++ applications/editors/josm/plugins/waydownloader/build.xml (revision 18613) @@ -22,4 +22,12 @@ --> + + + + + + + + + + + + + + + + Building against core revision ${coreversion.info.entry.revision}. + Plugin-Mainversion is set to ${plugin.main.version}. + + + + + + Commiting the plugin source with message '${commit.message}' ... + + + + + + + + + + + Updating plugin source ... + + + + + + Updating ${plugin.jar} ... + + + + + + + + + + + ***** Properties of published ${plugin.jar} ***** + Commit message : '${commit.message}' + Plugin-Mainversion: ${plugin.main.version} + JOSM build version: ${coreversion.info.entry.revision} + Plugin-Version : ${version.entry.commit.revision} + ***** / Properties of published ${plugin.jar} ***** + + Now commiting ${plugin.jar} ... + + + + + + + + + + + Index: applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java =================================================================== --- applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java (revision 18601) +++ applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java (revision 18613) @@ -7,5 +7,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; +import java.util.List; import java.util.concurrent.Future; @@ -16,9 +18,13 @@ import org.openstreetmap.josm.actions.MergeNodesAction; import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; +import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.osm.BBox; +import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.DataSource; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.DefaultNameFormatter; import org.openstreetmap.josm.gui.MainMenu; import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; @@ -47,93 +53,107 @@ /** Set up the action (text appearing on the menu, keyboard shortcut etc */ public WayDownloadAction() { - - super( "Way Download" , + super( tr("Way Download") , "way-download", - "Download map data on the end of selected way", + tr("Download map data on the end of selected way"), Shortcut.registerShortcut("waydownloader:waydownload", "Way Download", KeyEvent.VK_W, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true); } + protected void showWarningMessage(String msg) { + if(msg == null) return; + JOptionPane.showMessageDialog( + Main.parent, + msg, + tr("Warning"), + JOptionPane.WARNING_MESSAGE + ); + } + + protected void showErrorMessage(String msg) { + if(msg == null) return; + JOptionPane.showMessageDialog( + Main.parent, + msg, + tr("Error"), + JOptionPane.ERROR_MESSAGE + ); + } + + protected void showInfoMessage(String msg) { + if(msg == null) return; + JOptionPane.showMessageDialog( + Main.parent, + msg, + tr("Information"), + JOptionPane.INFORMATION_MESSAGE + ); + } + /** Called when the WayDownloadAction action is triggered (e.g. user clicked the menu option) */ public void actionPerformed(ActionEvent e) { - - System.out.println("Way Download"); - - String errMsg = null; - selectedNode = null; Collection selection = Main.main.getCurrentDataSet().getSelectedNodes(); - if (selection.size()==0) { selection = Main.main.getCurrentDataSet().getSelectedWays(); if (!workFromWaySelection(selection)) { - errMsg = tr("Select a starting node on the end of a way"); + showWarningMessage(tr("Neither a node nor a way with an endpoint outside of the
current download areas is selected.
Select a node on the start or end of a way or an entire way first.")); + return; } selection = Main.main.getCurrentDataSet().getSelectedNodes(); } - if ( selection.size()==0 || selection.size()>1 ) { - errMsg = tr("Select a starting node on the end of a way"); - } else { - OsmPrimitive p = selection.iterator().next(); - - - - if (!(p instanceof Node)) { - errMsg = tr("Select a starting node on the end of a way"); - } else { - selectedNode = (Node) p; - - - Main.map.mapView.zoomTo(selectedNode.getEastNorth()); - - //Before downloading. Figure a few things out. - //Find connected way - ArrayList connectedWays = findConnectedWays(); - - if (connectedWays.size()==0) { - errMsg = tr("Select a starting node on the end of a way"); - } else { - priorConnectedWay =connectedWays.get(0); - - //Download a little rectangle around the selected node - double latbuffer=0.0003; //TODO make this an option - double lonbuffer=0.0005; - DownloadOsmTask downloadTask = new DownloadOsmTask(); - final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(); - final Future future = downloadTask.download( - false /* no new layer */, - new Bounds( - selectedNode.getCoor().lat()- latbuffer, - selectedNode.getCoor().lon()- lonbuffer, - selectedNode.getCoor().lat()+ latbuffer, - selectedNode.getCoor().lon()+ lonbuffer - ), - monitor - ); - // schedule closing of the progress monitor after the download - // job has finished - Main.worker.submit( - new Runnable() { - public void run() { - try { - future.get(); - } catch(Exception e) { - e.printStackTrace(); - return; - } - monitor.close(); - } - } - ); - //The download is scheduled to be executed. - //Now schedule the run() method (below) to be executed once that's completed. - Main.worker.execute(this); + if ( selection.size()==0 || selection.size()>1 || ! (selection.iterator().next() instanceof Node)) { + showWarningMessage(tr("Could not find a unique node to start downloading from.")); + return; + } + + selectedNode = (Node) selection.iterator().next(); + Main.map.mapView.zoomTo(selectedNode.getEastNorth()); + + //Before downloading. Figure a few things out. + //Find connected way + List connectedWays = findConnectedWays(selectedNode); + if (connectedWays.size()==0) { + showWarningMessage( + tr("There are no ways connected to node ''{0}''. Aborting.", + selectedNode.getDisplayName(DefaultNameFormatter.getInstance())) + ); + return; + } + priorConnectedWay =connectedWays.get(0); + + //Download a little rectangle around the selected node + double latbuffer=0.0003; //TODO make this an option + double lonbuffer=0.0005; + DownloadOsmTask downloadTask = new DownloadOsmTask(); + final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(); + final Future future = downloadTask.download( + false /* no new layer */, + new Bounds( + selectedNode.getCoor().lat()- latbuffer, + selectedNode.getCoor().lon()- lonbuffer, + selectedNode.getCoor().lat()+ latbuffer, + selectedNode.getCoor().lon()+ lonbuffer + ), + monitor + ); + // schedule closing of the progress monitor after the download + // job has finished + Main.worker.submit( + new Runnable() { + public void run() { + try { + future.get(); + } catch(Exception e) { + e.printStackTrace(); + return; + } + monitor.close(); + } } - } - } - - if(errMsg != null) - JOptionPane.showMessageDialog(Main.parent, errMsg); + ); + //The download is scheduled to be executed. + //Now schedule the run() method (below) to be executed once that's completed. + Main.worker.execute(this); } @@ -143,42 +163,70 @@ public void run() { //Find ways connected to the node after the download - ArrayList connectedWays = findConnectedWays(); - - String errMsg = null; + List connectedWays = findConnectedWays(selectedNode); + if (connectedWays.size()==0) { - throw new RuntimeException("Way downloader data inconsistency. priorConnectedWay (" + - priorConnectedWay.toString() + ") wasn't discovered after download"); - - } else if (connectedWays.size()==1) { - //Just one way connecting the node still. Presumably the one which was there before - + String msg = tr("Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t discovered after download", + priorConnectedWay.getDisplayName(DefaultNameFormatter.getInstance()) + ); + System.err.println(msg); + showErrorMessage(msg); + return; + } + + if (connectedWays.size()==1) { + //Just one way connecting still to the node . Presumably the one which was there before //Check if it's just a duplicate node - Node dupeNode = duplicateNode(); + + Node dupeNode = findDuplicateNode(selectedNode); if (dupeNode!=null) { - - if (JOptionPane.showConfirmDialog(null, "Merge duplicate node?")==JOptionPane.YES_OPTION) { - LinkedList dupeNodes = new LinkedList(); - dupeNodes.add(dupeNode); - MergeNodesAction.mergeNodes(Main.main.getEditLayer(), - dupeNodes, selectedNode); - - connectedWays = findConnectedWays(); //Carry on + String msg = tr("There aren''t further connected ways to download.
" + + "A potential duplicate node of the currently selected node was found, though.

" + + "The currently selected node is ''{0}''
" + + "The potential duplicate node is ''{1}''
" + + "Merge the duplicate node onto the currently selected node and continue way downloading?" + + "", + selectedNode.getDisplayName(DefaultNameFormatter.getInstance()), + dupeNode.getDisplayName(DefaultNameFormatter.getInstance()) + ); + + int ret = JOptionPane.showConfirmDialog( + Main.parent, + msg, + tr("Merge duplicate node?"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE + ); + if (ret != JOptionPane.YES_OPTION) + return; + Command cmd = MergeNodesAction.mergeNodes( + Main.main.getEditLayer(), + Collections.singletonList(dupeNode), + selectedNode + ); + if (cmd != null) { + Main.main.undoRedo.add(cmd); + Main.main.getEditLayer().data.setSelected(selectedNode); } - - + connectedWays = findConnectedWays(selectedNode); } else { - errMsg = tr("Reached the end of the line"); - } - - } - + showInfoMessage(tr("No more connected ways to download.")); + return; + } + return; + } + if (connectedWays.size()>2) { //Three or more ways meeting at this node. Means we have a junction. - errMsg = tr("Reached a junction"); - - } else if (connectedWays.size()==2) { + String msg = tr( + "Node ''{0}'' is a junction with more than 2 connected ways.", + selectedNode.getDisplayName(DefaultNameFormatter.getInstance()) + ); + showWarningMessage(msg); + return; + } + + if (connectedWays.size()==2) { //Two connected ways (The "normal" way downloading case) //Figure out which of the two is new. - System.out.println("connectedWays.toString()=" + connectedWays.toString()); Way wayA = connectedWays.get(0); Way wayB = connectedWays.get(1); @@ -190,21 +238,34 @@ //Select the next node Main.main.getCurrentDataSet().setSelected(nextNode); - Main.map.mapView.zoomTo(nextNode.getEastNorth()); } - if(errMsg != null) - JOptionPane.showMessageDialog(Main.parent, errMsg); - } - } - - /** See if there's another node at the same coordinates. If so return it. Otherwise null */ - private Node duplicateNode() { - for (Node onNode:Main.main.getCurrentDataSet().getNodes()) { - if (!onNode.equals(this.selectedNode) - && !onNode.incomplete - && onNode.getCoor().lat()==selectedNode.getCoor().lat() - && onNode.getCoor().lon()==selectedNode.getCoor().lon()) { - return onNode; - } + } + + @Override + protected void updateEnabledState() { + setEnabled(getEditLayer() != null); + } + + @Override + protected void updateEnabledState( + Collection selection) { + // do nothing + } + } + + /** + * Check whether there is a potentially duplicate node for referenceNode. + * + * @param referenceNode the reference node + * @return the potential duplicate node. null, if no duplicate found. + */ + private Node findDuplicateNode(Node referenceNode) { + DataSet ds = Main.main.getCurrentDataSet(); + List candidates = ds.searchNodes(new BBox(new Bounds(referenceNode.getCoor(), 0.0003, 0.0005))); + for (Node candidate: candidates) { + if (!candidate.equals(referenceNode) + && !candidate.incomplete + && candidate.getCoor().equals(referenceNode.getCoor())) + return candidate; } return null; @@ -218,15 +279,19 @@ } - /** find set of ways which have an end on the selectedNode */ - private ArrayList findConnectedWays() { - ArrayList connectedWays = new ArrayList(); - - //loop through every way - for (Way onWay:Main.main.getCurrentDataSet().getWays()) { - if (onWay.getNodesCount() >= 2) { - if (onWay.isFirstLastNode(selectedNode)) { - //Found it - connectedWays.add(onWay); - } + /** + * Replies the list of ways referenceNode is either the first or the + * last node in. + * + * @param referenceNode the reference node + * @return the list of ways. May be empty, but null. + */ + private List findConnectedWays(Node referenceNode) { + List referers = OsmPrimitive.getFilteredList(referenceNode.getReferrers(), Way.class); + ArrayList connectedWays = new ArrayList(referers.size()); + + //loop through referers + for (Way way: referers) { + if (way.getNodesCount() >= 2 && way.isFirstLastNode(referenceNode)) { + connectedWays.add(way); } } @@ -239,5 +304,4 @@ */ private boolean workFromWaySelection(Collection selection) { - if (selection.size() != 1) return false; @@ -257,11 +321,5 @@ for (DataSource datasource:Main.main.getCurrentDataSet().dataSources) { Bounds bounds = datasource.bounds; - - if (node.getCoor().lat()>bounds.getMin().lat() && - node.getCoor().lat()bounds.getMin().lon() && - node.getCoor().lon()