Changeset 227 in josm for src/org/openstreetmap

Timestamp:

2007-05-07T23:17:41+02:00 (18 years ago)

Author:

framm

Message:

Support new 0.4 attributes "user" and "visible"; support config option "osm-server.additional-versions" containig a comma separated list of version numbers that should be accepted when reading OSM files - defaults to 0.3 to allow reading 0.3 files.

Location:

src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (2 diffs)
• data/osm/User.java (added)
• io/OsmReader.java (modified) (8 diffs)
• io/OsmWriter.java (modified) (2 diffs)

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

@@ -56 +56 @@
 
         /**
+         * Visibility status as specified by the server. The visible attribute was
+         * introduced with the 0.4 API to be able to communicate deleted objects
+         * (they will have visible=false). Currently JOSM does never deal with
+         * these, so this is really for future use only.
+         */
+        public boolean visible = true;
+        
+        /** 
+         * User that last modified this primitive, as specified by the server.
+         * Never changed by JOSM.
+         */
+        public User user = null;
+        
+        /**
          * <code>true</code>, if the object has been shown. This property is not used
          * internally by JOSM, but can be used by plugins that take over the object
@@ -182 +196 @@
                         deleted == osm.deleted &&
                         (semanticOnly || (timestamp == null ? osm.timestamp==null : timestamp.equals(osm.timestamp))) &&
+                        (semanticOnly || (user == null ? osm.user==null : user==osm.user)) &&
+                        (semanticOnly || (visible == osm.visible)) &&
                         (keys == null ? osm.keys==null : keys.equals(osm.keys));
         }

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

@@ -6 +6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.reflect.Array;
 import java.text.ParseException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
@@ -20 +23 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Segment;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
@@ -76 +80 @@
                         osm.deleted = deleted;
                         osm.timestamp = timestamp;
+                        osm.user = user;
+                        osm.visible = visible;
                 }
         }
@@ -84 +90 @@
          */
         private Map<OsmPrimitiveData, long[]> segs = new HashMap<OsmPrimitiveData, long[]>();
+
         /**
          * Data structure for the remaining way objects
@@ -89 +96 @@
         private Map<OsmPrimitiveData, Collection<Long>> ways = new HashMap<OsmPrimitiveData, Collection<Long>>();
 
+        /** 
+         * List of protocol versions that will be accepted on reading
+         */
+        private HashSet<String> allowedVersions = new HashSet<String>();
 
         private class Parser extends MinML2 {
@@ -101 +112 @@
                                         if (atts == null)
                                                 throw new SAXException(tr("Unknown version"));
-                                        if (!Main.pref.get("osm-server.version", "0.4").equals(atts.getValue("version")))
+                                        if (!allowedVersions.contains(atts.getValue("version")))
                                                 throw new SAXException(tr("Unknown version")+": "+atts.getValue("version"));
                                 } else if (qName.equals("node")) {
@@ -138 +149 @@
                 }
         }
+        
+        /** 
+         * Constructor initializes list of allowed protocol versions.
+         */
+        public OsmReader() {
+                // first add the main server version
+                allowedVersions.add(Main.pref.get("osm-server.version", "0.4"));
+                // now also add all compatible versions
+                String[] additionalVersions = 
+                        Main.pref.get("osm-server.additional-versions", "0.3").split("/,/");
+                allowedVersions.addAll(Arrays.asList(additionalVersions));      
+        }
 
         /**
@@ -155 +178 @@
                                 throw new SAXException(tr("Couldn''t read time format \"{0}\".",time));
                         }
+                }
+                
+                // user attribute added in 0.4 API
+                String user = atts.getValue("user");
+                if (user != null) {
+                        // do not store literally; get object reference for string
+                        current.user = User.get(user);
+                }
+                
+                // visible attribute added in 0.4 API
+                String visible = atts.getValue("visible");
+                if (visible != null) {
+                        current.visible = Boolean.parseBoolean(visible);
                 }
 

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

@@ -153 +153 @@
 
         /**
-         * Add the common part as the from of the tag as well as the id or the action tag.
+         * Add the common part as the form of the tag as well as the XML attributes
+         * id, action, user, and visible.
          */
         private void addCommon(OsmPrimitive osm, String tagname) {
@@ -170 +171 @@
                         out.print(" timestamp='"+time+"'");
                 }
+                // user and visible added with 0.4 API
+                if (osm.user != null) {
+                        out.print(" user='"+XmlWriter.encode(osm.user.name)+"'");
+                }
+                out.print(" visible='"+osm.visible+"'");
+                
         }
 }