Skip to content

Commit 69ad0fd

Browse files
committed
fix bug with finishMarker
1 parent 8a36c3f commit 69ad0fd

File tree

3 files changed

+22
-300
lines changed

3 files changed

+22
-300
lines changed

package.json

Lines changed: 6 additions & 5 deletions
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.0.1",
4+
"version": "1.1.1",
55
"private": false,
66
"main": "lib/index.js",
77
"homepage": "https://github.com/argonavt11/leaflet-react-track-player",
@@ -16,6 +16,7 @@
1616
"dependencies": {
1717
"leaflet": "^1.3.4",
1818
"moment": "^2.22.2",
19+
"prop-types": "^15.6.2",
1920
"react-leaflet": "^2.0.1",
2021
"react-leaflet-control": "^2.0.0"
2122
},
@@ -75,15 +76,14 @@
7576
"extends": "react-app"
7677
},
7778
"devDependencies": {
78-
"babel-preset-es2015": "^6.24.1",
79-
"babel-preset-react": "^6.24.1",
80-
"babel-preset-stage-0": "^6.24.1",
81-
"react-test-renderer": "^16.5.2",
8279
"autoprefixer": "7.1.6",
8380
"babel-core": "6.26.0",
8481
"babel-eslint": "7.2.3",
8582
"babel-jest": "20.0.3",
8683
"babel-loader": "7.1.2",
84+
"babel-preset-es2015": "^6.24.1",
85+
"babel-preset-react": "^6.24.1",
86+
"babel-preset-stage-0": "^6.24.1",
8787
"babel-runtime": "6.26.0",
8888
"case-sensitive-paths-webpack-plugin": "2.1.1",
8989
"chalk": "1.1.3",
@@ -110,6 +110,7 @@
110110
"react": "^16.5.1",
111111
"react-dev-utils": "^5.0.2",
112112
"react-dom": "^16.5.1",
113+
"react-test-renderer": "^16.5.2",
113114
"resolve": "1.6.0",
114115
"style-loader": "0.19.0",
115116
"url-loader": "0.6.2",

src/laeflet-react-track-player/index.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,13 @@ class LeafletReactTrackPlayer extends MapLayer {
7171
}deg)${this.props.styleMarker}"></div>`,
7272
iconSize: [35, 35]
7373
});
74-
const finishMarker = L.marker(this.props.track[0], {
75-
icon: this.createIcon(this.props.track[0].course)
76-
});
77-
this.props.leaflet.map.addLayer(finishMarker);
74+
const course = this.props.customMarker && this.props.customCourse && this.state.track[0] && this.state.track[0].course ? this.state.track[0].course : null;
75+
if (this.state.track[0]) {
76+
const finishMarker = L.marker(this.props.track[0], {
77+
icon: this.createIcon(course)
78+
});
79+
this.props.leaflet.map.addLayer(finishMarker);
80+
}
7881

7982
// polyline
8083
const snakePolyline = L.multiOptionsPolyline(this.props.track, {

0 commit comments

Comments
 (0)