Changeset 32587 in osm for applications/editors/josm

Timestamp:

2016-07-06T15:00:13+02:00 (8 years ago)

Author:

darya

Message:

temporary oneway fix

Location:

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

Files:

• Checker.java (modified) (1 diff)
• WayChecker.java (modified) (5 diffs)

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

@@ -57 +57 @@
 
                                 if (rm.getMember().hasTag("public_transport", "stop_position")) {
-                                        if (!rm.hasRole("stop") && !rm.hasRole("stop_entry_only") && !rm.hasRole("stop_exit_only")) {
-                                                RelationMember newMember = new RelationMember("stop", rm.getMember());
-                                                resultList.add(newMember);
-                                        } else {
+//                                      if (!rm.hasRole("stop") && !rm.hasRole("stop_entry_only") && !rm.hasRole("stop_exit_only")) {
+//                                              RelationMember newMember = new RelationMember("stop", rm.getMember());
+//                                              resultList.add(newMember);
+//                                      } else {
                                                 resultList.add(rm);
-                                        }
+//                                      }
                                 } else { // if platform
-                                        if (!rm.hasRole("platform") && !rm.hasRole("platform_entry_only")
-                                                        && !rm.hasRole("platform_exit_only")) {
-                                                RelationMember newMember = new RelationMember("platform", rm.getMember());
-                                                resultList.add(newMember);
-                                        } else {
+//                                      if (!rm.hasRole("platform") && !rm.hasRole("platform_entry_only")
+//                                                      && !rm.hasRole("platform_exit_only")) {
+//                                              RelationMember newMember = new RelationMember("platform", rm.getMember());
+//                                              resultList.add(newMember);
+//                                      } else {
                                                 resultList.add(rm);
-                                        }
+//                                      }
                                 }
 

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

@@ -7 +7 @@
 import java.util.List;
 
+import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
@@ -24 +25 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionTypeCalculator;
@@ -298 +299 @@
                 SelectCommand command2 = new SelectCommand(primitivesToZoom);
                 commands.add(command2);
-
-                List<RelationMember> sortedRelationMembers = listStopMembers(originalRelation);
-                sortedRelationMembers.addAll(listNotStopMembers(originalRelation));
+//
+//              List<RelationMember> sortedRelationMembers = listStopMembers(originalRelation);
+//              sortedRelationMembers.addAll(listNotStopMembers(originalRelation));
+//              originalRelation.setMembers(sortedRelationMembers);
                 
                 List<OsmDataLayer> listOfLayers = Main.getLayerManager().getLayersOfType(OsmDataLayer.class);
@@ -307 +309 @@
 
                                 final OsmDataLayer layerParameter = osmDataLayer;
-                                final Relation relationParameter = new Relation(originalRelation);
-                                relationParameter.setMembers(sortedRelationMembers);
+//                              final Relation relationParameter = new Relation(originalRelation);
+//                              relationParameter.setMembers(sortedRelationMembers);
+                                final Relation relationParameter = originalRelation;
                                 final Collection<OsmPrimitive> zoomParameter = primitivesToZoom;
 
@@ -339 +342 @@
 
                 AutoScaleAction.zoomTo(primitives);
-                GenericRelationEditor editor = new GenericRelationEditor(layer, r, r.getMembersFor(primitives));
-                RelationDialogManager.getRelationDialogManager().register(layer, r, editor);
+                RelationEditor editor = RelationEditor.getEditor(layer, r, r.getMembersFor(primitives));
                 editor.setVisible(true);