Changeset 247 in josm

Timestamp:

2007-05-24T22:55:15+02:00 (17 years ago)

Author:

framm

Message:

Display a yellow rectangle around the original download bounding box(es). Fixes (well, almost) #149.
Still todo: merge rectangles into nice polygon; possibly shade outlying area and optionally forbid changes to items in that area.

Location:

src/org/openstreetmap/josm

Files:

• actions/OpenAction.java (modified) (2 diffs)
• data/osm/DataSet.java (modified) (1 diff)
• data/osm/DataSource.java (added)
• gui/layer/OsmDataLayer.java (modified) (4 diffs)
• gui/preferences/DrawingPreference.java (modified) (3 diffs)
• io/BoundingBoxDownloader.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
@@ -86 +87 @@
                                 if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) {
                                         dataSet = OsmReader.parseDataSet(new FileInputStream(file), null, Main.pleaseWaitDlg);
+                                        DataSource src = new DataSource();
+                                        src.sourceSpec = "File " + fn;
+                                        dataSet.dataSources.add(src);
                                 } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) {
                                         JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("CSV Data import for non-GPS data is not implemented yet."));

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -43 +43 @@
         public Collection<Way> ways = new LinkedList<Way>();
 
+        /**
+         * All data sources of this DataSet.
+         */
+        public Collection<DataSource> dataSources = new LinkedList<DataSource>();
+        
         /**
          * A list of listeners to selection changed events.

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.GridBagLayout;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.io.File;
@@ -29 +31 @@
 import org.openstreetmap.josm.actions.SaveAsAction;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -140 +144 @@
          */
         @Override public void paint(final Graphics g, final MapView mv) {
+                if (Main.pref.getBoolean("draw.data.downloaded_area", false)) {
+                        // FIXME this is inefficient; instead a proper polygon has to be built, and instead
+                        // of drawing the outline, the outlying areas should perhaps be shaded.
+                        for (DataSource src : data.dataSources) {
+                                if (src.sourceBounds != null) {
+                                        EastNorth en1 = Main.proj.latlon2eastNorth(src.sourceBounds.min);
+                                        EastNorth en2 = Main.proj.latlon2eastNorth(src.sourceBounds.max);
+                                        Point p1 = mv.getPoint(en1);
+                                        Point p2 = mv.getPoint(en2);
+                                        g.setColor(SimplePaintVisitor.getPreferencesColor("downloaded Area", Color.YELLOW));
+                                        g.drawRect(Math.min(p1.x,p2.x), Math.min(p1.y, p2.y), Math.abs(p2.x-p1.x), Math.abs(p2.y-p1.y));
+                                }
+                        }
+                }
                 mapPainter.setGraphics(g);
                 mapPainter.setNavigatableComponent(mv);
@@ -161 +179 @@
                         osm.visit(visitor);
                 visitor.fixReferences();
+                
+                // copy the merged layer's data source info
+                for (DataSource src : ((OsmDataLayer)from).data.dataSources) 
+                        data.dataSources.add(src);
+                
                 if (visitor.conflicts.isEmpty())
                         return;

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

@@ -18 +18 @@
         private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
         private JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
+        private JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
 
         public void addGui(PreferenceDialog gui) {
@@ -52 +53 @@
                 segmentOrderNumber.setSelected(Main.pref.getBoolean("draw.segment.order_number"));
                 gui.display.add(segmentOrderNumber, GBC.eop().insets(20,0,0,0));
+                
+                // downloaded area
+                sourceBounds.setToolTipText(tr("Draw the boundaries of data loaded from the server."));
+                sourceBounds.setSelected(Main.pref.getBoolean("draw.data.downloaded_area"));
+                gui.display.add(sourceBounds, GBC.eop().insets(20,0,0,0));
         }
 
@@ -60 +66 @@
                 Main.pref.put("draw.segment.direction", directionHint.isSelected());
                 Main.pref.put("draw.segment.order_number", segmentOrderNumber.isSelected());
+                Main.pref.put("draw.data.downloaded_area", sourceBounds.isSelected());
     }
 }

src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
 import org.xml.sax.SAXException;
+
 
 public class BoundingBoxDownloader extends OsmServerReader {
@@ -98 +102 @@
                 Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
                 final DataSet data = OsmReader.parseDataSet(in, null, Main.pleaseWaitDlg);
+                DataSource src = new DataSource();
+                src.sourceSpec = "Server";
+                src.sourceBounds = new Bounds(new LatLon(lat1, lon1), new LatLon(lat2, lon2));
+                data.dataSources.add(src);
                 in.close();
                 activeConnection = null;