Added check for canceled connections

README.md

@@ -36,7 +36,7 @@ $ gtfsrt2lc -r /path/to/realtime_rawdata -s /path/to/static_rawdata.zip -u /path
 ## How does it work?
 Providing globally unique identifiers to the different entities that comprise a public transport network is fundamental to lower the adoption cost of public transport data in route-planning appplications. Specifically in the case of live updates about the schedules is important to mantain stable identifiers that remain valid over time. Here we use the Linked Data [principles](https://www.w3.org/DesignIssues/LinkedData.html) to transform schedule updates given in the `GTFS-RT` format to [Linked Connections](http://linkedconnections.org/) and we give the option to serialize them in JSON, CSV or RDF (turtle, N-Triples or JSON-LD) format.
 
-The URI strategy to be used during the conversion process is given following the [RFC 6570](https://tools.ietf.org/html/rfc6570) specification for URI templates. Next we describe how can the URI strategy be defined through an example. A basic understanding of the `GTFS` [specification](https://developers.google.com/tansit/gtfs/reference/) is required.
+The URI strategy to be used during the conversion process is given following the [RFC 6570](https://tools.ietf.org/html/rfc6570) specification for URI templates. Next we describe how can the URI strategy be defined through an example. A basic understanding of the `GTFS` [specification](https://developers.google.com/transit/gtfs/reference/) is required.
 
 ### URI templates
 In order to define the URI of the different entities of a public transport network that are referenced in a Linked Connection, we use a single JSON file that contains the different URI templates. We provide an example of such file [here](https://github.com/linkedconnections/gtfsrt2lc/blob/master/uris_template_example.json) which looks as follows:

lib/Connections2JSONLD.js

@@ -58,7 +58,7 @@ class Connections2JSONLD extends Transform {
             this.push(this.context);
         }
 
-        done(null, {
+        let temp = {
             "@id": lc['@id'],
             "@type": lc['@type'],
             "departureStop": lc['departureStop'],
@@ -70,7 +70,16 @@ class Connections2JSONLD extends Transform {
             "direction": lc['direction'],
             "gtfs:trip": lc['trip'],
             "gtfs:route": lc['route']
-        });
+        }
+
+        if(lc['gtfs:pickupType'] != null) {
+            temp["gtfs:pickupType"] = lc['gtfs:pickupType'];
+        }
+
+        if(lc['gtfs:dropOffType'] != null) {
+            temp["gtfs:dropOffType"] = lc['gtfs:dropOffType'];
+        }
+        done(null, temp);
     }
 
     get contextStreamed() {
@@ -86,4 +95,4 @@ class Connections2JSONLD extends Transform {
     }
 }
 
-module.exports = Connections2JSONLD;
+module.exports = Connections2JSONLD;

lib/Gtfsrt2LC.js

@@ -109,6 +109,8 @@ class Gtfsrt2LC {
                                 let routeURI = this.resolveURI(routeTemplate, trip_id, tripStartTime, raw_connection);
                                 let tripURI = this.resolveURI(tripTemplate, trip_id, tripStartTime, raw_connection);
                                 let connectionURI = this.resolveURI(connectionTemplate, trip_id, tripStartTime, raw_connection);
+                                let pickupType = this.resolveScheduleRelationship(stop_times[j].schedule_relationship);
+                                let dropOffType = this.resolveScheduleRelationship(stop_times[j].schedule_relationship);
 
                                 let linked_connection = {
                                     "@id": connectionURI,
@@ -121,7 +123,9 @@ class Gtfsrt2LC {
                                     "arrivalDelay": arrivalDelay,
                                     "direction": this.trips.get(trip_id).trip_headsign,
                                     "trip": tripURI,
-                                    "route": routeURI
+                                    "route": routeURI,
+                                    "gtfs:pickupType": pickupType,
+                                    "gtfs:dropOffType": dropOffType
                                 }
 
                                 readable.push(linked_connection);
@@ -231,7 +235,7 @@ class Gtfsrt2LC {
     }
 
     getConnectionType(entity) {
-        if (entity.is_deleted) {
+        if (entity.is_deleted || entity.trip_update.trip.schedule_relationship == 3) {
             return 'CanceledConnection';
         }
         else {
@@ -303,6 +307,19 @@ class Gtfsrt2LC {
         return value;
     }
 
+    resolveScheduleRelationship(value) {
+        // SCHEDULED
+        if(value == 0) {
+            return 'gtfs:Regular';
+        }
+        // SKIPPED
+        else if(value == 1) {
+            return 'gtfs:NotAvailable';
+        }
+        // NO_DATA
+        return null;
+    }
+
     get path() {
         return this._path;
     }
@@ -320,4 +337,4 @@ class Gtfsrt2LC {
     }
 }
 
-module.exports = Gtfsrt2LC;
+module.exports = Gtfsrt2LC;