Skip to content

Commit a6538b2

Browse files
mstockdatendelphin
authored andcommitted
Pass itinerary builder as option to control
Otherwise, this wasn't working anymore and just displayed `[object Object]` instead of a useful instruction. This approach also doesn't overwrite the original `ItineraryBuilder` class of the `leaflet-routing-machine` anymore, which feels a bit cleaner, too.
1 parent b558cb4 commit a6538b2

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var mergedOptions = L.extend(leafletOptions.defaultState, parsedOptions);
1818
var local = localization.get(mergedOptions.language);
1919

2020
// load only after language was chosen
21-
var itineraryBuilder = require('./itinerary_builder')(mergedOptions.language);
21+
var ItineraryBuilder = require('./itinerary_builder')(mergedOptions.language);
2222

2323
var mapLayer = leafletOptions.layer;
2424
var overlay = leafletOptions.overlay;
@@ -128,8 +128,6 @@ var plan = new ReversablePlan([], {
128128
}
129129
});
130130

131-
L.extend(L.Routing, itineraryBuilder);
132-
133131
// add marker labels
134132
var controlOptions = {
135133
plan: plan,
@@ -146,7 +144,8 @@ var controlOptions = {
146144
serviceUrl: leafletOptions.services[0].path,
147145
useZoomParameter: options.lrm.useZoomParameter,
148146
routeDragInterval: options.lrm.routeDragInterval,
149-
collapsible: options.lrm.collapsible
147+
collapsible: options.lrm.collapsible,
148+
itineraryBuilder: new ItineraryBuilder(),
150149
};
151150
var router = (new L.Routing.OSRMv1(controlOptions));
152151
router._convertRouteOriginal = router._convertRoute;

src/itinerary_builder.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ module.exports = function (language) {
8282
});
8383
}
8484

85-
L.Routing = L.Routing || {};
86-
87-
L.Routing.ItineraryBuilder = L.Class.extend({
85+
return L.Class.extend({
8886
options: {
8987
containerClassName: ''
9088
},
@@ -145,6 +143,4 @@ module.exports = function (language) {
145143
return row;
146144
}
147145
});
148-
149-
return L.Routing;
150-
}
146+
};

0 commit comments

Comments
 (0)