Changeset 14103 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-08-07T19:54:24+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16572 - Conversion options for tags GPX -> OSM (patch by Bjoeni)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -7 +7 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.text.DateFormat;
@@ -19 +20 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 
 import org.openstreetmap.josm.Main;
@@ -32 +37 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -70 +76 @@
     public static class FromGpxLayer extends ConvertToDataLayerAction<GpxLayer> {
 
+        private static final String GPX_SETTING = "gpx.convert-tags";
         private final DateFormat timeFormatter = DateUtils.getGpxFormat();
 
@@ -83 +90 @@
         public DataSet convert() {
             final DataSet ds = new DataSet();
+
+            List<String> keys = new ArrayList<>();
+            String convertTags = Config.getPref().get(GPX_SETTING, "ask");
+            boolean check = "list".equals(convertTags) || "ask".equals(convertTags);
+            boolean none = "no".equals(convertTags); // no need to convert tags when no dialog will be shown anyways
+
             for (GpxTrack trk : layer.data.getTracks()) {
                 for (GpxTrackSegment segment : trk.getSegments()) {
@@ -90 +103 @@
                         for (Entry<String, Object> entry : p.attr.entrySet()) {
                             String key = entry.getKey();
-                            String str = p.getString(key);
-                            if (str != null) {
-                                n.put(key, str);
+                            Object obj = p.get(key);
+                            if (check && !keys.contains(key) && (obj instanceof String || obj instanceof Date)) {
+                                keys.add(key);
+                            }
+                            if (obj instanceof String) {
+                                String str = (String) obj;
+                                if (!none) {
+                                    // only convert when required
+                                    n.put(key, str);
+                                }
                                 if (GpxConstants.PT_TIME.equals(key)) {
+                                    // timestamps should always be converted
                                     try {
                                         n.setTimestamp(DateUtils.fromString(str));
@@ -100 +121 @@
                                     }
                                 }
-                            } else {
-                                Object obj = p.get(key);
-                                if (obj instanceof Date && GpxConstants.PT_TIME.equals(key)) {
-                                    Date date = (Date) obj;
+                            } else if (obj instanceof Date && GpxConstants.PT_TIME.equals(key)) {
+                                // timestamps should always be converted
+                                Date date = (Date) obj;
+                                if (!none) { //... but the tag will only be set when required
                                     n.put(key, timeFormatter.format(date));
-                                    n.setTimestamp(date);
                                 }
+                                n.setTimestamp(date);
                             }
                         }
@@ -117 +138 @@
                 }
             }
+            //gpx.convert-tags: all, list, *ask, no
+            //gpx.convert-tags.last: *all, list, no
+            //gpx.convert-tags.list.yes
+            //gpx.convert-tags.list.no
+            List<String> listPos = Config.getPref().getList(GPX_SETTING + ".list.yes");
+            List<String> listNeg = Config.getPref().getList(GPX_SETTING + ".list.no");
+            if (check && !keys.isEmpty()) {
+                // Either "list" or "ask" was stored in the settings, so the Nodes have to be filtered after all tags have been processed
+                List<String> allTags = new ArrayList<>(listPos);
+                allTags.addAll(listNeg);
+                if (!allTags.containsAll(keys) || "ask".equals(convertTags)) {
+                    // not all keys are in positive/negative list, so we have to ask the user
+                    TagConversionDialogResponse res = showTagConversionDialog(keys, listPos, listNeg);
+                    if (res.sel == null) {
+                        return null;
+                    }
+                    listPos = res.listPos;
+
+                    if ("no".equals(res.sel)) {
+                        // User just chose not to convert any tags, but that was unknown before the initial conversion
+                        return filterDataSet(ds, null);
+                    } else if ("all".equals(res.sel)) {
+                        return ds;
+                    }
+                }
+                if (!listPos.containsAll(keys)) {
+                    return filterDataSet(ds, listPos);
+                }
+            }
             return ds;
+        }
+
+        /**
+         * Filters the tags of the given {@link DataSet}
+         * @param ds The {@link DataSet}
+         * @param listPos A {@code List<String>} containing the tags to be kept, can be {@code null} if all tags are to be removed
+         * @return The {@link DataSet}
+         * @since 14103
+         */
+        public DataSet filterDataSet(DataSet ds, List<String> listPos) {
+            Collection<Node> nodes = ds.getNodes();
+            for (Node n : nodes) {
+                for (String key : n.keySet()) {
+                    if (listPos == null || !listPos.contains(key)) {
+                        n.put(key, null);
+                    }
+                }
+            }
+            return ds;
+        }
+
+        /**
+         * Shows the TagConversionDialog asking the user whether to keep all, some or no tags
+         * @param keys The keys present during the current conversion
+         * @param listPos The keys that were previously selected
+         * @param listNeg The keys that were previously unselected
+         * @return {@link TagConversionDialogResponse} containing the selection
+         */
+        private TagConversionDialogResponse showTagConversionDialog(List<String> keys, List<String> listPos, List<String> listNeg) {
+            TagConversionDialogResponse res = new TagConversionDialogResponse(listPos, listNeg);
+            String lSel = Config.getPref().get(GPX_SETTING + ".last", "all");
+
+            JPanel p = new JPanel(new GridBagLayout());
+            ButtonGroup r = new ButtonGroup();
+
+            p.add(new JLabel(
+                    tr("The GPX layer contains fields that can be converted to OSM tags. How would you like to proceed?")),
+                    GBC.eol());
+            JRadioButton rAll = new JRadioButton(tr("Convert all fields"), "all".equals(lSel));
+            r.add(rAll);
+            p.add(rAll, GBC.eol());
+
+            JRadioButton rList = new JRadioButton(tr("Only convert the following fields:"), "list".equals(lSel));
+            r.add(rList);
+            p.add(rList, GBC.eol());
+
+            JPanel q = new JPanel();
+
+            List<JCheckBox> checkList = new ArrayList<>();
+            for (String key : keys) {
+                JCheckBox cTmp = new JCheckBox(key, !listNeg.contains(key));
+                checkList.add(cTmp);
+                q.add(cTmp);
+            }
+
+            q.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 0));
+            p.add(q, GBC.eol());
+
+            JRadioButton rNone = new JRadioButton(tr("Do not convert any fields"), "no".equals(lSel));
+            r.add(rNone);
+            p.add(rNone, GBC.eol());
+
+            ActionListener enabler = new TagConversionDialogRadioButtonActionListener(checkList, true);
+            ActionListener disabler = new TagConversionDialogRadioButtonActionListener(checkList, false);
+
+            if (!"list".equals(lSel)) {
+                disabler.actionPerformed(null);
+            }
+
+            rAll.addActionListener(disabler);
+            rList.addActionListener(enabler);
+            rNone.addActionListener(disabler);
+
+            ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Options"),
+                    tr("Convert"), tr("Convert and remember selection"), tr("Cancel"))
+                    .setButtonIcons("exportgpx", "exportgpx", "cancel").setContent(p);
+            int ret = ed.showDialog().getValue();
+
+            if (ret == 1 || ret == 2) {
+                for (JCheckBox cItem : checkList) {
+                    String key = cItem.getText();
+                    if (cItem.isSelected()) {
+                        if (!res.listPos.contains(key)) {
+                            res.listPos.add(key);
+                        }
+                        res.listNeg.remove(key);
+                    } else {
+                        if (!res.listNeg.contains(key)) {
+                            res.listNeg.add(key);
+                        }
+                        res.listPos.remove(key);
+                    }
+                }
+                if (rAll.isSelected()) {
+                    res.sel = "all";
+                } else if (rNone.isSelected()) {
+                    res.sel = "no";
+                }
+                Config.getPref().put(GPX_SETTING + ".last", res.sel);
+                if (ret == 2) {
+                    Config.getPref().put(GPX_SETTING, res.sel);
+                } else {
+                    Config.getPref().put(GPX_SETTING, "ask");
+                }
+                Config.getPref().putList(GPX_SETTING + ".list.yes", res.listPos);
+                Config.getPref().putList(GPX_SETTING + ".list.no", res.listNeg);
+            } else {
+                res.sel = null;
+            }
+            return res;
+        }
+
+        private static class TagConversionDialogResponse {
+
+            final List<String> listPos;
+            final List<String> listNeg;
+            String sel = "list";
+
+            TagConversionDialogResponse(List<String> p, List<String> n) {
+                listPos = new ArrayList<>(p);
+                listNeg = new ArrayList<>(n);
+            }
+        }
+
+        private static class TagConversionDialogRadioButtonActionListener implements ActionListener {
+
+            private final boolean enable;
+            private final List<JCheckBox> checkList;
+
+            TagConversionDialogRadioButtonActionListener(List<JCheckBox> chks, boolean en) {
+                enable = en;
+                checkList = chks;
+            }
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                for (JCheckBox ch : checkList) {
+                    ch.setEnabled(enable);
+                }
+            }
         }
     }
@@ -182 +372 @@
         }
         final DataSet ds = convert();
-        final OsmDataLayer osmLayer = new OsmDataLayer(ds, tr("Converted from: {0}", layer.getName()), null);
-        if (layer.getAssociatedFile() != null) {
-            osmLayer.setAssociatedFile(new File(layer.getAssociatedFile().getParentFile(), layer.getAssociatedFile().getName() + ".osm"));
-        }
-        osmLayer.setUploadDiscouraged(true);
-        MainApplication.getLayerManager().addLayer(osmLayer, false);
-        MainApplication.getLayerManager().removeLayer(layer);
+        if (ds != null) {
+            final OsmDataLayer osmLayer = new OsmDataLayer(ds, tr("Converted from: {0}", layer.getName()), null);
+            if (layer.getAssociatedFile() != null) {
+                osmLayer.setAssociatedFile(new File(layer.getAssociatedFile().getParentFile(),
+                        layer.getAssociatedFile().getName() + ".osm"));
+            }
+            osmLayer.setUploadDiscouraged(true);
+            MainApplication.getLayerManager().addLayer(osmLayer, false);
+            MainApplication.getLayerManager().removeLayer(layer);
+        }
     }
 }