Changeset 3749 in osm for applications/editors

Timestamp:

2007-07-26T16:04:28+02:00 (17 years ago)

Author:

christofd

Message:

added a mode and a layer to paint the start/end/middle points.
modified length calculation

Location:

applications/editors/josm/plugins/navigator/src/at/dallermassl/josm/plugin/navigator

Files:

• NavigatorAction.java (modified) (2 diffs)
• NavigatorLayer.java (added)
• NavigatorModeAction.java (added)
• NavigatorModel.java (added)
• NavigatorPlugin.java (modified) (2 diffs)
• OsmGraphCreator.java (modified) (2 diffs)

applications/editors/josm/plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorAction.java

@@ -22 +22 @@
  *
  */
-public class NavigatorAction extends AbstractAction implements SelectionChangedListener {
+public class NavigatorAction extends AbstractAction {
   private NavigatorPlugin navigatorPlugin;
-  private List<Node> selectedNodes;
-  private int selectionChangedCalls;
 
   public NavigatorAction(NavigatorPlugin navigatorPlugin) {
     super(tr("Navigate"));
     this.navigatorPlugin = navigatorPlugin;
-    selectedNodes = new ArrayList<Node>();
-    DataSet.listeners.add(this);
     
   }
@@ -39 +35 @@
    */
   public void actionPerformed(ActionEvent e) {
-    navigatorPlugin.navigate(selectedNodes);
-
-  }
-
-  /* (non-Javadoc)
-   * @see org.openstreetmap.josm.data.SelectionChangedListener#selectionChanged(java.util.Collection)
-   */
-  public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-    ++selectionChangedCalls;
-//    System.out.println("new selection: " + newSelection);
-//    System.out.println("selection till now: " + selectedNodes);
-    if(selectionChangedCalls > 1 && (newSelection == null || newSelection.size() == 0)) {
-      System.out.println("clearing selection for navigation");
-      selectedNodes.clear();
-      selectionChangedCalls = 0;
-      return;
-    }
-    if(selectionChangedCalls > 1) {
-      selectionChangedCalls = 0;
-    }
-    Node node;
-    // find a newly selected node and add it to the selection
-    for(OsmPrimitive selectedElement : newSelection) {
-      if(selectedElement instanceof Node) {
-        node = (Node)selectedElement;
-        if(!selectedNodes.contains(node)) {
-          selectedNodes.add(node);
-//          System.out.println("adding node " + node.id);
-          System.out.println("navigation nodes: " + selectedNodes);
-        }
-      }
-    }    
+    navigatorPlugin.navigate();
   }
 

applications/editors/josm/plugins/navigator/src/at/dallermassl/josm/plugin/navigator/NavigatorPlugin.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Segment;
+import org.openstreetmap.josm.gui.IconToggleButton;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.plugins.Plugin;
 
 /**
@@ -25 +29 @@
  * 
  * @author cdaller
- *
+ * 
  */
-public class NavigatorPlugin {
-  private Graph graph;
+public class NavigatorPlugin extends Plugin {
+    private NavigatorLayer navigatorLayer;
+    private NavigatorModel navigatorModel;
 
-  
-  /**
-   * 
-   */
-  public NavigatorPlugin() {
-    super();
-    JMenuBar menu = Main.main.menu;
-    JMenu navigatorMenu = new JMenu(tr("Navigation"));
-    JMenuItem navigatorMenuItem = new JMenuItem(new NavigatorAction(this));
-    navigatorMenu.add(navigatorMenuItem);
-    JMenuItem resetMenuItem = new JMenuItem(tr("Reset Graph"));
-    resetMenuItem.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        graph = null;        
-      }      
-    });
-    navigatorMenu.add(resetMenuItem);
-    menu.add(navigatorMenu);
+    /**
+     * 
+     */
+    public NavigatorPlugin() {
+        super();
+        
+        navigatorModel = new NavigatorModel();
+        navigatorLayer = new NavigatorLayer(tr("Navigation"));
+        navigatorLayer.setNavigatorNodeModel(navigatorModel);
+        
+        JMenuBar menu = Main.main.menu;
+        JMenu navigatorMenu = new JMenu(tr("Navigation"));
+        JMenuItem navigatorMenuItem = new JMenuItem(new NavigatorAction(this));
+        navigatorMenu.add(navigatorMenuItem);
+        JMenuItem resetMenuItem = new JMenuItem(tr("Reset Graph"));
+        resetMenuItem.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                navigatorModel.resetGraph();
+            }
+        });
+        navigatorMenu.add(resetMenuItem);
+        menu.add(navigatorMenu);
+    }
     
-  }
-  
-  public Graph<Node, SegmentEdge> getGraph() {
-    if(graph == null) {
-      OsmGraphCreator graphCreator = new OsmGraphCreator();
-      //graph = graphCreator.createGraph();
-      graph = graphCreator.createSegmentGraph();
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.plugins.Plugin#mapFrameInitialized(org.openstreetmap.josm.gui.MapFrame, org.openstreetmap.josm.gui.MapFrame)
+     */
+    @Override
+    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {    
+        newFrame.toolBarActions.add(
+            new IconToggleButton(new NavigatorModeAction(newFrame, navigatorModel, navigatorLayer)));
     }
-    return graph;
-  }
 
-  /**
-   * @param startNode
-   * @param endNode
-   */
-  public void navigate(List<Node> nodes) {
-    System.out.print("navigate nodes ");
-    for(Node node : nodes) {
-      System.out.print(node.id + ",");
+    /**
+     * @param startNode
+     * @param endNode
+     */
+    public void navigate() {
+        navigatorLayer.navigate();
     }
-    System.out.println();
-    
-    DijkstraShortestPath<Node, SegmentEdge> routing;
-    List<SegmentEdge> fullPath = new ArrayList<SegmentEdge>();
-    List<SegmentEdge> path;
-    for(int index = 1; index < nodes.size(); ++index) {
-      routing = new DijkstraShortestPath<Node, SegmentEdge>(getGraph(), nodes.get(index - 1), nodes.get(index));
-      path = routing.getPathEdgeList();
-      if(path == null) {
-        System.out.println("no path found!");
-        return;
-      }
-      fullPath.addAll(path);
-    }
-    List<Segment> segmentPath = new ArrayList<Segment>();
-    for(SegmentEdge edge : fullPath) {
-      segmentPath.add(edge.getSegment());
-    }
-    Main.ds.setSelected(segmentPath);
-    Main.map.mapView.repaint();
-    System.out.println("shortest path found: " + fullPath);
-  }
 }

applications/editors/josm/plugins/navigator/src/at/dallermassl/josm/plugin/navigator/OsmGraphCreator.java

@@ -42 +42 @@
     highwayWeight.put("unclassified", 50.0);
     highwayWeight.put("residential", 40.0);
+    highwayWeight.put("footway", 1.0);
   }
   
@@ -94 +95 @@
       weight = weightValue.doubleValue();
     }
-    double distance = segment.from.coor.distance(segment.to.coor) * 111000; // deg to m (at equator :-)
-    return distance / weight;
+    double distance = Math.sqrt(segment.from.coor.distance(segment.to.coor)) * 111000; // deg to m (at equator :-)
+    return distance; // weight;
   }