Changeset 8316 for branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3

Timestamp:

07/21/12 23:49:56 (12 years ago)

Author:

spimming

Message:

#1894:

• check if way has missing node references
• check if attribute exists before using it
• test program restructured

File:

• branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data/XmlDataSource.cs (modified) (4 diffs)

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data/XmlDataSource.cs

@@ -91 +91 @@
       using (XmlReader reader = XmlReader.Create(file.FullName, settings)) {
         reader.ReadStartElement("osm");
-        reader.ReadStartElement("bounds");
+        //reader.ReadStartElement("bounds");
+        reader.Read();
         while (reader.LocalName.Equals("node")) {
           Node node = new Node();
@@ -119 +120 @@
           GetBaseAttributes(reader, way);
           reader.Read();
+          bool missingNodes = false;
           while (reader.LocalName.Equals("nd") || reader.LocalName.Equals("tag")) {
             if (reader.LocalName.Equals("nd")) {
               long refNodeId = XmlConvert.ToInt64(reader.GetAttribute("ref"));
-              way.Nodes.Add(GetNode(refNodeId));
+              Node refNode = GetNode(refNodeId);
+              if (refNode != null) {
+                way.Nodes.Add(refNode);
+              } else {
+                missingNodes = true;
+              }
 
             } else if (reader.LocalName.Equals("tag")) {
@@ -131 +138 @@
             reader.Read();
           }
-
+          if (missingNodes) {
+            // TODO: Error/Trace output 
+            // if Way xxx has incomplete nodes. At least one node was missing in the data.
+          }
           ways.Add(way.Id, way);
           InsertNodeWayRelation(way);
@@ -181 +191 @@
         obj.UserId = XmlConvert.ToInt32(reader.GetAttribute("uid"));
       }
-      obj.Visible = XmlConvert.ToBoolean(reader.GetAttribute("visible"));
-      obj.Version = XmlConvert.ToInt32(reader.GetAttribute("version"));
-      obj.Changeset = XmlConvert.ToInt64(reader.GetAttribute("changeset"));
-      obj.Timestamp = XmlConvert.ToDateTime(reader.GetAttribute("timestamp"), XmlDateTimeSerializationMode.Utc);
+      if (reader.GetAttribute("visible") != null) {
+        obj.Visible = XmlConvert.ToBoolean(reader.GetAttribute("visible"));
+      }
+      if (reader.GetAttribute("version") != null) {
+        obj.Version = XmlConvert.ToInt32(reader.GetAttribute("version"));
+      }
+      if (reader.GetAttribute("changeset") != null) {
+        obj.Changeset = XmlConvert.ToInt64(reader.GetAttribute("changeset"));
+      }
+      if (reader.GetAttribute("timestamp") != null) {
+        obj.Timestamp = XmlConvert.ToDateTime(reader.GetAttribute("timestamp"), XmlDateTimeSerializationMode.Utc);
+      }
 
     }