Changeset 72 in josm

Timestamp:

2006-03-27T08:24:41+02:00 (18 years ago)

Author:

imi

Message:

fixed incomplete line segment saving

Location:

src/org/openstreetmap/josm

Files:

• data/coor/EastNorth.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (1 diff)
• io/OsmReader.java (modified) (1 diff)
• io/OsmWriter.java (modified) (7 diffs)
• tools/XmlWriter.java (added)

src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -21 +21 @@
                 return y;
         }
+        
+        @Override
+        public String toString() {
+                return "(EastNorth e="+x+", n="+y+")";
+        }
 }

src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -75 +75 @@
                                 center.east() + (x - getWidth()/2.0)*scale,
                                 center.north() - (y - getHeight()/2.0)*scale);
-                return Main.pref.getProjection().eastNorth2latlon(eastNorth);
+                return getProjection().eastNorth2latlon(eastNorth);
         }
 

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

@@ -113 +113 @@
         
         @Override
-        public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
+        public void endElement(String namespaceURI, String localName, String qName) {
                 if (qName.equals("node") || qName.equals("segment") || qName.equals("way") || qName.equals("area")) {
                         current.visit(adder);

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.xml.sax.SAXException;
+import org.openstreetmap.josm.tools.XmlWriter;
 
 /**
@@ -20 +20 @@
  */
 public class OsmWriter implements Visitor {
-
-        private class RuntimeEncodingException extends RuntimeException {
-                public RuntimeEncodingException(Throwable t) {
-                        super(t);
-                }
-                public RuntimeEncodingException() {
-                }
-        }
 
         /**
@@ -46 +38 @@
         private final boolean osmConform;
 
-        private final static HashMap<Character, String> encoding = new HashMap<Character, String>();
-        static {
-                encoding.put('<', "&lt;");
-                encoding.put('>', "&gt;");
-                encoding.put('"', "&quot;");
-                encoding.put('\'', "&apos;");
-                encoding.put('&', "&amp;");
-                encoding.put('\n', "&#xA;");
-                encoding.put('\r', "&#xD;");
-                encoding.put('\t', "&#x9;");
-        }
-        
         /**
          * Output the data to the stream
@@ -77 +57 @@
         }
 
-        public static void outputSingle(Writer out, OsmPrimitive osm, boolean osmConform) throws SAXException {
-                try {
-                        OsmWriter writer = new OsmWriter(out, osmConform);
-                        writer.out.println("<?xml version='1.0' encoding='UTF-8'?>");
-                        writer.out.println("<osm version='0.3' generator='JOSM'>");
-                        osm.visit(writer);
-                        writer.out.println("</osm>");
-                } catch (RuntimeEncodingException e) {
-                        throw new SAXException("Your Java installation does not support the required UTF-8 encoding", (Exception)e.getCause());
-                }               
+        public static void outputSingle(Writer out, OsmPrimitive osm, boolean osmConform) {
+                OsmWriter writer = new OsmWriter(out, osmConform);
+                writer.out.println(XmlWriter.header());
+                writer.out.println("<osm version='0.3' generator='JOSM'>");
+                osm.visit(writer);
+                writer.out.println("</osm>");
         }
 
@@ -105 +81 @@
         public void visit(LineSegment ls) {
                 if (ls.incomplete)
-                        throw new IllegalArgumentException("Cannot write an incomplete LineSegment.");
+                        return; // Do not write an incomplete line segment
                 addCommon(ls, "segment");
                 out.print(" from='"+getUsedId(ls.from)+"' to='"+getUsedId(ls.to)+"'");
@@ -137 +113 @@
                                 out.println(">");
                         for (Entry<String, String> e : osm.keys.entrySet())
-                                out.println("    <tag k='"+ encode(e.getKey()) +
-                                                "' v='"+encode(e.getValue())+ "' />");
+                                out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
+                                                "' v='"+XmlWriter.encode(e.getValue())+ "' />");
                         out.println("  </" + tagname + ">");
                 } else if (tagOpen)
@@ -145 +121 @@
                         out.println("  </" + tagname + ">");
         }
-
-        /**
-         * Encode the given string in XML1.0 format.
-         * Optimized to fast pass strings that don't need encoding (normal case).
-         */
-        public String encode(String unencoded) {
-                StringBuilder buffer = null;
-                for (int i = 0; i < unencoded.length(); ++i) {
-                        String encS = encoding.get(unencoded.charAt(i));
-                        if (encS != null) {
-                                if (buffer == null)
-                                        buffer = new StringBuilder(unencoded.substring(0,i));
-                                buffer.append(encS);
-                        } else if (buffer != null)
-                                buffer.append(unencoded.charAt(i));
-                }
-                return (buffer == null) ? unencoded : buffer.toString();
-        }
-
 
         /**