Changeset 295 in josm

Timestamp:

2007-07-24T11:23:01+02:00 (17 years ago)

Author:

imi

Message:

• added "download to new layer" option
• added missing color preferences when opening preferences dialog

Location:

src/org/openstreetmap/josm

Files:

• actions/DownloadAction.java (modified) (2 diffs)
• actions/OpenAction.java (modified) (1 diff)
• actions/SaveAction.java (modified) (1 diff)
• actions/SaveAsAction.java (modified) (1 diff)
• actions/downloadtasks/DownloadGpsTask.java (modified) (4 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (3 diffs)
• data/Preferences.java (modified) (3 diffs)
• gui/download/DownloadDialog.java (modified) (3 diffs)
• gui/layer/RawGpsLayer.java (modified) (1 diff)
• gui/preferences/ColorPreference.java (modified) (5 diffs)

src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -34 +34 @@
 
         public void actionPerformed(ActionEvent e) {
-                dialog = new DownloadDialog(Integer.parseInt(Main.pref.get("download.tab", "0")));
+                dialog = new DownloadDialog();
                 
                 JPanel downPanel = new JPanel(new GridBagLayout());
@@ -50 +50 @@
         while (!finish) {
             dlg.setVisible(true);
+            Main.pref.put("download.newlayer", dialog.newLayer.isSelected());
                 if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION) {
                         Main.pref.put("download.tab", Integer.toString(dialog.getSelectedTab()));

src/org/openstreetmap/josm/actions/OpenAction.java

@@ -102 +102 @@
                 throw new IllegalStateException();
             if (gpsData != null && !gpsData.isEmpty())
-                Main.main.addLayer(new RawGpsLayer(gpsData, tr("Tracks from {0}", file.getName()), file));
+                Main.main.addLayer(new RawGpsLayer(false, gpsData, tr("Tracks from {0}", file.getName()), file));
             if (markerData != null && !markerData.isEmpty())
                 Main.main.addLayer(new MarkerLayer(markerData, tr ("Markers from {0}", file.getName()), file));

src/org/openstreetmap/josm/actions/SaveAction.java

@@ -24 +24 @@
         }
         
-        public File getFile(OsmDataLayer layer) {
+        @Override public File getFile(OsmDataLayer layer) {
                 if (layer.associatedFile != null)
                         return layer.associatedFile;

src/org/openstreetmap/josm/actions/SaveAsAction.java

@@ -24 +24 @@
         }
         
-        protected File getFile(OsmDataLayer layer) {
+        @Override protected File getFile(OsmDataLayer layer) {
                 return openFileDialog();
         }

src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
@@ -23 +24 @@
                 private DownloadAction action;
                 private Collection<Collection<GpsPoint>> rawData;
+                private final boolean newLayer;
 
-                public Task(BoundingBoxDownloader reader, DownloadAction action) {
+                public Task(boolean newLayer, BoundingBoxDownloader reader, DownloadAction action) {
                         super(tr("Downloading GPS data"));
                         this.reader = reader;
                         this.action = action;
+                        this.newLayer = newLayer;
                 }
 
@@ -38 +41 @@
                                 return;
                         String name = action.dialog.minlat + " " + action.dialog.minlon + " x " + action.dialog.maxlat + " " + action.dialog.maxlon;
-                        Main.main.addLayer(new RawGpsLayer(rawData, name, null));
+                        RawGpsLayer layer = new RawGpsLayer(true, rawData, name, null);
+                        if (newLayer || findMergeLayer() == null)
+                    Main.main.addLayer(layer);
+                        else
+                                findMergeLayer().mergeFrom(layer);
                 }
+
+                private Layer findMergeLayer() {
+                        if (Main.map == null)
+                                return null;
+                Layer active = Main.map.mapView.getActiveLayer();
+                if (active != null && active instanceof RawGpsLayer)
+                        return active;
+                for (Layer l : Main.map.mapView.getAllLayers())
+                        if (l instanceof RawGpsLayer && ((RawGpsLayer)l).fromServer)
+                                return l;
+                return null;
+        }
 
                 @Override protected void cancel() {
@@ -50 +69 @@
 
         public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-                Task task = new Task(new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), action);
+                Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), action);
                 Main.worker.execute(task);
         }

src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -25 +25 @@
                 private BoundingBoxDownloader reader;
                 private DataSet dataSet;
+                private boolean newLayer;
 
-                public Task(BoundingBoxDownloader reader) {
+                public Task(boolean newLayer, BoundingBoxDownloader reader) {
                         super(tr("Downloading data"));
                         this.reader = reader;
+                        this.newLayer = newLayer;
                 }
 
@@ -40 +42 @@
                         if (dataSet.allPrimitives().isEmpty())
                                 errorMessage = tr("No data imported.");
-                        Main.main.addLayer(new OsmDataLayer(dataSet, tr("Data Layer"), null));
+                        OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer"), null);
+                        if (newLayer)
+                                Main.main.addLayer(layer);
+                        else
+                                Main.main.editLayer().mergeFrom(layer);
                 }
 
@@ -51 +57 @@
 
         public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-                Task task = new Task(new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
+                Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
                 Main.worker.execute(task);
     }

src/org/openstreetmap/josm/data/Preferences.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
 
-import static org.xnap.commons.i18n.I18n.marktr;
-
-import java.awt.Color;
 import java.io.BufferedReader;
 import java.io.File;
@@ -20 +17 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
-import org.openstreetmap.josm.tools.ColorHelper;
 
 
@@ -181 +176 @@
                 properties.put("propertiesdialog.visible", "true");
                 properties.put("osm-server.url", "http://www.openstreetmap.org/api");
-                properties.put("color."+marktr("background"), ColorHelper.color2html(Color.black));
-                properties.put("color."+marktr("node"), ColorHelper.color2html(Color.red));
-                properties.put("color."+marktr("segment"), ColorHelper.color2html(SimplePaintVisitor.darkgreen));
-                properties.put("color."+marktr("way"), ColorHelper.color2html(SimplePaintVisitor.darkblue));
-                properties.put("color."+marktr("incomplete way"), ColorHelper.color2html(SimplePaintVisitor.darkerblue));
-                properties.put("color."+marktr("selected"), ColorHelper.color2html(Color.white));
-                properties.put("color."+marktr("gps point"), ColorHelper.color2html(Color.gray));
-                properties.put("color."+marktr("conflict"), ColorHelper.color2html(Color.gray));
-                properties.put("color."+marktr("scale"), ColorHelper.color2html(Color.white));
                 save();
         }

src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -57 +57 @@
 
         public final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
+        public final JTabbedPane tabpane = new JTabbedPane();
+        public final JCheckBox newLayer;
         
         public double minlon;
@@ -63 +65 @@
         public double maxlat;
         
-        public JTabbedPane tabpane = new JTabbedPane();
         
-        public DownloadDialog(int tabindex) {
+        public DownloadDialog() {
                 setLayout(new GridBagLayout());
                 
@@ -103 +104 @@
                         boundingBoxChanged(null);
                 }
-                
+
+                newLayer = new JCheckBox(tr("Download as new layer"), Main.pref.getBoolean("download.newlayer", true));
+                add(newLayer, GBC.eol().insets(0,5,0,0));
+
                 add(new JLabel(tr("Download Area")), GBC.eol().insets(0,5,0,0));
                 add(tabpane, GBC.eol().fill());
                 
                 try {
-                        tabpane.setSelectedIndex(tabindex);
+                        tabpane.setSelectedIndex(Integer.parseInt(Main.pref.get("download.tab", "0")));
                 } catch (Exception ex) {
-                        // ignore
+                        Main.pref.put("download.tab", "0");
                 }
-                //Dimension d = getPreferredSize();
-                //setPreferredSize(new Dimension((int)(d.width*1.5), d.height));
-                //wc.addInputFields(latlon, osmUrl, osmUrlRefresher);
         }
         

src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -103 +103 @@
          */
         public final Collection<Collection<GpsPoint>> data;
-
-        public RawGpsLayer(Collection<Collection<GpsPoint>> data, String name, File associatedFile) {
+        public final boolean fromServer;
+
+        public RawGpsLayer(boolean fromServer, Collection<Collection<GpsPoint>> data, String name, File associatedFile) {
                 super(name);
+                this.fromServer = fromServer;
                 this.associatedFile = associatedFile;
                 this.data = data;

src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.xnap.commons.i18n.I18n.marktr;
 
 import java.awt.Color;
@@ -27 +28 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -34 +36 @@
         private DefaultTableModel tableModel;
         private JTable colors;
-        public static final String PREF_COLOR_PREFIX = "color.";
-        
+
         /**
          * Set the colors to be shown in the preference table. This method creates a table model if
@@ -89 +90 @@
         public void addGui(final PreferenceDialog gui) {
                 // initial fill with colors from preferences:
-                Map<String,String> prefColorMap = new TreeMap<String, String>(Main.pref.getAllPrefix(PREF_COLOR_PREFIX));
+                Map<String,String> prefColorMap = new TreeMap<String, String>(Main.pref.getAllPrefix("color."));
+                fixColorPrefixes(prefColorMap);
                 Map<String,String> colorMap = new TreeMap<String, String>();
                 for(String key : prefColorMap.keySet()) {
-                        colorMap.put(key.substring(PREF_COLOR_PREFIX.length()), prefColorMap.get(key));
+                        colorMap.put(key.substring("color.".length()), prefColorMap.get(key));
                 }
                 setColorModel(colorMap);
@@ -137 +139 @@
     }
 
+        /**
+         * Add all missing color entries.
+         */
+        private void fixColorPrefixes(Map<String, String> prefColorMap) {
+                String[] cp = {
+                        marktr("background"), ColorHelper.color2html(Color.black),
+                        marktr("node"), ColorHelper.color2html(Color.red),
+                        marktr("segment"), ColorHelper.color2html(SimplePaintVisitor.darkgreen),
+                        marktr("way"), ColorHelper.color2html(SimplePaintVisitor.darkblue),
+                        marktr("incomplete way"), ColorHelper.color2html(SimplePaintVisitor.darkerblue),
+                        marktr("selected"), ColorHelper.color2html(Color.white),
+                        marktr("gps point"), ColorHelper.color2html(Color.gray),
+                        marktr("conflict"), ColorHelper.color2html(Color.gray),
+                        marktr("scale"), ColorHelper.color2html(Color.white),
+                        marktr("inactive"), ColorHelper.color2html(Color.darkGray),
+                };
+                for (int i = 0; i < cp.length/2; ++i)
+                        if (!Main.pref.hasKey("color."+cp[i*2]))
+                                Main.pref.put("color."+cp[i*2], cp[i*2+1]);
+    }
+
         public void ok() {
                 for (int i = 0; i < colors.getRowCount(); ++i) {
                         String name = (String)colors.getValueAt(i, 0);
                         Color col = (Color)colors.getValueAt(i, 1);
-                        Main.pref.put(PREF_COLOR_PREFIX + name, ColorHelper.color2html(col));
+                        Main.pref.put("color." + name, ColorHelper.color2html(col));
                 }
     }