Merge pull request #11 from openTdataCH/feature/taxi-booking

Adds support for taxi mode (with booking)

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.9.4 - 19.02.2023
 - Expose `ojp:LocationExtensionStructure` nodes from `Location` - see [Showing multiple Charging Points of One Charging Station #68](https://github.com/openTdataCH/ojp-demo-app-src/issues/68), [#9](https://github.com/openTdataCH/ojp-js/pull/9)
 - Adds support for more values of on-demand bus mode - [#10](https://github.com/openTdataCH/ojp-js/pull/10)
+- Adds support for taxi / booking via `ojp:BookingArrangements/ojp:BookingArrangement` - see [OJP demo app extension #87](https://github.com/openTdataCH/ojp-demo-app-src/issues/87), [#11](https://github.com/openTdataCH/ojp-js/pull/11)
 
 ## 0.9.3 - 22.01.2023
 - Show transfer path guidance on the map - see [#5](https://github.com/openTdataCH/ojp-js/pull/5)

src/trip/index.ts

@@ -1,3 +1,4 @@
+export * from './leg/continous-leg/service-booking'
 export * from './leg/timed-leg/stop-point-time'
 export * from './leg/trip-leg'
 export * from './leg/trip-continous-leg'

src/trip/leg/continous-leg/service-booking.ts

@@ -0,0 +1,70 @@
+import { XPathOJP } from "../../../helpers/xpath-ojp"
+
+export interface BookingArrangement {
+    agencyCode: string,
+    agencyName: string,
+    infoURL: string,
+}
+
+export class ServiceBooking {
+  public bookingArrangements: BookingArrangement[]
+
+  constructor(bookingArrangements: BookingArrangement[]) {
+    this.bookingArrangements = bookingArrangements;
+  }
+
+  public static initWithContextNode(contextNode: Node): ServiceBooking | null {
+    const bookingArrangementsNodes = XPathOJP.queryNodes('ojp:service/ojp:BookingArrangements/ojp:BookingArrangement', contextNode);
+    if (bookingArrangementsNodes.length === 0) {
+        console.error('ERROR - no BookingArrangements nodes found');
+        return null;
+    }
+
+    const bookingArrangements: BookingArrangement[] = [];
+    bookingArrangementsNodes.forEach(bookingNode => {
+        const agencyCode = XPathOJP.queryText('ojp:BookingAgencyName/ojp:Text', bookingNode);
+        let infoURL = XPathOJP.queryText('ojp:InfoUrl', bookingNode);
+
+        if ((agencyCode === null) || (infoURL === null)) {
+            return;
+        }
+
+        infoURL = infoURL.trim();
+
+        if (infoURL.length < 2) {
+            return null;
+        }
+        // strip out <>
+        infoURL = infoURL.substring(1, infoURL.length - 1);
+
+        var el = document.createElement('textarea');
+        el.innerHTML = infoURL.trim();
+        infoURL = el.innerText;
+
+        bookingArrangements.push({
+            agencyCode: agencyCode.trim(),
+            agencyName: ServiceBooking.computeAgencyName(agencyCode),
+            infoURL: infoURL,
+        });
+    });
+
+    const serviceBooking = new ServiceBooking(bookingArrangements);
+
+    return serviceBooking;
+  }
+
+  private static computeAgencyName(agencyCode: string): string {
+    agencyCode = agencyCode.trim();
+    if (agencyCode === 'catalog_taxi_local.ch') {
+      return 'local.ch';
+    }
+    if (agencyCode === 'catalog_taxi_maps.google.ch') {
+      return 'maps.google.com';
+    }
+    if (agencyCode === 'catalog_taxi_openstreetmap.org') {
+      return 'openstreetmap.org';
+    }
+
+    return 'n/a catalog';
+  }
+}

src/trip/leg/trip-continous-leg.ts

@@ -10,20 +10,23 @@ import { TripLegPropertiesEnum, TripLegDrawType, TripLegLineType } from '../../t
 import { MapLegLineTypeColor } from '../../config/map-colors'
 import { Duration } from '../../shared/duration'
 import { IndividualTransportMode } from '../../types/individual-mode.types'
+import { ServiceBooking } from './continous-leg/service-booking'
 
 export class TripContinousLeg extends TripLeg {
   public legTransportMode: IndividualTransportMode | null
   public legDistance: number
   public pathGuidance: PathGuidance | null
   public walkDuration: Duration | null
+  public serviceBooking: ServiceBooking | null;
 
   constructor(legType: LegType, legIDx: number, legDistance: number, fromLocation: Location, toLocation: Location) {
     super(legType, legIDx, fromLocation, toLocation)
 
     this.legTransportMode = null
     this.legDistance = legDistance
     this.pathGuidance = null
-    this.walkDuration = null
+    this.walkDuration = null;
+    this.serviceBooking = null;
   }
 
   public static initFromTripLeg(legIDx: number, legNode: Node | null, legType: LegType): TripContinousLeg | null {
@@ -50,7 +53,10 @@ export class TripContinousLeg extends TripLeg {
     tripLeg.legDuration = Duration.initFromContextNode(legNode)
 
     tripLeg.pathGuidance = PathGuidance.initFromTripLeg(legNode);
-    tripLeg.legTransportMode = tripLeg.computeLegTransportMode(legNode)
+    tripLeg.legTransportMode = tripLeg.computeLegTransportMode(legNode);
+    if (tripLeg.legTransportMode === 'taxi') {
+      tripLeg.serviceBooking = ServiceBooking.initWithContextNode(legNode);
+    }
 
     tripLeg.legTrack = LegTrack.initFromLegNode(legNode);
 
@@ -79,6 +85,10 @@ export class TripContinousLeg extends TripLeg {
       return 'cycle'
     }
 
+    if (legModeS === 'taxi') {
+      return 'taxi'
+    }
+
     return null
   }
 
@@ -101,6 +111,10 @@ export class TripContinousLeg extends TripLeg {
     return this.legTransportMode === 'walk';
   }
 
+  public isTaxi(): boolean {
+    return this.legTransportMode === 'taxi';
+  }
+
   protected override computeSpecificJSONFeatures(): GeoJSON.Feature[] {
     const features: GeoJSON.Feature[] = [];
 
@@ -140,14 +154,16 @@ export class TripContinousLeg extends TripLeg {
   }
 
   protected override computeLegLineType(): TripLegLineType {
-    if (this.legType === 'ContinousLeg') {
-      if (this.isDriveCarLeg()) {
-        return 'Self-Drive Car'
-      }
+    if (this.isDriveCarLeg()) {
+      return 'Self-Drive Car'
+    }
 
-      if (this.isSharedMobility()) {
-        return 'Shared Mobility'
-      }
+    if (this.isSharedMobility()) {
+      return 'Shared Mobility'
+    }
+
+    if (this.isTaxi()) {
+      return 'OnDemand';
     }
 
     if (this.legType === 'TransferLeg') {
@@ -181,7 +197,11 @@ export class TripContinousLeg extends TripLeg {
       return MapLegLineTypeColor.Transfer
     }
 
-    return MapLegLineTypeColor.Walk
+    if (this.isTaxi()) {
+      return MapLegLineTypeColor.OnDemand;
+    }
+
+    return MapLegLineTypeColor.Walk;
   }
 
   public formatDistance(): string {

src/types/individual-mode.types.ts

@@ -1 +1 @@
-export type IndividualTransportMode = 'public_transport' | 'walk' | 'cycle' | 'escooter_rental' | 'car_sharing' | 'car_self_driving' | 'bicycle_rental' | 'charging_station'
+export type IndividualTransportMode = 'public_transport' | 'walk' | 'cycle' | 'escooter_rental' | 'car_sharing' | 'car_self_driving' | 'bicycle_rental' | 'charging_station' | 'taxi'