Some null avoidance attempts

EdLoach · Feb 27, 2019 · 807f9db · 807f9db
1 parent 2fb52f8
commit 807f9db
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/CheckPublicTransportRelations/BusStop.cs b/CheckPublicTransportRelations/BusStop.cs
@@ -40,7 +40,7 @@ public BusStop(string elementType, long elementId, string elementAtcoCode, strin
             this.Type = elementType;
             this.Id = elementId;
             this.AtcoCode = elementAtcoCode;
-            this.StopName = stopName;
+            this.StopName = stopName ?? string.Empty;
             this.NaptanCode = naptanCode;
             this.BusStopType = busStopType;
             this.Status = stopStatus;

diff --git a/CheckPublicTransportRelations/MainForm.cs b/CheckPublicTransportRelations/MainForm.cs
@@ -354,20 +354,20 @@ private static BusStop BusStop(dynamic element)
         {
             string type = element.type;
             long id = element.id;
-            string atcoCode = element.tags["naptan:AtcoCode"];
-            string stopName = element.tags["name"];
-            string naptanCode = element.tags["naptan:NaptanCode"];
-            string stopStatus = element.tags["naptan:Status"];
-            string busStopType = element.tags["naptan:BusStopType"];
-            string notName = element.tags["not:name"];
-            string highway = element.tags["highway"];
+            string atcoCode = element.tags["naptan:AtcoCode"] ?? string.Empty;
+            string stopName = element.tags["name"] ?? string.Empty;
+            string naptanCode = element.tags["naptan:NaptanCode"] ?? string.Empty;
+            string stopStatus = element.tags["naptan:Status"] ?? string.Empty;
+            string busStopType = element.tags["naptan:BusStopType"] ?? string.Empty;
+            string notName = element.tags["not:name"] ?? string.Empty;
+            string highway = element.tags["highway"] ?? string.Empty;
 
             // layby tag ignored in this list as may be visible on imagery and not indicative of a survey
-            string physicallyPresent = element.tags["physically_present"];
-            string flagTagValue = element.tags["flag"];
-            string shelterTagValue = element.tags["shelter"];
-            string kerbTagValue = element.tags["kerb"];
-            string timetableCaseTagValue = element.tags["timetable_case"];
+            string physicallyPresent = element.tags["physically_present"] ?? string.Empty;
+            string flagTagValue = element.tags["flag"] ?? string.Empty;
+            string shelterTagValue = element.tags["shelter"] ?? string.Empty;
+            string kerbTagValue = element.tags["kerb"] ?? string.Empty;
+            string timetableCaseTagValue = element.tags["timetable_case"] ?? string.Empty;
             string surveyedValue = !string.IsNullOrEmpty(physicallyPresent) || !string.IsNullOrEmpty(flagTagValue)
                                                                             || !string.IsNullOrEmpty(shelterTagValue)
                                                                             || !string.IsNullOrEmpty(kerbTagValue)
@@ -376,7 +376,7 @@ private static BusStop BusStop(dynamic element)
                     ? "yes"
                     : string.Empty;
 
-            string naptanVerified = element.tags["naptan:verified"];
+            string naptanVerified = element.tags["naptan:verified"] ?? string.Empty;
             var busStop = new BusStop(
                 type,
                 id,
@@ -1248,6 +1248,12 @@ private void ExtractOpenStreetMapRoutes()
                         BusStop busStop = BusStop(element);
                         routeBusStops.Add(busStop);
                     }
+                    else if (element.tags != null && element.tags["highway"] == "bus_stop")
+                    {
+                        stopsDictionary.Add(nodeId, string.Empty);
+                        BusStop busStop = BusStop(element);
+                        routeBusStops.Add(busStop);
+                    }
                 }
 
                 if (type != "relation")