Changeset 24654 in osm for applications/editors/josm

Timestamp:

2010-12-08T15:53:35+01:00 (14 years ago)

Author:

extropy

Message:

Pfgimport: added option to filter orthogonal shapes (buildings)

Location:

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

Files:

• LoadPdfDialog.java (modified) (4 diffs)
• OrthogonalShapesFilter.java (added)
• PathOptimizer.java (modified) (3 diffs)

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

@@ -137 +137 @@
         private JCheckBox splitOnShapeClosedCheck;
         private JCheckBox splitOnSingleSegmentCheck;
+        private JCheckBox splitOnOrthogonalCheck;
 
 
@@ -254 +255 @@
                 this.splitOnShapeClosedCheck = new JCheckBox(tr("Shape closed"));
                 this.splitOnSingleSegmentCheck = new JCheckBox(tr("Single segments"));
+                this.splitOnOrthogonalCheck = new JCheckBox(tr("Orthogonal shapes"));
 
                 JPanel configPanel = new JPanel(new GridBagLayout());
@@ -308 +310 @@
                 c.gridx = 1; c.gridy = 8; c.gridwidth = 1;
                 configPanel.add(this.splitOnColorChangeCheck, c);
+                c.gridx = 2; c.gridy = 8; c.gridwidth = 1;
+                configPanel.add(this.splitOnOrthogonalCheck, c);
 
 
@@ -767 +771 @@
                 monitor.setTicks(95);
                 monitor.setCustomText(tr("Finalizing layers"));
-                data.splitLayersByPathKind(this.splitOnShapeClosedCheck.isSelected(), this.splitOnSingleSegmentCheck.isSelected());
+                data.splitLayersByPathKind(this.splitOnShapeClosedCheck.isSelected(), this.splitOnSingleSegmentCheck.isSelected(), this.splitOnOrthogonalCheck.isSelected());
                 data.finish();
 

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

@@ -164 +164 @@
         }
 
-        public void splitLayersByPathKind(boolean closed, boolean single) {
+        public void splitLayersByPathKind(boolean closed, boolean single, boolean orthogonal) {
                 List<LayerContents> newLayers = new ArrayList<LayerContents>();
                 for(LayerContents l: this.layers) {
-                        List<LayerContents> splitResult = splitBySegmentKind(l, closed, single);
+                        List<LayerContents> splitResult = splitBySegmentKind(l, closed, single, orthogonal);
 
                         for(LayerContents ll: splitResult) {
@@ -583 +583 @@
         }
 
-        private List<LayerContents> splitBySegmentKind(LayerContents layer, boolean closed, boolean single)
+        private List<LayerContents> splitBySegmentKind(LayerContents layer, boolean closed, boolean single, boolean orthogonal)
         {
                 if (!closed && !single) {
-                        return Collections.singletonList(layer);
-                }
+                        return Collections.singletonList(layer);                        
+                }
+                
+                OrthogonalShapesFilter of = new OrthogonalShapesFilter(10);
 
                 List<PdfPath> singleSegmentPaths = new ArrayList<PdfPath>();
                 List<PdfPath> multiSegmentPaths = new ArrayList<PdfPath>();
                 List<PdfPath> closedPaths = new ArrayList<PdfPath>();
+                List<PdfPath> orthogonalPaths = new ArrayList<PdfPath>();
+                List<PdfPath> orthogonalClosedPaths = new ArrayList<PdfPath>();
 
                 for(PdfPath path: layer.paths) {
-                        if (path.points.size() <= 3 && single) {
+                        boolean pathOrthgonal = orthogonal && of.isOrthogonal(path);
+                        boolean pathUnclosed = !path.isClosed() && closed;
+                        boolean pathSingleSegment = path.points.size() <= 3 && single;
+                        
+                        if (pathSingleSegment) {
                                 singleSegmentPaths.add(path);
                         }
-                        else if (!path.isClosed() && closed) {
-                                multiSegmentPaths.add(path);
+                        else if (pathUnclosed) {
+                                
+                                if (pathOrthgonal) {
+                                        orthogonalPaths.add(path);
+                                }
+                                else {
+                                        multiSegmentPaths.add(path);
+                                }
                         }
                         else {
-                                closedPaths.add(path);
+                                if (pathOrthgonal) {
+                                        orthogonalClosedPaths.add(path);        
+                                }
+                                else
+                                {
+                                        closedPaths.add(path);
+                                }
+                                
                         }
                 }
@@ -618 +639 @@
                         LayerContents l = new LayerContents();
                         l.paths = singleSegmentPaths;
+                        l.info = layer.info.copy();
+                        layers.add(l);
+                }
+                
+
+                if (orthogonalPaths.size() > 0) {
+                        LayerContents l = new LayerContents();
+                        l.paths = orthogonalPaths;
+                        l.info = layer.info.copy();
+                        layers.add(l);
+                }
+                
+                if (orthogonalClosedPaths.size() > 0) {
+                        LayerContents l = new LayerContents();
+                        l.paths = orthogonalClosedPaths;
                         l.info = layer.info.copy();
                         layers.add(l);