fix little bug with versions

Author: arg0navt

lib/index.js

@@ -25,9 +25,9 @@ var _leaflet = require("leaflet");
 
 var _leaflet2 = _interopRequireDefault(_leaflet);
 
-var _reactLeafletControl = require("react-leaflet-control");
+var _reactLeafletCustomControl = require("@skyeer/react-leaflet-custom-control");
 
-var _reactLeafletControl2 = _interopRequireDefault(_reactLeafletControl);
+var _reactLeafletCustomControl2 = _interopRequireDefault(_reactLeafletCustomControl);
 
 var _dots = require("./dots");
 
@@ -79,7 +79,7 @@ var LeafletReactTrackPlayer = function (_MapLayer) {
     var _this = _possibleConstructorReturn(this, (LeafletReactTrackPlayer.__proto__ || Object.getPrototypeOf(LeafletReactTrackPlayer)).call(this, props));
 
     _this.initSnake = function () {
-      _this.leafletElement.snakePolyline.snakeIn({
+      _this.leafletElement.snakePolyline.snakePlayer({
         fly: function fly(point) {
           return _this.flyTrack(point);
         },
@@ -393,7 +393,7 @@ var LeafletReactTrackPlayer = function (_MapLayer) {
       var _this4 = this;
 
       return _react2.default.createElement(
-        _reactLeafletControl2.default,
+        _reactLeafletCustomControl2.default,
         { position: "bottomleft" },
         this.props.useControl ? _react2.default.createElement(
           "div",

lib/snake.js

@@ -24,7 +24,7 @@ _leaflet2.default.Polyline.include({
   _latLngAnimation: null,
 
   // It initialization polyline with animation
-  snakeIn: function snakeIn(e) {
+  snakePlayer: function snakePlayer(e) {
     if (e && !this._latLngAnimation) this._latLngAnimation = e;
     for (var i in this._eventParents) {
       if (this._eventParents[i]._options.defaultSpeed) {
@@ -42,7 +42,7 @@ _leaflet2.default.Polyline.include({
     this._snakingVertices = this._snakingDistance = 0;
     this._latlngs = [this._snakeLatLngs[0], this._snakeLatLngs[0]];
     this._nextPoint();
-    this._snake();
+    this._snakeRun();
     this.fire("snakestart");
     return this;
   },
@@ -113,7 +113,7 @@ _leaflet2.default.Polyline.include({
     this._play = true;
     this._now = this._snakingTime;
     this.startTime();
-    this._snake();
+    this._snakeRun();
   },
 
   changeSpeed: function changeSpeed(xSpeed) {
@@ -132,7 +132,7 @@ _leaflet2.default.Polyline.include({
   },
 
   // new iteration of animation
-  _snake: function _snake() {
+  _snakeRun: function _snakeRun() {
     if (!this.maxDistance) {
       this.maxDistance = this._snakeLatLngs[0].distanceTo(this._snakeLatLngs[1]);
     }
@@ -146,11 +146,11 @@ _leaflet2.default.Polyline.include({
       this._snakingTime = this._now;
       this._latlngs.pop();
       this._forward = forward;
-      return this._snakeForward(forward);
+      return this._snakeForwardRun(forward);
     }
   },
 
-  _snakeForward: function _snakeForward(forward) {
+  _snakeForwardRun: function _snakeForwardRun(forward) {
     if (!this._now) this.startTime();
     if (this._play && this._map) {
       var currPoint = this._map.latLngToContainerPoint(this._snakeLatLngs[this._snakingVertices]);
@@ -171,7 +171,7 @@ _leaflet2.default.Polyline.include({
         }
         this._nextPoint();
         this._snakingDistance -= this.maxDistance;
-        return this._snakeForward(forward);
+        return this._snakeForwardRun(forward);
       }
       this._snakingDistance += forward;
       var percent = this.maxDistance ? this._snakingDistance / this.maxDistance : 0;
@@ -189,7 +189,7 @@ _leaflet2.default.Polyline.include({
       }
       this.setLatLngs(this._latlngs);
       this.fire("snake");
-      _leaflet2.default.Util.requestAnimFrame(this._snake, this);
+      _leaflet2.default.Util.requestAnimFrame(this._snakeRun, this);
     }
   },
 
@@ -220,7 +220,7 @@ _leaflet2.default.Polyline.include({
     this._snaking = false;
     this.setLatLngs(this._snakeLatLngs);
     for (var i in this._eventParents) {
-      this._eventParents[i]._snakeNext();
+      this._eventParents[i]._snakeNextPolyline();
     }
   }
 });
@@ -250,7 +250,7 @@ _leaflet2.default.LayerGroup.include({
     });
     if (findLast) {
       if (goPlay) goPlay.snakePlay();
-    } else this._snakeNext();
+    } else this._snakeNextPolyline();
   },
   // change position. This function stopping work of animation and initiate polylines with default state. Need timestamp
   changePosition: function changePosition(value) {
@@ -382,7 +382,7 @@ _leaflet2.default.LayerGroup.include({
     });
   },
 
-  snakeIn: function snakeIn(events) {
+  snakePlayer: function snakePlayer(events) {
     if (!this._callbackChangePosition && events.change) this._callbackChangePosition = events.change;
     if (!this._latLngAnimation && events.fly) {
       var self = this;
@@ -408,7 +408,7 @@ _leaflet2.default.LayerGroup.include({
     if (this._options.startPosition) {
       this._initiateStartPosition();
     } else {
-      return this._snakeNext();
+      return this._snakeNextPolyline();
     }
   },
 
@@ -433,7 +433,7 @@ _leaflet2.default.LayerGroup.include({
     }
   },
 
-  _snakeNext: function _snakeNext() {
+  _snakeNextPolyline: function _snakeNextPolyline() {
     if (!this._snaking && this._snakingLayersDone < this._snakingLayers.length) {
       this._snaking = true;
     }
@@ -446,7 +446,7 @@ _leaflet2.default.LayerGroup.include({
     this._snakingLayersDone++;
     if (!this.hasLayer(currentLayer)) {
       this.addLayer(currentLayer);
-      currentLayer.snakeIn(this._latLngAnimation);
+      currentLayer.snakePlayer(this._latLngAnimation);
     } else currentLayer.snakePlay();
   },
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "leaflet-react-track-player",
   "description": "This is plugin to react-leaflet. It create player for control of track.",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "private": false,
   "main": "lib/index.js",
   "homepage": "https://github.com/argonavt11/leaflet-react-track-player",

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

@@ -206,7 +206,7 @@ L.Polyline.include({
       }
       this.setLatLngs(this._latlngs);
       this.fire("snake");
-      L.Util.requestAnimFrame(this._snake, this);
+      L.Util.requestAnimFrame(this._snakeRun, this);
     }
   },