Changeset 33362 in osm for applications/editors/josm

Timestamp:

2017-06-01T12:16:44+02:00 (7 years ago)

Author:

giackserva

Message:

closed #josm14873

Location:

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

Files:

• PTAssistantPlugin.java (modified) (7 diffs)
• actions/EditHighlightedRelationsAction.java (added)
• gui/PTAssistantLayer.java (modified) (2 diffs)
• gui/PTAssistantLayerManager.java (modified) (3 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JMenuItem;
@@ -6 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.gui.IconToggleButton;
@@ -14 +18 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.AddStopPositionAction;
+import org.openstreetmap.josm.plugins.pt_assistant.actions.EditHighlightedRelationsAction;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.RepeatLastFixAction;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
@@ -33 +38 @@
     private static PTRouteSegment lastFix;
 
+    /* list of relation currently highlighted by the layer */
+    private static List<Relation> highlightedRelations;
+
     /* item of the Tools menu for repeating the last fix */
     private static JMenuItem repeatLastFixMenu;
+
+    /* edit the currently highlighted relations */
+    private static JMenuItem editHighlightedRelationsMenu;
 
     /**
@@ -48 +59 @@
         OsmValidator.addTest(PTAssistantValidatorTest.class);
 
+        highlightedRelations = new ArrayList<>();
         RepeatLastFixAction repeatLastFixAction = new RepeatLastFixAction();
+        EditHighlightedRelationsAction editHighlightedRelationsAction = new EditHighlightedRelationsAction();
         repeatLastFixMenu = MainMenu.add(Main.main.menu.toolsMenu, repeatLastFixAction, false);
+        editHighlightedRelationsMenu = MainMenu.add(Main.main.menu.toolsMenu, editHighlightedRelationsAction, false);
     }
 
@@ -59 +73 @@
         if (oldFrame == null && newFrame != null) {
             repeatLastFixMenu.setEnabled(false);
+            editHighlightedRelationsMenu.setEnabled(false);
             Main.map.addMapMode(new IconToggleButton(new AddStopPositionAction()));
         } else if (oldFrame != null && newFrame == null) {
             repeatLastFixMenu.setEnabled(false);
+            editHighlightedRelationsMenu.setEnabled(false);
         }
     }
@@ -103 +119 @@
     }
 
+        public static List<Relation> getHighlightedRelations() {
+                return new ArrayList<>(highlightedRelations);
+        }
+
+        public static void addHighlightedRelation(Relation highlightedRelation) {
+                highlightedRelations.add(highlightedRelation);
+                if(!editHighlightedRelationsMenu.isEnabled()) {
+                        SwingUtilities.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        editHighlightedRelationsMenu.setEnabled(true);
+                    }
+                });
+                }
+
+        }
+
+        public static void clearHighlightedRelations() {
+                highlightedRelations.clear();
+                SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                editHighlightedRelationsMenu.setEnabled(false);
+            }
+        });
+        }
 }

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

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.layer.LayerPositionStrategy;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTWay;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
@@ -265 +266 @@
             event.scheduleRemoval(Collections.singleton(this));
 
-        if(event.getRemovedLayer() == this)
+        if(event.getRemovedLayer() == this) {
                 PTAssistantLayerManager.PTLM.resetLayer();
+                PTAssistantPlugin.clearHighlightedRelations();
+        }
     }
 

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

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
@@ -40 +41 @@
                     routes.add(primitive);
                 }
-
             }
         }
@@ -46 +46 @@
         if (!routes.isEmpty()) {
                 getLayer().setPrimitives(routes);
+                PTAssistantPlugin.clearHighlightedRelations();
+                for(OsmPrimitive primitive : routes)
+                        PTAssistantPlugin.addHighlightedRelation((Relation) primitive);
         }
-
     }
 }