Changeset 6127 in osm

Timestamp:

2007-12-21T03:27:11+01:00 (17 years ago)

Author:

jrreid

Message:

Add preference to select the default tag applied to the ways, and correct a bug that resulted in the ways not being closed. Also update build.xml to call javac to compile automatically.

Location:

applications/editors/josm/plugins/lakewalker

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java (modified) (4 diffs)

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

@@ -28 +28 @@
   <target name="compile" depends="init">
     <mkdir dir="build"></mkdir>
+    <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+          <include name="**/*.java" />
+        </javac>
     <mkdir dir="build/images"></mkdir>
     <copy todir="build">

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

@@ -14 +14 @@
 
   public static final String[] DIRECTIONS = new String[] {"east", "northeast", "north", "northwest", "west", "southwest", "south", "southeast"};
+  public static final String[] WAYTYPES = new String[] {"water", "coastline", "land", "none"};
 
   public static final String PREF_PYTHON = "lakewalker.python";
@@ -25 +26 @@
   public static final String PREF_NORTH_OFFSET = "lakewalker.north_offset";
   public static final String PREF_START_DIR = "lakewalker.startdir";
+  public static final String PREF_WAYTYPE = "lakewalker.waytype";
     
   protected StringConfigurer pythonConfig = new StringConfigurer();
@@ -45 +47 @@
   protected JLabel northOffsetLabel = new JLabel(tr("Shift all traces to north (degrees)"));
   protected StringEnumConfigurer startDirConfig = new StringEnumConfigurer(DIRECTIONS);
-  protected JLabel startDirLabel = new JLabel(tr("Direction to search for land"));
+  protected JLabel startDirLabel = new JLabel(tr("Direction to search for land"));  
+  protected StringEnumConfigurer lakeTypeConfig = new StringEnumConfigurer(WAYTYPES);
+  protected JLabel lakeTypeLabel = new JLabel(tr("Tag ways as"));
   
   public void addGui(PreferenceDialog gui) {
@@ -57 +61 @@
     eastOffsetConfig.setToolTipText(tr("Offset all points in East direction (degrees). Default 0."));   
     northOffsetConfig.setToolTipText(tr("Offset all points in North direction (degrees). Default 0."));   
-    startDirConfig.setToolTipText(tr("Direction to search for land. Default east."));   
+    startDirConfig.setToolTipText(tr("Direction to search for land. Default east."));
+    lakeTypeConfig.setToolTipText(tr("Tag ways as water, coastline, land or nothing. Default is water."));
 
     String description = tr("An interlude to the Lakewalker Python module to trace water bodies on Landsat imagery.<br><br>Version: {0}", LakewalkerPlugin.VERSION);
@@ -73 +78 @@
     northOffsetConfig.setValue(Main.pref.get(PREF_NORTH_OFFSET, "0.0"));
     startDirConfig.setValue(Main.pref.get(PREF_START_DIR, "east"));
+    lakeTypeConfig.setValue(Main.pref.get(PREF_WAYTYPE, "water"));
   }
   
@@ -98 +104 @@
     prefPanel.add(northOffsetConfig.getControls(), dataConstraints);
     prefPanel.add(startDirLabel, labelConstraints);
-    prefPanel.add(startDirConfig.getControls(), dataConstraints);
+    prefPanel.add(startDirConfig.getControls(), dataConstraints);    
+    prefPanel.add(lakeTypeLabel, labelConstraints);
+    prefPanel.add(lakeTypeConfig.getControls(), dataConstraints);
   }
 
@@ -115 +123 @@
     Main.pref.put(PREF_NORTH_OFFSET, northOffsetConfig.getValueString());
     Main.pref.put(PREF_START_DIR, startDirConfig.getValueString());
+    Main.pref.put(PREF_WAYTYPE, lakeTypeConfig.getValueString());
   }
   

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

@@ -58 +58 @@
     
     try {
+        
+      Node fn = null; //new Node(new LatLon(0,0));
+        
       while ((line = input.readLine()) != null) {
         if (cancel) {
@@ -72 +75 @@
             commands.add(new AddCommand(n));
             way.nodes.add(n);
+            if(fn==null){
+                fn = n;
+            }
           }
           catch (Exception ex) {
@@ -83 +89 @@
           
         case 'x':
+          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));
+          
           break;
           
@@ -94 +107 @@
       } 
       input.close();
+      way.nodes.add(fn);
     }