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

Timestamp:

2008-02-19T01:24:25+01:00 (17 years ago)

Author:

jrreid

Message:

Updated lakewalker to remove some debugging calls, add a duplicate node reducer, rename some methods and fixes to reduce wms requests when checking pixels right on the bbox edge

Location:

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker

Files:

• Lakewalker.java (modified) (8 diffs)
• LakewalkerAction.java (modified) (5 diffs)
• LakewalkerWMS.java (modified) (6 diffs)

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

@@ -119 +119 @@
                         }
                         
-                        v = wms.getPixel(xy[0], xy[1],0xFF00FF00);
-                        if(v < 0){
-                                return null;
-                        }
-                        
+                        v = wms.getPixel(xy[0], xy[1]);
                         if(v > this.threshold){
                                 break;
@@ -169 +165 @@
                                 
                                 if(!bbox.contains(geo[0], geo[1])){
-                                        /**
-                                         * TODO: Handle this case
-                                         */
                                         System.out.println("Outside bbox");
                                         break;
                                 }
                                 
-                                v = wms.getPixel(test_x, test_y,0xFF0000FF);
+                                v = wms.getPixel(test_x, test_y);
                                 if(v > this.threshold){
                                         break;
@@ -218 +211 @@
                         }                       
                 }
-                        
-                // DEBUG
-                File f = new File(this.workingdir,"temp.png");
-                wms.saveimage(f,wms.image2);    
-                
+
                 return nodelist;
         }
         
-        public ArrayList<double[]> vertex_reduce(ArrayList<double[]> nodes, double proximity){
+        /**
+         * Remove duplicate nodes from the list
+         * 
+         * @param nodes
+         * @return
+         */
+        public ArrayList<double[]> duplicateNodeRemove(ArrayList<double[]> nodes){
+                
+                double lastnode[] = new double[] {nodes.get(0)[0], nodes.get(0)[1]};
+                
+                for(int i = 1; i < nodes.size(); i++){
+                        double[] thisnode = new double[] {nodes.get(i)[0], nodes.get(i)[1]};
+                        
+                        if(thisnode[0] == lastnode[0] && thisnode[1] == lastnode[1]){
+                                // Remove the node
+                                nodes.remove(i);
+                                
+                                // Shift back one index 
+                                i = i - 1;
+                        }
+                        lastnode = thisnode;
+                }
+                
+                return nodes;
+        }
+        
+        /**
+         * Reduce the number of vertices based on their proximity to each other 
+         * 
+         * @param nodes
+         * @param proximity
+         * @return
+         */
+        public ArrayList<double[]> vertexReduce(ArrayList<double[]> nodes, double proximity){
+                
+                // Check if node list is empty
+                if(nodes.size()==0){
+                        return nodes;
+                }
+                
                 double[] test_v = nodes.get(0);
                 ArrayList<double[]> reducednodes = new ArrayList<double[]>();
@@ -242 +270 @@
         }
         
-        public double point_line_distance(double[] p1, double[] p2, double[] p3){
+        public double pointLineDistance(double[] p1, double[] p2, double[] p3){
                 
                 double x0 = p1[0]; 
@@ -258 +286 @@
         }
         
-        public ArrayList<double[]> douglas_peucker(ArrayList<double[]> nodes, double epsilon){
+        public ArrayList<double[]> douglasPeucker(ArrayList<double[]> nodes, double epsilon){
+                
+                // Check if node list is empty
+                if(nodes.size()==0){
+                        return nodes;
+                }
+                
                 int farthest_node = -1;
                 double farthest_dist = 0;
@@ -269 +303 @@
                 
                 for(int i = 1; i < nodes.size(); i++){
-                        d = point_line_distance(nodes.get(i),first,last);
+                        d = pointLineDistance(nodes.get(i),first,last);
                         if(d>farthest_dist){
                                 farthest_dist = d;
@@ -280 +314 @@
                 
                 if(farthest_dist > epsilon){
-                        seg_a = douglas_peucker(sublist(nodes,0,farthest_node+1),epsilon);
-                        seg_b = douglas_peucker(sublist(nodes,farthest_node,nodes.size()-1),epsilon);
+                        seg_a = douglasPeucker(sublist(nodes,0,farthest_node+1),epsilon);
+                        seg_b = douglasPeucker(sublist(nodes,farthest_node,nodes.size()-1),epsilon);
                                 
                         new_nodes.addAll(seg_a);
@@ -353 +387 @@
                 
                 protected Boolean contains(double lat, double lon){
-                  if(lat > this.top || lat < this.bottom){
+                  if(lat >= this.top || lat <= this.bottom){
                     return false;
+                  }
+                  if(lon >= this.right || lon <= this.left){
+                          return false;
                   }
                   if((this.right - this.left) % 360 == 0){

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

@@ -152 +152 @@
         setStatus("Running vertex reduction...");
         
-        nodelist = lw.vertex_reduce(nodelist, epsilon);
+        nodelist = lw.vertexReduce(nodelist, epsilon);
         
         System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
@@ -162 +162 @@
         setStatus("Running Douglas-Peucker approximation...");
         
-        nodelist = lw.douglas_peucker(nodelist, epsilon);
+        nodelist = lw.douglasPeucker(nodelist, epsilon);
         
         System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
           
+        /**
+         * And then through a duplicate node remover
+         */
+        
+        setStatus("Removing duplicate nodes...");
+        
+        nodelist = lw.duplicateNodeRemove(nodelist);
+        
+        System.out.println("After removing duplicate nodes, "+nodelist.size()+" nodes remain.");
+          
+        
         /**
          * Turn the arraylist into osm nodes
@@ -225 +236 @@
         }
         
-        commands.add(new AddCommand(way));
+        
         String waytype = Main.pref.get(LakewalkerPreferences.PREF_WAYTYPE, "water");
     
@@ -236 +247 @@
         way.nodes.add(fn);
         
+        commands.add(new AddCommand(way));
         
         if (!commands.isEmpty()) {
@@ -243 +255 @@
           System.out.println("Failed");
     }
+        
+        commands = new LinkedList<Command>();
+        ways = new ArrayList<Way>();
+        
   }
   

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

@@ -23 +23 @@
         // Hashmap to hold the mapping of cached images 
         private HashMap<String,Integer> imageindex = new HashMap<String,Integer>();
-        
-        public BufferedImage image2 = new BufferedImage(2000, 2000, BufferedImage.TYPE_INT_RGB);
         
         private int resolution;
@@ -152 +150 @@
         }
         
-        public int getPixel(int x, int y, int pixcol){
+        public int getPixel(int x, int y) throws LakewalkerException{
                 
                 BufferedImage image = null;
@@ -160 +158 @@
                 } catch(LakewalkerException e){
                         System.out.println(e.getError());
-                        return -1;
+                        throw new LakewalkerException(e.getMessage());                  
                 }
         
@@ -173 +171 @@
                 int rgb = image.getRGB(pixel_x,pixel_y);
                 
-                // DEBUG: set the pixels
-                this.image2.setRGB(pixel_x,pixel_y,pixcol);
-                
                 int pixel;
                 
@@ -182 +177 @@
         int b = (rgb >>  0) & 0xff;
 
-        //pixel = rgbToGrey(pixel); //(r+g+b)/3; //pixel & 0xff;
-        
-        int pixel2 = (int)((0.212671 * r) + (0.715160 * b) + (0.072169 * b));
-        
         pixel = (int)((0.30 * r) + (0.59 * b) + (0.11 * g));
                 
-                //System.out.println(pixel_y+","+pixel_x+"  "+r+","+g+","+b+"="+pixel+"("+pixel2+")");
-
                 return pixel; 
         }
         
-        private int rgbToGrey(int color) {
-                Color c = new Color(color);
-            int red = c.getRed();
-            int green = c.getGreen();
-            int blue = c.getBlue();
-            int tot = (red + green + blue) / 3;
-            return tot;
-        }
-
         public int floor(int num, int precision){
                 double dnum = num/(double)precision;
@@ -214 +194 @@
                 return val.doubleValue() ;
         }
-
+        
         public double[] xy_to_geo(int x, int y, double resolution){
                 double[] geo = new double[2];