Skip to content

Commit b76a63e

Browse files
committed
lib
1 parent 5d318c8 commit b76a63e

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

lib/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
.leaflet-div-icon{
3-
background: transparent;
3+
background: transparent !important;
44
border: 0;
55
}
66

lib/index.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,13 @@ var LeafletReactTrackPlayer = function (_MapLayer) {
318318
iconSize: [35, 35]
319319
});
320320
};
321+
var course = this.props.customMarker && this.props.customCourse && this.state.track[0] && this.state.track[0].course ? this.state.track[0].course : null;
321322
var finishMarker = _leaflet2.default.marker(this.props.track[0], {
322-
icon: this.createIcon(this.props.track[0].course)
323+
icon: this.createIcon(course)
323324
});
324325
this.props.leaflet.map.addLayer(finishMarker);
325-
326326
// polyline
327-
var snakePolyline = _leaflet2.default.multiOptionsPolyline(this.props.track, _extends({}, paramsForMultiPolyline(this.props), {
327+
var snakePolyline = _leaflet2.default.multiColorsPolyline(this.props.track, _extends({}, paramsForMultiPolyline(this.props), {
328328
timeFormat: this.props.timeFormat,
329329
progressFormat: this.props.progressFormat,
330330
startPosition: this.props.startPosition
@@ -352,7 +352,7 @@ var LeafletReactTrackPlayer = function (_MapLayer) {
352352

353353
if (fromProps.track.length !== toProps.track.length && this.state.activeStream) {
354354
this.setState({ active: true });
355-
var newPointsPolyline = this.props.progressFormat === "default" || this.props.progressFormat === "distance" ? _leaflet2.default.multiOptionsPolyline(toProps.track.slice(fromProps.track.length - 1), paramsForMultiPolyline(this.props)) : _leaflet2.default.multiOptionsPolyline(toProps.track.filter(function (item) {
355+
var newPointsPolyline = this.props.progressFormat === "default" || this.props.progressFormat === "distance" ? _leaflet2.default.multiColorsPolyline(toProps.track.slice(fromProps.track.length - 1), paramsForMultiPolyline(this.props)) : _leaflet2.default.multiColorsPolyline(toProps.track.filter(function (item) {
356356
return Number(item.t) > Number(fromProps.track[fromProps.track.length - 1].t);
357357
}), paramsForMultiPolyline(this.props));
358358
var keys = Object.keys(newPointsPolyline._layers);
@@ -475,7 +475,7 @@ var LeafletReactTrackPlayer = function (_MapLayer) {
475475
className: "tp_track-line_active"
476476
})
477477
),
478-
_react2.default.createElement(
478+
this.props.showDots ? _react2.default.createElement(
479479
"div",
480480
{
481481
className: "tp_track-points",
@@ -491,7 +491,7 @@ var LeafletReactTrackPlayer = function (_MapLayer) {
491491
maxDistance: this.state.maxDistance,
492492
durationTrack: this.state.durationTrack
493493
})
494-
)
494+
) : null
495495
)
496496
) : null
497497
);
@@ -502,7 +502,6 @@ var LeafletReactTrackPlayer = function (_MapLayer) {
502502
}(_reactLeaflet.MapLayer);
503503

504504
LeafletReactTrackPlayer.defaultProps = {
505-
track: [],
506505
useControl: true,
507506
useInformationPanel: false,
508507
optionMultyIdxFn: function optionMultyIdxFn() {},
@@ -516,6 +515,7 @@ LeafletReactTrackPlayer.defaultProps = {
516515
progressFormat: "default",
517516
startPosition: 0,
518517
streamData: false,
518+
showDots: false,
519519
callbackFinish: function callbackFinish() {},
520520
callbackPrev: function callbackPrev() {},
521521
callbackNext: function callbackNext() {},
@@ -541,6 +541,7 @@ LeafletReactTrackPlayer.propTypes = {
541541
callbackFinish: _propTypes2.default.func,
542542
startPosition: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.number]),
543543
streamData: _propTypes2.default.bool,
544+
showDots: _propTypes2.default.bool,
544545
callbackNext: _propTypes2.default.func,
545546
callbackPrev: _propTypes2.default.func,
546547
callbackSpeed: _propTypes2.default.func,

lib/multyPolyline.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var _leaflet2 = _interopRequireDefault(_leaflet);
66

77
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
88

9-
var MultiOptionsPolyline = _leaflet2.default.FeatureGroup.extend({
9+
var MultiColorsPolyline = _leaflet2.default.FeatureGroup.extend({
1010

1111
initialize: function initialize(latlngs, options) {
1212
var copyBaseOptions = options.multiOptions.copyBaseOptions;
@@ -91,8 +91,8 @@ var MultiOptionsPolyline = _leaflet2.default.FeatureGroup.extend({
9191
}
9292
});
9393

94-
_leaflet2.default.MultiOptionsPolyline = MultiOptionsPolyline;
94+
_leaflet2.default.MultiColorsPolyline = MultiColorsPolyline;
9595

96-
_leaflet2.default.multiOptionsPolyline = function (latlngs, options) {
97-
return new MultiOptionsPolyline(latlngs, options);
96+
_leaflet2.default.multiColorsPolyline = function (latlngs, options) {
97+
return new MultiColorsPolyline(latlngs, options);
9898
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "leaflet-react-track-player",
33
"description": "This is plugin to react-leaflet. It create player for control of track.",
4-
"version": "1.1.2",
4+
"version": "1.2.1",
55
"private": false,
66
"main": "lib/index.js",
77
"homepage": "https://github.com/argonavt11/leaflet-react-track-player",

0 commit comments

Comments
 (0)