Changeset 28912 in osm for applications

Timestamp:

2012-11-09T18:38:59+01:00 (12 years ago)

Author:

roland

Message:

Fixed bug 7660.

Location:

applications/editors/josm/plugins/mirrored_download/src/mirrored_download

Files:

• MirroredDownloadAction.java (modified) (1 diff)
• MirroredDownloadPlugin.java (modified) (3 diffs)
• UrlSelectionDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadAction.java

@@ -162 +162 @@
             return overpassQuery.isEmpty() && "*".equals(overpassType)
                     ? super.getRequestForBbox(lon1, lat1, lon2, lat2)
-                    : overpassType + "[bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2 + "][@meta]" + overpassQuery;
+                    : overpassType + "[bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2 + "]"
+                        + (MirroredDownloadPlugin.getAddMeta() ? "[@meta]" : "") + overpassQuery;
         }
 

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadPlugin.java

@@ -15 +15 @@
     }
     private static String downloadUrl = null;
+    private static boolean addMeta = true;
 
     public static String getDownloadUrl() {
@@ -22 +23 @@
             if (downloadUrl == null)
                 downloadUrl = "http://overpass-api.de/api/xapi?";
+                
+            String metaFlag = Main.pref.get("plugin.mirrored_download.preferred-meta-flag");
+            addMeta = !("void".equals(metaFlag));
         }
         return downloadUrl;
+    }
+    
+    public static boolean getAddMeta() {
+        return addMeta;
     }
 
@@ -29 +37 @@
         downloadUrl = downloadUrl_;
     }
+
+    public static void setAddMeta(boolean addMeta_) {
+        addMeta = addMeta_;
+    }
+
 }

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java

@@ -30 +30 @@
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
@@ -75 +76 @@
   private JTabbedPane tabbedPane = null;
   private JComboBox cbSelectUrl = null;
+  private JCheckBox cbAddMeta = null;
 
   public UrlSelectionDialog() {
@@ -105 +107 @@
     cbSelectUrl.setEditable(true);
 
-    String preferredUrl = Main.pref.get("plugin.mirrored_download.preferred-url");
-    if (preferredUrl != null && !"".equals(preferredUrl))
-      cbSelectUrl.addItem(preferredUrl);
+    cbSelectUrl.addItem(MirroredDownloadPlugin.getDownloadUrl());
 
     for (String url: getURLs()) {
@@ -118 +118 @@
     layoutCons.gridx = 0;
     layoutCons.gridy = 1;
-    layoutCons.gridwidth = 1;
+    layoutCons.gridwidth = 2;
     layoutCons.weightx = 0.0;
     layoutCons.weighty = 0.0;
@@ -124 +124 @@
     gridbag.setConstraints(cbSelectUrl, layoutCons);
     contentPane.add(cbSelectUrl);
+
+    cbAddMeta = new JCheckBox(tr("Enforce meta data"));
+    cbAddMeta.setEnabled(true);
+    cbAddMeta.setSelected(MirroredDownloadPlugin.getAddMeta());
+
+    cbAddMeta.setActionCommand("selectMetaFlag");
+    cbAddMeta.addActionListener(new MetaFlagChangedAction());
+
+    layoutCons.gridx = 0;
+    layoutCons.gridy = 2;
+    layoutCons.gridwidth = 2;
+    layoutCons.weightx = 0.0;
+    layoutCons.weighty = 0.0;
+    layoutCons.fill = GridBagConstraints.BOTH;
+    gridbag.setConstraints(cbAddMeta, layoutCons);
+    contentPane.add(cbAddMeta);
 
     jDialog.pack();
@@ -164 +180 @@
   }
 
+  public class MetaFlagChangedAction implements ActionListener {
+
+    public void actionPerformed(ActionEvent e) {
+      MirroredDownloadPlugin.setAddMeta(cbAddMeta.isSelected());
+      Main.pref.put("plugin.mirrored_download.preferred-meta-flag",
+          cbAddMeta.isSelected() ? "meta" : "void");
+    }
+
+  }
+
   public void setVisible(boolean visible) {
     jDialog.setVisible(visible);