Changeset 6874 in osm for applications/editors/josm/plugins

Timestamp:

2008-02-14T07:06:04+01:00 (17 years ago)

Author:

jrreid

Message:

Update lakewalker plugin to automatically break ways up into sections of length as specified in preferences

Location:

applications/editors/josm/plugins/lakewalker

Files:

• Lakewalker/lakewalker.py (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java (modified) (4 diffs)

applications/editors/josm/plugins/lakewalker/Lakewalker/lakewalker.py

@@ -85 +85 @@
 def download_landsat(c1, c2, width, height, fname):
     layer = "global_mosaic_base"
+    #style = "IR1"
     style = options.wmslayer
 
@@ -356 +357 @@
     # n lat lon - A node
     # x - End of data
+    countnodes = 0
+    
     print "s %s" % len(lakelist)
     for nodelist in lakelist:
@@ -361 +364 @@
         for node in nodelist:
             print "n %.7f %.7f" % (node[0], node[1])
+            
+            countnodes = countnodes + 1
+            if options.MAXLEN == countnodes:
+              print "x"
+              print "t %s" % len(nodelist)
+              print "n %.7f %.7f" % (node[0], node[1])
+              countnodes = 0
+              
     print "x"
 
@@ -432 +443 @@
     parser.add_option("--threshold", "-t", type="int", default="35", metavar="VALUE", help="Maximum gray value to accept as water (based on Landsat IR-1 data). Can be in the range 0-255. Defaults to 35.")
     parser.add_option("--maxnodes", type="int", default="50000", metavar="N", help="Maximum number of nodes to generate before bailing out. Defaults to 50000.")
-    parser.add_option("--waylength", type="int", default=250, metavar="MAXLEN", help="Maximum nuber of nodes allowed in one way. Defaults to 250.")
+    parser.add_option("--waylength", type="int", dest="MAXLEN", default=500, metavar="MAXLEN", help="Maximum nuber of nodes allowed in one way. Defaults to 250.")
     parser.add_option("--landsat-res", type="int", default=4000, dest="resolution", metavar="RES", help="Resolution of Landsat tiles, measured in pixels per degree. Defaults to 4000.")
     parser.add_option("--tilesize", type="int", default=2000, help="Size of one landsat tile, measured in pixels. Defaults to 2000.")

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

@@ -95 +95 @@
     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");

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

@@ -74 +74 @@
     
     pythonConfig.setValue(Main.pref.get(PREF_PYTHON, "python.exe"));
-    maxSegsConfig.setValue(Main.pref.get(PREF_MAX_SEG, "250"));
+    maxSegsConfig.setValue(Main.pref.get(PREF_MAX_SEG, "500"));
     maxNodesConfig.setValue(Main.pref.get(PREF_MAX_NODES, "50000"));
     thresholdConfig.setValue(Main.pref.get(PREF_THRESHOLD, "35"));

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

@@ -59 +59 @@
     try {
         
-      Node fn = null; //new Node(new LatLon(0,0));
+          Node n = null;  // The current node being created
+          Node tn = null; // The last node of the previous way
+      Node fn = null; // Node to hold the first node in the trace
         
       while ((line = input.readLine()) != null) {
@@ -70 +72 @@
         case 'n':
           String[] tokens = line.split(" ");
-          try {
-            LatLon ll = new LatLon(Double.parseDouble(tokens[1])+northOffset, Double.parseDouble(tokens[2])+eastOffset);
-            Node n = new Node(ll);
-            commands.add(new AddCommand(n));
-            way.nodes.add(n);
-            if(fn==null){
-                fn = n;
-            }
+          
+          if(tn==null){
+                      try {             
+                        LatLon ll = new LatLon(Double.parseDouble(tokens[1])+northOffset, Double.parseDouble(tokens[2])+eastOffset);
+                        n = new Node(ll);
+                        if(fn==null){
+                          fn = n;
+                        }
+                        commands.add(new AddCommand(n));
+                      }
+                  catch (Exception ex) {
+                          
+                      }
+          
+          } else {
+            // If there is a last node, and this node has the same coordinates
+            // then we substitute for the previous node
+                n = tn;
+                tn = null;              
           }
-          catch (Exception ex) {
-
-          }
+              
+              way.nodes.add(n);
+          
           break;
 
@@ -99 +112 @@
           
           break;
+        
+        case 't':       
+                way = new Way();
+                tn = n;
+                break;
           
         case 'e':
@@ -107 +125 @@
       } 
       input.close();
+
+      // Add the start node to the end of the trace to form a closed shape 
       way.nodes.add(fn);
     }