Changeset 44 in josm for src/org/openstreetmap/josm/io

Timestamp:

2006-01-23T00:00:39+01:00 (19 years ago)

Author:

imi

Message:

• Save of GPX files does not save deleted - state.
• Please wait window is always at the middle of the window where JOSM started, not the middle of the current JOSM window.
• When saving data with tracks as OSM, an IllegalAddException may occour.
• Saving OSM files reset the new object counter.
• Loading of files changes coordinates (loaded as float, saved as double)

Location:

src/org/openstreetmap/josm/io

Files:

• GpxReader.java (modified) (2 diffs)
• GpxWriter.java (modified) (2 diffs)
• OsmReader.java (modified) (1 diff)
• OsmWriter.java (modified) (2 diffs)
• RawGpsReader.java (modified) (3 diffs)

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

@@ -66 +66 @@
                 Node data = new Node();
                 data.coor = new GeoPoint(
-                        Float.parseFloat(e.getAttributeValue("lat")),
-                        Float.parseFloat(e.getAttributeValue("lon")));
+                        Double.parseDouble(e.getAttributeValue("lat")),
+                        Double.parseDouble(e.getAttributeValue("lon")));
                 
                 for (Object o : e.getChildren()) {
@@ -190 +190 @@
                                 osm.id = Long.parseLong(idElement.getText());
                         osm.modified = e.getChild("modified", JOSM) != null;
+                        osm.setDeleted(e.getChild("deleted", JOSM) != null);
                         osm.modifiedProperties = e.getChild("modifiedProperties", JOSM) != null;
                 }

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

@@ -242 +242 @@
         @SuppressWarnings("unchecked")
         private void addPropertyExtensions(Element e, Map<Key, String> keys, OsmPrimitive osm) {
-                if ((keys == null || keys.isEmpty()) && osm.id == 0 && !osm.modified && !osm.modifiedProperties)
+                if ((keys == null || keys.isEmpty()) && osm.id == 0 && !osm.modified && !osm.isDeleted() && !osm.modifiedProperties)
                         return;
                 Element extensions = e.getChild("extensions", GPX);
@@ -264 +264 @@
                         extensions.getChildren().add(modElement);
                 }
+                if (osm.isDeleted()) {
+                        Element modElement = new Element("deleted", JOSM);
+                        extensions.getChildren().add(modElement);
+                }
                 if (osm.modifiedProperties) {
                         Element modElement = new Element("modifiedProperties", JOSM);

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

@@ -66 +66 @@
                 Node data = new Node();
                 data.coor = new GeoPoint(
-                        Float.parseFloat(e.getAttributeValue("lat")),
-                        Float.parseFloat(e.getAttributeValue("lon")));
+                        Double.parseDouble(e.getAttributeValue("lat")),
+                        Double.parseDouble(e.getAttributeValue("lon")));
                 if (Double.isNaN(data.coor.lat) || 
                                 data.coor.lat < -90 || data.coor.lat > 90 ||

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

@@ -102 +102 @@
          */
         private void addProperties(Element e, OsmPrimitive osm) {
-                if (osm.id == 0)
-                        osm.id = newIdCounter--;
-                e.setAttribute("uid", ""+osm.id);
+                long id = osm.id;
+                if (id == 0)
+                        id = newIdCounter--;
+                e.setAttribute("uid", ""+id);
                 if (osm.keys != null)
                         for (Entry<Key, String> entry : osm.keys.entrySet())
@@ -135 +136 @@
         @SuppressWarnings("unchecked")
         public void visit(Track t) {
-                Element e = new Element("track");
-                addProperties(e, t);
+                element = new Element("track");
+                addProperties(element, t);
                 for (LineSegment ls : t.segments)
-                        e.getChildren().add(new Element("segment").setAttribute("uid", ""+ls.id));
+                        element.getChildren().add(new Element("segment").setAttribute("uid", ""+ls.id));
         }
 

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

@@ -63 +63 @@
                 for (Object o : root.getChildren("wpt", GPX)) {
                         Collection<GeoPoint> line = new LinkedList<GeoPoint>();
-                        line.add(new GeoPoint(parseFloat((Element)o, LatLon.lat), parseFloat((Element)o, LatLon.lon)));
+                        line.add(new GeoPoint(parseDouble((Element)o, LatLon.lat), parseDouble((Element)o, LatLon.lon)));
                         data.add(line);
                 }
@@ -88 +88 @@
          * @throws JDOMException If the absolute of the value is out of bound.
          */
-        private float parseFloat(Element e, LatLon attr) throws JDOMException {
-                float f = Float.parseFloat(e.getAttributeValue(attr.toString()));
-                if (Math.abs(f) > (attr == LatLon.lat ? 90 : 180))
-                        throw new JDOMException("Data error: "+attr+" value '"+f+"' is out of bound.");
-                return f;
+        private double parseDouble(Element e, LatLon attr) throws JDOMException {
+                double d = Double.parseDouble(e.getAttributeValue(attr.toString()));
+                if (Math.abs(d) > (attr == LatLon.lat ? 90 : 180))
+                        throw new JDOMException("Data error: "+attr+" value '"+d+"' is out of bound.");
+                return d;
         }
 
@@ -102 +102 @@
                 Collection<GeoPoint> data = new LinkedList<GeoPoint>();
                 for (Element e : wpt)
-                        data.add(new GeoPoint(parseFloat(e, LatLon.lat), parseFloat(e, LatLon.lon)));
+                        data.add(new GeoPoint(parseDouble(e, LatLon.lat), parseDouble(e, LatLon.lon)));
                 return data;
         }