From b9fdf58ed8c3f87856b000966b961f826e355a04 Mon Sep 17 00:00:00 2001
From: oleg <oleg@thingsboard.io>
Date: Thu, 1 Mar 2018 19:25:58 +0200
Subject: [PATCH] Fix:Doesn't paint lines for the first and last points
 properly.

---
 Leaflet.MultiOptionsPolyline.js     | 22 ++++++++++------------
 Leaflet.MultiOptionsPolyline.min.js |  5 +++--
 demo/index.html                     |  4 ++--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Leaflet.MultiOptionsPolyline.js b/Leaflet.MultiOptionsPolyline.js
index 01f3644..7a09671 100644
--- a/Leaflet.MultiOptionsPolyline.js
+++ b/Leaflet.MultiOptionsPolyline.js
@@ -54,8 +54,8 @@ var MultiOptionsPolyline = L.FeatureGroup.extend({
             multiOptions = this._options.multiOptions,
             optionIdxFn = multiOptions.optionIdxFn,
             fnContext = multiOptions.fnContext || this,
-            prevOptionIdx, optionIdx,
-            segmentLatlngs;
+            nextOptionsIdx, optionIdx,
+            segmentLatlngs = [];
 
         this._originalLatlngs = latlngs;
 
@@ -63,27 +63,25 @@ var MultiOptionsPolyline = L.FeatureGroup.extend({
             this.removeLayer(layer);
         }, this);
 
-        for (i = 1; i < len; ++i) {
-            optionIdx = optionIdxFn.call(
-                fnContext, latlngs[i], latlngs[i - 1], i, latlngs);
+        for (i = 0; i < len; ++i) {
 
-            if (i === 1) {
-                segmentLatlngs = [latlngs[0]];
-                prevOptionIdx = optionIdxFn.call(fnContext, latlngs[0], latlngs[0], 0, latlngs);
+            // If there is next point
+            if (latlngs[i + 1]) {
+                nextOptionsIdx = optionIdxFn.call(fnContext, latlngs[i + 1], latlngs[i], i + 1, latlngs);
             }
+            optionIdx = optionIdxFn.call(fnContext, latlngs[i], latlngs[i - 1] || latlngs[i], i, latlngs);
 
             segmentLatlngs.push(latlngs[i]);
 
             // is there a change in options or is it the last point?
-            if (prevOptionIdx !== optionIdx || i === len - 1) {
+            if (optionIdx !== nextOptionsIdx || i === len - 1) {
                 // Check if options is a function or an array
                 if (typeof multiOptions.options === "function") {
-                    this.addLayer(L.polyline(segmentLatlngs, multiOptions.options(prevOptionIdx)));
+                    this.addLayer(L.polyline(segmentLatlngs, multiOptions.options(optionIdx)));
                 } else {
-                    this.addLayer(L.polyline(segmentLatlngs, multiOptions.options[prevOptionIdx]));
+                    this.addLayer(L.polyline(segmentLatlngs, multiOptions.options[optionIdx]));
                 }
 
-                prevOptionIdx = optionIdx;
                 segmentLatlngs = [latlngs[i]];
             }
         }
diff --git a/Leaflet.MultiOptionsPolyline.min.js b/Leaflet.MultiOptionsPolyline.min.js
index cfc727a..5c6f02d 100644
--- a/Leaflet.MultiOptionsPolyline.min.js
+++ b/Leaflet.MultiOptionsPolyline.min.js
@@ -1,2 +1,3 @@
-/*! Leaflet.MultiOptionsPolyline v1.0.0 26-11-2016 */
-!function(a,b){"function"==typeof define&&define.amd?define(["leaflet"],b):b("object"==typeof module&&module.exports?require("leaflet"):a.L)}(this,function(a){"use strict";var b=a.FeatureGroup.extend({initialize:function(a,b){var c=b.multiOptions.copyBaseOptions;this._layers={},this._options=b,(void 0===c||c)&&this._copyBaseOptions(),this.setLatLngs(a)},_copyBaseOptions:function(){var b,c,d=this._options.multiOptions,e=d.options,f=e.length;for(b=a.extend({},this._options),delete b.multiOptions,c=0;c<f;++c)e[c]=a.extend({},b,e[c])},setLatLngs:function(b){var c,d,e,f,g=b.length,h=this._options.multiOptions,i=h.optionIdxFn,j=h.fnContext||this;for(this._originalLatlngs=b,this.eachLayer(function(a){this.removeLayer(a)},this),c=1;c<g;++c)e=i.call(j,b[c],b[c-1],c,b),1===c&&(f=[b[0]],d=i.call(j,b[0],b[0],0,b)),f.push(b[c]),d===e&&c!==g-1||("function"==typeof h.options?this.addLayer(a.polyline(f,h.options(d))):this.addLayer(a.polyline(f,h.options[d])),d=e,f=[b[c]]);return this},getLatLngs:function(){return this._originalLatlngs},getLatLngsSegments:function(){var a=[];return this.eachLayer(function(b){a.push(b.getLatLngs())}),a}});a.MultiOptionsPolyline=b,a.multiOptionsPolyline=function(a,c){return new b(a,c)}});
\ No newline at end of file
+/*! Leaflet.MultiOptionsPolyline v1.0.0 01-03-2018 */
+
+!function(a,b){"function"==typeof define&&define.amd?define(["leaflet"],b):b("object"==typeof module&&module.exports?require("leaflet"):a.L)}(this,function(a){"use strict";var b=a.FeatureGroup.extend({initialize:function(a,b){var c=b.multiOptions.copyBaseOptions;this._layers={},this._options=b,(void 0===c||c)&&this._copyBaseOptions(),this.setLatLngs(a)},_copyBaseOptions:function(){var b,c,d=this._options.multiOptions,e=d.options,f=e.length;for(b=a.extend({},this._options),delete b.multiOptions,c=0;c<f;++c)e[c]=a.extend({},b,e[c])},setLatLngs:function(b){var c,d,e,f=b.length,g=this._options.multiOptions,h=g.optionIdxFn,i=g.fnContext||this,j=[];for(this._originalLatlngs=b,this.eachLayer(function(a){this.removeLayer(a)},this),c=0;c<f;++c)b[c+1]&&(d=h.call(i,b[c+1],b[c],c+1,b)),e=h.call(i,b[c],b[c-1]||b[c],c,b),j.push(b[c]),e===d&&c!==f-1||("function"==typeof g.options?this.addLayer(a.polyline(j,g.options(e))):this.addLayer(a.polyline(j,g.options[e])),j=[b[c]]);return this},getLatLngs:function(){return this._originalLatlngs},getLatLngsSegments:function(){var a=[];return this.eachLayer(function(b){a.push(b.getLatLngs())}),a}});a.MultiOptionsPolyline=b,a.multiOptionsPolyline=function(a,c){return new b(a,c)}});
\ No newline at end of file
diff --git a/demo/index.html b/demo/index.html
index 243e0f1..0115154 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -3,8 +3,8 @@
 <head>
     <meta charset="UTF-8">
     <title>Leaflet.MultiOptionsPolyline Demo</title>
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.1/leaflet.css" />
     <style>
         @media (min-width: 768px) {