Changeset 6910 in osm for applications/editors/josm/plugins/lakewalker

Timestamp:

2008-02-18T09:06:14+01:00 (17 years ago)

Author:

jrreid

Message:

Updates to lakewalker to add native java port of the python script (consider it an alpha release). Older style of calling the python script still supported (via an additional menu item)

Location:

applications/editors/josm/plugins/lakewalker

Files:

• README (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java (added)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerActionOld.java (added)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerApp.java (added)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java (added)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java (added)

applications/editors/josm/plugins/lakewalker/README

@@ -1 @@
-A JOSM plugin to interface to Darryl Shpak's Lakewalker module
+README FOR Lakewalker
+=======================
 
+The Lakewalker plugin can be used to generate traces of lakes, rivers or shoreline from
+LANDSAT imagery (or theoretically any imagery that is provided on a WMS server).
+
+Currently the plugin features 2 modes of operation: Native and Classic. The classic mode 
+requires the Python lakewalker.py script to be downloaded into the lakewalker directory
+within the JOSM plugin directory.
+
+Common Features:
  - On-screen feedback to Lakewalker progress with cancel
  - Tag ways appropriately
  - limit ways to length
- - Access all lakewalker options via preferences and via ctrl-click pop-up dialog
  - Manage Landsat image cache from Prefs screen
+
+Native Features:
+ - Doesn't require Python
+
+Classic Features:
+ - Access all lakewalker options via preferences
  - Read data in thread
  - ...

applications/editors/josm/plugins/lakewalker/build.xml

@@ -49 +49 @@
         <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin" />
         <attribute name="Plugin-Description" value="Interface to Lakewalker module" />
-        <attribute name="Plugin-Version" value="0.1"/>
-        <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>"/>
+        <attribute name="Plugin-Version" value="0.2"/>
+        <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>, Jason Reid &lt;jrreid@ucalgary.ca>"/>
+                <attribute name="Main-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerApp"/>
       </manifest>
     </jar>

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java

@@ -13 +13 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Vector;
 
 import javax.swing.JOptionPane;
@@ -24 +27 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+
 import org.xml.sax.SAXException;
 
@@ -38 +48 @@
   protected List<Node> selectedNodes;
   protected Thread executeThread;
+  protected boolean cancel;
+  
+  protected Collection<Command> commands = new LinkedList<Command>();
+  protected Collection<Way> ways = new ArrayList<Way>();
   
   public LakewalkerAction(String name) {
@@ -45 +59 @@
     setEnabled(true);
   }
-
+  
   public void actionPerformed(ActionEvent e) {
 
@@ -73 +87 @@
   }
 
-  protected void lakewalk(Point clickPoint) {
-    LatLon pos = Main.map.mapView.getLatLon(clickPoint.x, clickPoint.y);
-
-    /*
-     * Collect options
-     */
-    File working_dir = new File(Main.pref.getPreferencesDir(), "plugins");
-    working_dir = new File(working_dir, "Lakewalker");
-    String target = Main.pref.get(LakewalkerPreferences.PREF_PYTHON) + " lakewalker.py";
-    LatLon topLeft = Main.map.mapView.getLatLon(0, 0);
-    LatLon botRight = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), Main.map.mapView
-        .getHeight());
-
-    /*
-     * Build command line
-     */
-    target += " --lat=" + pos.lat();
-    target += " --lon=" + pos.lon();
-    target += " --left=" + topLeft.lon();
-    target += " --right=" + botRight.lon();
-    target += " --top=" + topLeft.lat();
-    target += " --bottom=" + botRight.lat();
-    target += " --waylength=" + Main.pref.get(LakewalkerPreferences.PREF_MAX_SEG, "500");
-    target += " --maxnodes=" + Main.pref.get(LakewalkerPreferences.PREF_MAX_NODES, "50000");
-    target += " --threshold=" + Main.pref.get(LakewalkerPreferences.PREF_THRESHOLD, "35");
-    target += " --dp-epsilon=" + Main.pref.get(LakewalkerPreferences.PREF_EPSILON, "0.0003");
-    target += " --landsat-res=" + Main.pref.get(LakewalkerPreferences.PREF_LANDSAT_RES, "4000");
-    target += " --tilesize=" + Main.pref.get(LakewalkerPreferences.PREF_LANDSAT_SIZE, "2000");
-    target += " --startdir=" + Main.pref.get(LakewalkerPreferences.PREF_START_DIR, "east");
-    target += " --wms=" + Main.pref.get(LakewalkerPreferences.PREF_WMS, "IR1");    
-    target += " --josm";
+  protected void lakewalk(Point clickPoint){
+        /**
+         * Positional data
+         */
+        final LatLon pos = Main.map.mapView.getLatLon(clickPoint.x, clickPoint.y);
+        final LatLon topLeft = Main.map.mapView.getLatLon(0, 0);
+        final LatLon botRight = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), Main.map.mapView
+             .getHeight());         
+
+        /**
+         * Cache/working directory location
+         */
+        final File working_dir = new File(Main.pref.getPreferencesDir(), "plugins/Lakewalker");
+        
+        /*
+         * Collect options
+         */
+        final int waylen = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_MAX_SEG, "500"));
+        final int maxnode = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_MAX_NODES, "50000"));
+        final int threshold = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_THRESHOLD, "35"));
+        final double epsilon = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_EPSILON, "0.0003"));
+        final int resolution = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_LANDSAT_RES, "4000"));
+        final int tilesize = Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_LANDSAT_SIZE, "2000"));
+        final String startdir = Main.pref.get(LakewalkerPreferences.PREF_START_DIR, "east");
+        final String wmslayer = Main.pref.get(LakewalkerPreferences.PREF_WMS, "IR1");      
+           
+        try {
+        PleaseWaitRunnable lakewalkerTask = new PleaseWaitRunnable(tr("Tracing")){
+          @Override protected void realRun() throws SAXException {
+                  processnodelist(pos, topLeft, botRight, waylen,maxnode,threshold,epsilon,resolution,tilesize,startdir,wmslayer,working_dir);
+          }
+          @Override protected void finish() {
+            
+          }
+          @Override protected void cancel() {
+            cancel();
+          }
+        };
+        Thread executeThread = new Thread(lakewalkerTask);
+        executeThread.start();
+      }
+      catch (Exception ex) {
+        System.out.println("Exception caught: " + ex.getMessage());
+      }      
+  }
+  
+  private void processnodelist(LatLon pos, LatLon topLeft, LatLon botRight, int waylen, int maxnode, int threshold, double epsilon, int resolution, int tilesize, String startdir, String wmslayer, File workingdir){
+          
+        ArrayList<double[]> nodelist = new ArrayList<double[]>();
+          
+        Lakewalker lw = new Lakewalker(waylen,maxnode,threshold,epsilon,resolution,tilesize,startdir,wmslayer,workingdir);
+        try {
+                nodelist = lw.trace(pos.lat(),pos.lon(),topLeft.lon(),botRight.lon(),topLeft.lat(),botRight.lat());
+        } catch(LakewalkerException e){
+                System.out.println(e.getError());
+        }
+        
+        System.out.println(nodelist.size()+" nodes generated");
+        
+        /**
+         * Run the nodelist through a vertex reduction algorithm
+         */
+        
+        nodelist = lw.vertex_reduce(nodelist, epsilon);
+        
+        System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
+        
+        /**
+         * And then through douglas-peucker reduction
+         */
+        
+        nodelist = lw.douglas_peucker(nodelist, epsilon);
+        
+        System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
+          
+        /**
+         * Turn the arraylist into osm nodes
+         */
+        
+        Way way = new Way();
+        Node n = null;
+        Node tn = null;
+        Node fn = null;
+        
+        double eastOffset = 0.0;
+        double northOffset = 0.0;
+        try {
+          eastOffset = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_EAST_OFFSET, "0.0"));
+          northOffset = Double.parseDouble(Main.pref.get(LakewalkerPreferences.PREF_NORTH_OFFSET, "0.0"));
+        }
+        catch (Exception e) {
+          
+        }
+        char option = ' ';
+        
+        int nodesinway = 0;
+        
+        for(int i = 0; i< nodelist.size(); i++){
+                if (cancel) {
+                        return;
+            }
+                        
+                try {           
+                  LatLon ll = new LatLon(nodelist.get(i)[0]+northOffset, nodelist.get(i)[1]+eastOffset);
+                  n = new Node(ll);
+                  if(fn==null){
+                    fn = n;
+                  }
+                  commands.add(new AddCommand(n));
+                  
+                } catch (Exception ex) {                 
+                }           
+              
+                way.nodes.add(n);
+                
+                if(nodesinway > Integer.parseInt(Main.pref.get(LakewalkerPreferences.PREF_MAX_SEG, "500"))){
+                        String waytype = Main.pref.get(LakewalkerPreferences.PREF_WAYTYPE, "water");
+                
+                if(!waytype.equals("none")){
+                  way.put("natural",waytype);
+                }
+                
+                way.put("created_by", "Dshpak_landsat_lakes");
+                commands.add(new AddCommand(way));
+                
+                way = new Way();
+
+                way.nodes.add(n);
+                
+                nodesinway = 0;
+                }
+                nodesinway++;
+        }
+        
+        commands.add(new AddCommand(way));
+        String waytype = Main.pref.get(LakewalkerPreferences.PREF_WAYTYPE, "water");
     
-
-    try {
-      /*
-       * Start the Lakewalker
-       */
-      Runtime rt = Runtime.getRuntime();
-      System.out.println("dir: " + working_dir + ", target: " + target);
-      final Process p = rt.exec(target, null, working_dir);
-      final BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
-      
-      /*
-       * Start a thread to read the output
-       */
-      final LakewalkerReader reader = new LakewalkerReader();
-      
-      PleaseWaitRunnable lakewalkerTask = new PleaseWaitRunnable(tr("Tracing")){
-        @Override protected void realRun() throws SAXException {
-          reader.read(input);
-        }
-        @Override protected void finish() {
-          
-        }
-        @Override protected void cancel() {
-          reader.cancel();
-          executeThread.interrupt();
-          p.destroy();
-        }
-      };
-      Thread executeThread = new Thread(lakewalkerTask);
-      executeThread.start();
-    }
-    catch (Exception ex) {
-      System.out.println("Exception caught: " + ex.getMessage());
-    }
-
-
+    if(!waytype.equals("none")){
+          way.put("natural",waytype);
+    }
+    
+    way.put("created_by", "Dshpak_landsat_lakes");
+    
+        way.nodes.add(fn);
+        
+        
+        if (!commands.isEmpty()) {
+        Main.main.undoRedo.add(new SequenceCommand(tr("Lakewalker trace"), commands));
+        Main.ds.setSelected(ways);
+    } else {
+          System.out.println("Failed");
+    }
+  }
+  
+  public void cancel() {
+          cancel = true;
   }
 
@@ -164 +266 @@
   public void mouseReleased(MouseEvent e) {
   }
-
-
-  // class DuplicateDialog extends JDialog {
-  // private static final long serialVersionUID = 1L;
-  // protected Box mainPanel;
-  // protected IntConfigurer offset;
-  // protected boolean cancelled;
-  // protected String right;
-  // protected String left;
-  // protected JComboBox moveCombo;
-  //
-  // public DuplicateDialog(String title) {
-  // super();
-  // this.setTitle(title);
-  // this.setModal(true);
-  // initComponents();
-  // }
-  //
-  // protected void initComponents() {
-  // mainPanel = Box.createVerticalBox();
-  // offset = new IntConfigurer("", tr("Offset (metres): "), new Integer(15));
-  // mainPanel.add(offset.getControls());
-  // getContentPane().add(mainPanel);
-  //
-  // right = tr("right/down");
-  // left = tr("left/up");
-  // Box movePanel = Box.createHorizontalBox();
-  // movePanel.add(new JLabel(tr("Create new segments to the ")));
-  // moveCombo = new JComboBox(new String[] {right, left});
-  // movePanel.add(moveCombo);
-  // movePanel.add(new JLabel(tr(" of existing segments.")));
-  // mainPanel.add(movePanel);
-  //
-  // Box buttonPanel = Box.createHorizontalBox();
-  // JButton okButton = new JButton(tr("Ok"));
-  // okButton.addActionListener(new ActionListener() {
-  // public void actionPerformed(ActionEvent e) {
-  // cancelled = false;
-  // setVisible(false);
-  //
-  // }
-  // });
-  // JButton canButton = new JButton(tr("Cancel"));
-  // canButton.addActionListener(new ActionListener() {
-  // public void actionPerformed(ActionEvent e) {
-  // cancelled = true;
-  // setVisible(false);
-  // }
-  // });
-  // buttonPanel.add(okButton);
-  // buttonPanel.add(canButton);
-  // mainPanel.add(buttonPanel);
-  //
-  // pack();
-  // }
-  //
-  // protected int getOffset() {
-  // int off = offset.getIntValue(15);
-  // return right.equals(moveCombo.getSelectedItem()) ? off : -off;
-  // }
-  //
-  // protected boolean isCancelled() {
-  // return cancelled;
-  // }
-  //
-  // }
+  
 }

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java

@@ -20 +20 @@
   
   protected String name;
+  protected String name2;
 
   public LakewalkerPlugin() {
     name = tr("Lake Walker");
+    name2 = tr("Lake Walker (Old)");
     JMenu toolsMenu = null;
     for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
@@ -40 +42 @@
       toolsMenu.addSeparator();
       toolsMenu.add(new JMenuItem(new LakewalkerAction(name)));
+      toolsMenu.add(new JMenuItem(new LakewalkerActionOld(name2)));
     }