Changeset 24080 in osm for applications/editors/josm/plugins/pdfimport/src

Timestamp:

2010-11-05T14:48:46+01:00 (14 years ago)

Author:

extropy

Message:

PdfImport: parallel segements removal.

Location:

applications/editors/josm/plugins/pdfimport/src/pdfimport

Files:

• FilePlacement.java (modified) (2 diffs)
• LoadPdfDialog.java (modified) (7 diffs)
• ParallelSegmentsFinder.java (added)
• PathOptimizer.java (modified) (8 diffs)

applications/editors/josm/plugins/pdfimport/src/pdfimport/FilePlacement.java

@@ -91 +91 @@
         }
 
+        EastNorth en = new EastNorth(0, 0);
+
         public LatLon tranformCoords(double x, double y) {
 
                 if (this.projection == null){
-                        return new LatLon(y/1000, x/1000);
+                        //en.setLocation(x * 1024,y * 1024);
+                        //return Main.proj.eastNorth2latlon( en);
+                        return new LatLon(y / 1000, x / 1000);
                 }
                 else{
+
                         x = (x - this.minX) * (this.maxEast - this.minEast) / (this.maxX - this.minX)  + this.minEast;
                         y = (y - this.minY) * (this.maxNorth - this.minNorth) /  (this.maxY - this.minY) + this.minNorth;
-                        return this.projection.eastNorth2latlon(new EastNorth(x, y));
+                        en.setLocation(x,y);
+                        return this.projection.eastNorth2latlon(en);
                 }
         }
@@ -105 +111 @@
         public EastNorth reverseTransform(LatLon coor) {
                 if (this.projection == null){
+                        //EastNorth result = this.projection.latlon2eastNorth(coor);
+                        //result.setLocation(result.east() / 1024, result.north() / 1024);
+                        //return result;
                         return new EastNorth(coor.lon() * 1000, coor.lat() * 1000);
                 }

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -78 +78 @@
         private JTextField colorFilterColor;
         private JCheckBox colorFilterCheck;
+        private JCheckBox removeParallelSegmentsCheck;
+        private JTextField removeParallelSegmentsTolerance;
+        private JCheckBox removeLargeObjectsCheck;
+        private JTextField removeLargeObjectsSize;
 
         public LoadPdfDialog() {
@@ -177 +181 @@
                 this.removeSmallObjectsSize = new JTextField("1");
 
+                this.removeLargeObjectsCheck = new JCheckBox(tr("Remove objects larger than"));
+                this.removeLargeObjectsSize = new JTextField("10");
+
+
                 this.colorFilterCheck = new JCheckBox(tr("Only this color"));
                 this.colorFilterColor = new JTextField("#000000");
+
+                this.removeParallelSegmentsCheck = new JCheckBox(tr("Remove parallel lines"));
+                this.removeParallelSegmentsTolerance = new JTextField("3");
+
 
                 JPanel configPanel = new JPanel(new GridBagLayout());
@@ -197 +209 @@
 
                 c.gridx = 0; c.gridy = 2; c.gridwidth = 1;
+                configPanel.add(this.removeLargeObjectsCheck, c);
+                c.gridx = 1; c.gridy = 2; c.gridwidth = 1; c.anchor = c.NORTHEAST;
+                configPanel.add(new JLabel("Tolerance :"), c);
+                c.gridx = 2; c.gridy = 2; c.gridwidth = 1; c.anchor = c.NORTHWEST;
+                configPanel.add(this.removeLargeObjectsSize, c);
+
+                c.gridx = 0; c.gridy = 3; c.gridwidth = 1;
+                configPanel.add(this.removeParallelSegmentsCheck, c);
+                c.gridx = 1; c.gridy = 3; c.gridwidth = 1; c.anchor = c.NORTHEAST;
+                configPanel.add(new JLabel("Max distance :"), c);
+                c.gridx = 2; c.gridy = 3; c.gridwidth = 1; c.anchor = c.NORTHWEST;
+                configPanel.add(this.removeParallelSegmentsTolerance, c);
+
+                c.gridx = 0; c.gridy = 4; c.gridwidth = 1;
                 configPanel.add(this.colorFilterCheck, c);
-                c.gridx = 2; c.gridy = 2; c.gridwidth = 1;
+                c.gridx = 2; c.gridy = 4; c.gridwidth = 1;
                 configPanel.add(this.colorFilterColor, c);
 
-                c.gridx = 0; c.gridy = 3; c.gridwidth = 2;
+                c.gridx = 0; c.gridy = 5; c.gridwidth = 2;
                 configPanel.add(this.debugModeCheck, c);
 
@@ -270 +296 @@
                 panel.add(okCancelPanel, c);
 
-                this.setSize(400, 500);
+                this.setSize(400, 520);
                 this.setContentPane(panel);
         }
@@ -396 +422 @@
 
                 LatLon ll = ((Node)selected.iterator().next()).getCoor();
-                return this.placement.reverseTransform(ll);
+                FilePlacement pl = new FilePlacement();
+                return pl.reverseTransform(ll);
         }
 
@@ -509 +536 @@
 
 
+                if (this.removeParallelSegmentsCheck.isSelected()) {
+                        try {
+                                double tolerance = Double.parseDouble(this.removeParallelSegmentsTolerance.getText());
+                                data.removeParallelLines(tolerance);
+                        }
+                        catch (Exception e) {
+                                JOptionPane
+                                .showMessageDialog(
+                                                Main.parent,
+                                                tr("Max distance is not a number"));
+                                return null;
+                        }
+                }
+
                 if (this.mergeCloseNodesCheck.isSelected()) {
                         try {
@@ -539 +580 @@
                 }
 
+
+                if (this.removeLargeObjectsCheck.isSelected()) {
+                        try {
+                                double tolerance = Double.parseDouble(this.removeLargeObjectsSize.getText());
+                                data.removeLargeObjects(tolerance);
+                        }
+                        catch (Exception e) {
+                                JOptionPane
+                                .showMessageDialog(
+                                                Main.parent,
+                                                tr("Tolerance is not a number"));
+                                return null;
+                        }
+                }
 
                 data.splitLayersByPathKind();

applications/editors/josm/plugins/pdfimport/src/pdfimport/PathOptimizer.java

@@ -47 +47 @@
 
         public void addMultiPath(LayerInfo info, List<PdfPath> paths) {
+
                 LayerContents layer = this.getLayer(info);
-                PdfMultiPath p = new PdfMultiPath(paths);
-                layer.multiPaths.add(p);
+                boolean goodMultiPath = true;
+
+                for(PdfPath path: paths) {
+                        goodMultiPath &= path.isClosed();
+                }
+
+                if (goodMultiPath) {
+                        PdfMultiPath p = new PdfMultiPath(paths);
+                        layer.multiPaths.add(p);
+                } else {
+                        layer.paths.addAll(paths);
+                }
         }
 
@@ -78 +89 @@
 
 
+        public void removeParallelLines(double maxDistance){
+                for(LayerContents layer: this.layers) {
+                        this.removeParallelLines(layer, maxDistance);
+                }
+        }
 
         public void mergeNodes(double tolerance) {
@@ -96 +112 @@
         public void removeSmallObjects(double tolerance) {
                 for(LayerContents layer: this.layers) {
-                        this.removeSmallObjects(layer, tolerance);
+                        this.removeSmallObjects(layer, tolerance, Double.POSITIVE_INFINITY);
+                }
+        }
+
+
+        public void removeLargeObjects(double tolerance) {
+                for(LayerContents layer: this.layers) {
+                        this.removeSmallObjects(layer, 0.0, tolerance);
                 }
         }
@@ -232 +255 @@
 
 
-        private void removeSmallObjects(LayerContents layer, double tolerance) {
+        private void removeSmallObjects(LayerContents layer, double min, double max) {
                 List<PdfPath> newPaths = new ArrayList<PdfPath>(layer.paths.size());
 
                 for(PdfPath path: layer.paths) {
-                        boolean good = getShapeSize(path) >= tolerance;
+                        double size = getShapeSize(path);
+                        boolean good = size >= min && size <= max;
 
                         if (good) {
@@ -250 +274 @@
                         boolean good = true;
                         for(PdfPath path: mp.paths) {
-                                good &= getShapeSize(path) >= tolerance;
+                                double size = getShapeSize(path);
+                                good &= size >= min && size <= max;
                         }
 
@@ -274 +299 @@
         }
 
+
+
+        /***
+         * This method finds parralel lines with similar distance and removes them.
+         * @param layer
+         */
+        private void removeParallelLines(LayerContents layer, double maxDistance) {
+                double angleTolerance = 1.0 / 180.0 * Math.PI; // 1 degree
+                int minSegments = 10;
+
+                //filter paths by direction
+                List<ParallelSegmentsFinder> angles = new ArrayList<ParallelSegmentsFinder>();
+
+                for(PdfPath path: layer.paths) {
+                        if (path.points.size() != 2){
+                                continue;
+                        }
+
+                        Point2D p1 = path.firstPoint();
+                        Point2D p2 = path.lastPoint();
+                        double angle = Math.atan2(p2.getX() - p1.getX(), p2.getY() - p1.getY());
+                        //normalize between 0 and 180 degrees
+                        while (angle < 0) angle += Math.PI;
+                        while (angle > Math.PI) angle -= Math.PI;
+                        boolean added = false;
+
+                        for(ParallelSegmentsFinder pa: angles) {
+                                if (Math.abs(pa.angle - angle) < angleTolerance){
+                                        pa.addPath(path, angle);
+                                        added = true;
+                                        break;
+                                }
+                        }
+
+                        if (!added) {
+                                ParallelSegmentsFinder pa = new ParallelSegmentsFinder();
+                                pa.addPath(path, angle);
+                                angles.add(pa);
+                        }
+                }
+
+                Set<PdfPath> pathsToRemove = new HashSet<PdfPath>();
+
+                //process each direction
+                for (ParallelSegmentsFinder pa: angles){
+                        if (pa.paths.size() < minSegments){
+                                continue;
+                        }
+
+                        List<ParallelSegmentsFinder> parts = pa.splitByDistance(maxDistance);
+
+                        for(ParallelSegmentsFinder part: parts) {
+                                if (part.paths.size() >= minSegments){
+                                        pathsToRemove.addAll(part.paths);
+                                }
+                        }
+                }
+
+                //generate new path list
+                List<PdfPath> result = new ArrayList<PdfPath>(layer.paths.size() - pathsToRemove.size());
+
+                for(PdfPath path: layer.paths) {
+                        if (!pathsToRemove.contains(path)) {
+                                result.add(path);
+                        }
+                }
+
+                layer.paths = result;
+        }
 
 
@@ -354 +448 @@
                                                 //remove excess segments from start of chain
                                                 while (lastPoint != firstPoint) {
-                                                        PdfPath pathToRemove = pathChain.remove(0);                                                     
+                                                        PdfPath pathToRemove = pathChain.remove(0);
                                                         firstPoint = pathToRemove.getOtherEnd(firstPoint);
                                                 }
@@ -639 +733 @@
 
 
+
 }