Changeset 35308 in osm for applications/editors/josm

Timestamp:

2020-01-27T03:34:26+01:00 (5 years ago)

Author:

donvip

Message:

fix #josm18625 - Option to merge cadastre layers in a single final one

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/fr/cadastre/preferences/CadastrePreferenceSetting.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Changed constructor for Plugin"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="15419"/>
+    <property name="plugin.main.version" value="15786"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.plugins.fr.cadastre.api.CadastreAPI;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -76 +78 @@
                     Logging.error(e);
                 }
+            }
+            List<CadastreDataLayer> layers = MainApplication.getLayerManager().getLayersOfType(CadastreDataLayer.class);
+            if (layers.size() > 1 && Config.getPref().getBoolean("cadastrewms.merge.data.layers")) {
+                GuiHelper.runInEDT(() -> MainApplication.getMenu().merge.merge(layers));
             }
         });

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/preferences/CadastrePreferenceSetting.java

@@ -65 +65 @@
 
     private JCheckBox dontUseRelation = new JCheckBox(tr("Don''t use relation for addresses (but \"addr:street\" on elements)."));
+
+    private JCheckBox mergeDataLayers = new JCheckBox(tr("Merge downloaded cadastre data layers together."));
 
     private JRadioButton grabMultiplier1 = new JRadioButton("", true);
@@ -374 +376 @@
         dontUseRelation.setToolTipText(tr("Enable this to use the tag \"add:street\" on nodes."));
         cadastrewms.add(dontUseRelation, GBC.eop().insets(0, 0, 0, 0));
+
+        // separator
+        cadastrewms.add(new JSeparator(SwingConstants.HORIZONTAL), GBC.eol().fill(GBC.HORIZONTAL));
+
+        // option to merge downloaded data layers
+        mergeDataLayers.setSelected(Config.getPref().getBoolean("cadastrewms.merge.data.layers", false));
+        mergeDataLayers.setToolTipText(tr("Merge automatically all cadastre data layers in a single final layer."));
+        cadastrewms.add(mergeDataLayers, GBC.eop().insets(0, 0, 0, 0));
 
         // end of dialog, scroll bar
@@ -454 +464 @@
         CacheControl.cacheEnabled = enableCache.isSelected();
         Config.getPref().putBoolean("cadastrewms.addr.dontUseRelation", dontUseRelation.isSelected());
+        Config.getPref().putBoolean("cadastrewms.merge.data.layers", mergeDataLayers.isSelected());
         CadastrePlugin.refreshConfiguration();
         CadastrePlugin.refreshMenu();