Changeset 32338 in osm

Timestamp:

2016-06-20T16:49:47+02:00 (8 years ago)

Author:

darya

Message:

Downloads incomplete members for all routes at once

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant

Files:

• actions/IncompleteMembersDownloadThread.java (modified) (2 diffs)
• gui/IncompleteMembersDownloadDialog.java (modified) (1 diff)
• validation/PTAssitantValidatorTest.java (modified) (1 diff)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/IncompleteMembersDownloadThread.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
+import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
 public class IncompleteMembersDownloadThread extends Thread {
 
-        private Relation relation;
+        public IncompleteMembersDownloadThread() {
+                super();
 
-        public IncompleteMembersDownloadThread(Relation r) {
-                super();
-                relation = r;
         }
-        
+
         private void realRun() {
-                
+                // TODO
         }
 
@@ -23 +27 @@
         public void run() {
 
-                 try {
-                synchronized (this) {
+                try {
+                        synchronized (this) {
 
-                        ArrayList<PrimitiveId> list = new ArrayList<>(1);
-                        list.add(relation);
+                                ArrayList<PrimitiveId> list = new ArrayList<>();
 
-                        DownloadPrimitivesWithReferrersTask task = new DownloadPrimitivesWithReferrersTask(false, list, false, true,
-                                        null, null);
-                        Thread t = new Thread(task);
-                        t.start();
-                        t.join();
+                                // add all route relations that are of public_transport version 2:
+                                Collection<Relation> allRelations = Main.getLayerManager().getEditDataSet().getRelations();
+                                for (Relation currentRelation : allRelations) {
+                                        if (RouteUtils.isTwoDirectionRoute(currentRelation)) {
+                                                list.add(currentRelation);
+                                        }
+                                }
+                                
+                                // add all stop_positions:
+                                Collection<Node> allNodes = Main.getLayerManager().getEditDataSet().getNodes();
+                                for (Node currentNode: allNodes) {
+                                        if (currentNode.hasTag("public_transport", "stop_position")) {
+                                                list.add(currentNode);
+                                        }
+                                }
+                                
+                                
+                                DownloadPrimitivesWithReferrersTask task = new DownloadPrimitivesWithReferrersTask(false, list, false,
+                                                true, null, null);
+                                Thread t = new Thread(task);
+                                t.start();
+                                t.join();
 
+                        }
+
+                } catch (InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
 
                 }
 
-                 } catch (InterruptedException e) {
-                 // TODO Auto-generated catch block
-                 e.printStackTrace();
-                
-                 }
-
         }
 }

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/IncompleteMembersDownloadDialog.java

@@ -29 +29 @@
                 selectedOption = Integer.MIN_VALUE;
 
-                message = tr("The relation (id={0}) has incomplete members.\n"+
-                    "They need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?", id);
+//              message = tr("The relation (id={0}) has incomplete members.\n"+
+//                  "They need to be downloaded to proceed with validation of this relation.\nDo you want to download incomplete members?", id);
+                message = tr("Route relations have incomplete members.\nThey need to be downloaded to proceed with validation.\nDo you want to download them?");
                 checkbox = new JCheckBox(tr("Remember my choice and do not ask me again in this session"));
                 options = new String[2];

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssitantValidatorTest.java

@@ -83 +83 @@
                 if (userInput == JOptionPane.YES_OPTION) {
 
-                        Thread t = new IncompleteMembersDownloadThread(r);
+                        Thread t = new IncompleteMembersDownloadThread();
                         t.start();
                         synchronized (t) {