Changeset 20384 in osm for applications

Timestamp:

2010-03-09T12:59:21+01:00 (15 years ago)

Author:

guggis

Message:

Initial version
New: toggle dialog for turn restrictions

Location:

applications/editors/josm/plugins/turnrestrictions

Files:

• README (modified) (1 diff)
• data (added)
• data/test-data-set-1.osm (added)
• images/preferences (added)
• images/preferences/turnrestrictions.png (added)
• images/skobbler-logo.png (added)
• images/types (added)
• images/types/no_left_turn.png (added)
• images/types/no_right_turn.png (added)
• images/types/no_straight_on.png (added)
• images/types/no_u_turn.png (added)
• images/types/only_left_turn.png (added)
• images/types/only_right_turn.png (added)
• images/types/only_straight_on.png (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/AbstractTurnRestrictionsListView.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionListCellRenderer.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInDatasetListModel.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInDatasetView.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInSelectionListModel.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsInSelectionView.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsListDialog.java (modified) (14 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsListModel.java (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/preferences (added)
• src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java (added)

applications/editors/josm/plugins/turnrestrictions/README

@@ -4 +4 @@
 
 turnrestrictions plugin is a plugin for the open source map editor 
-JOSM. It allows to enter maintain information about turn restrictions
+JOSM. It allows to maintain information about turn restrictions
 in the OpenStreetMap database.                           
                          
-
+SEE ALSO
+========
+http://wiki.openstreetmap.org/wiki/JOSM/Plugins/turnrestrictions
+                         
 CREDIT
 ======
 Initial development of this plugin was sponsored by skobbler GmbH, see
-http://beta.skobbler.de/.
+http://www.skobbler.de/.
 
-Initial author: Karl Guggisberg
  
                          

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsListDialog.java

@@ -12 +12 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.AbstractAction;
@@ -23 +24 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -56 +59 @@
         private EditAction actEdit;
         private DeleteAction actDelete;  
+        private SelectSelectedTurnRestrictions actSelectSelectedTurnRestrictions;
+        private ZoomToAction actZoomTo;
         private SwitchListViewHandler switchListViewHandler;
         
@@ -101 +106 @@
                 JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT,0,0));
                 pnl.setBorder(null);
-                pnl.add(new JButton(actNew = new NewAction()));
-                pnl.add(new JButton(actEdit = new EditAction()));
-                pnl.add(new JButton(actDelete = new DeleteAction()));
+                pnl.add(new SideButton(actNew = new NewAction(), false /* don't show the name */));
+                pnl.add(new SideButton(actEdit = new EditAction(), false /* don't show the name */));
+                pnl.add(new SideButton(actDelete = new DeleteAction(), false /* don't show the name */));
+                
+                actSelectSelectedTurnRestrictions = new SelectSelectedTurnRestrictions();
+                actZoomTo = new ZoomToAction();
                 return pnl;
         }
@@ -155 +163 @@
                                 currentListView.removeListSelectionListener(actEdit);
                                 currentListView.removeListSelectionListener(actDelete);
+                                currentListView.removeListSelectionListener(actSelectSelectedTurnRestrictions);
+                                currentListView.removeListSelectionListener(actZoomTo);
                                 pnlContent.remove(currentListView);
                         }
                         pnlContent.add(view,BorderLayout.CENTER);
+                        currentListView = view;                                         
                         view.addListSelectionListener(actEdit);
                         view.addListSelectionListener(actDelete);
+                        view.addListSelectionListener(actSelectSelectedTurnRestrictions);
+                        view.addListSelectionListener(actZoomTo);
                         actEdit.updateEnabledState();
                         actDelete.updateEnabledState();
-                        currentListView = view;
+                        actSelectSelectedTurnRestrictions.updateEnabledState();
+                        actZoomTo.updateEnabledState();
                         currentListView.revalidate();
                         currentListView.repaint();
@@ -188 +202 @@
             putValue(SHORT_DESCRIPTION,tr( "Open an editor for the selected turn restricion"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
+            putValue(NAME, tr("Edit"));
             setEnabled(false);
         }
@@ -210 +225 @@
             if (!isEnabled())
                 return;
-            List<Relation> toEdit = pnlTurnRestrictionsInDataSet.getModel().getSelectedTurnRestrictions();
+            List<Relation> toEdit = currentListView.getModel().getSelectedTurnRestrictions();
             if (toEdit.size() != 1) return;
             launchEditor(toEdit.get(0));
@@ -216 +231 @@
 
         public void updateEnabledState() {
-                setEnabled(pnlTurnRestrictionsInDataSet.getModel().getSelectedTurnRestrictions().size() == 1);
+                setEnabled(currentListView!= null && currentListView.getModel().getSelectedTurnRestrictions().size() == 1);
         }
         
@@ -234 +249 @@
             putValue(SHORT_DESCRIPTION,tr("Delete the selected turn restriction"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+            putValue(NAME, tr("Delete"));
             setEnabled(false);
         }
@@ -248 +264 @@
         public void actionPerformed(ActionEvent e) {
             if (!isEnabled()) return;
-            List<Relation> toDelete = pnlTurnRestrictionsInDataSet.getModel().getSelectedTurnRestrictions();
+            List<Relation> toDelete = currentListView.getModel().getSelectedTurnRestrictions();
             for (Relation r: toDelete) {
                 deleteRelation(r);
@@ -255 +271 @@
         
         public void updateEnabledState() {
-                setEnabled(!pnlTurnRestrictionsInDataSet.getModel().getSelectedTurnRestrictions().isEmpty());
+                setEnabled(currentListView != null && !currentListView.getModel().getSelectedTurnRestrictions().isEmpty());
         }
 
@@ -270 +286 @@
         public NewAction() {
             putValue(SHORT_DESCRIPTION,tr("Create a new turn restriction"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "addrelation"));
+            putValue(SMALL_ICON, ImageProvider.get("new"));
+            putValue(NAME, tr("New"));
             updateEnabledState();
         }
@@ -290 +307 @@
             updateEnabledState();
                 }
+    }
+    
+    /**
+     * Sets the selection of the current data set to the currently selected 
+     * turn restrictions.
+     *
+     */
+    class SelectSelectedTurnRestrictions extends AbstractAction implements ListSelectionListener {
+        class AbortException extends Exception {}
+
+        public SelectSelectedTurnRestrictions() {
+            putValue(SHORT_DESCRIPTION,tr("Set the current JOSM selection to the selected turn restrictions"));
+            putValue(SMALL_ICON, ImageProvider.get("selectall"));
+            putValue(NAME, tr("Select in current data layer"));
+            setEnabled(false);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            if (!isEnabled()) return;
+            List<Relation> toSelect = currentListView.getModel().getSelectedTurnRestrictions();
+            if (toSelect.isEmpty()) return;
+            OsmDataLayer layer= Main.main.getEditLayer();
+            if (layer == null) return;
+            layer.data.setSelected(toSelect);
+        }
+        
+        public void updateEnabledState() {
+                setEnabled(currentListView != null && !currentListView.getModel().getSelectedTurnRestrictions().isEmpty());
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
+                updateEnabledState();
+        }
+    }
+    
+    /**
+     * Sets the selection of the current data set to the currently selected 
+     * turn restrictions.
+     *
+     */
+    class ZoomToAction extends AbstractAction implements ListSelectionListener {
+        class AbortException extends Exception {}
+
+        public ZoomToAction() {
+            putValue(SHORT_DESCRIPTION,tr("Zoom to the currently selected turn restrictions"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale/selection"));
+            putValue(NAME, tr("Zoom to"));
+            setEnabled(false);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            if (!isEnabled()) return;
+            List<Relation> toSelect = currentListView.getModel().getSelectedTurnRestrictions();
+            if (toSelect.isEmpty()) return;
+            OsmDataLayer layer= Main.main.getEditLayer();
+            if (layer == null) return;
+            layer.data.setSelected(toSelect);
+            new AutoScaleAction("selection").autoScale();
+        }
+        
+        public void updateEnabledState() {
+                setEnabled(currentListView != null && !currentListView.getModel().getSelectedTurnRestrictions().isEmpty());
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
+                updateEnabledState();
+        }
     }
     
@@ -320 +404 @@
             add(actEdit);
             add(actDelete);
+            addSeparator();
+            add(actSelectSelectedTurnRestrictions);
+            add(actZoomTo);
         }
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionsPlugin.java

@@ -2 +2 @@
 
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceEditor;
 
+/**
+ * This is the main class for the turnrestriction plugin.
+ * 
+ */
 public class TurnRestrictionsPlugin extends Plugin{
+        
         public TurnRestrictionsPlugin(PluginInformation info) {
                 super(info);
@@ -21 +28 @@
                 }
         }
+
+        @Override
+        public PreferenceSetting getPreferenceSetting() {
+                return new PreferenceEditor();
+        }
 }