[PLUGINS] ~maj globale

[lhc/web/www.git] / www / plugins / gis / lib / leaflet / plugins / Marker.Rotate.js

diff --git a/www/plugins/gis/lib/leaflet/plugins/Marker.Rotate.js b/www/plugins/gis/lib/leaflet/plugins/Marker.Rotate.js
index 174d76b..ab2b9bc 100755 (executable)
--- a/www/plugins/gis/lib/leaflet/plugins/Marker.Rotate.js
+++ b/www/plugins/gis/lib/leaflet/plugins/Marker.Rotate.js
@@ -7,7 +7,7 @@
 (function () {
        var _old__setPos = L.Marker.prototype._setPos;
        L.Marker.include({
-               _updateImg: function(i, a, s) {
+               _updateImg: function (i, a, s) {
                        a = L.point(s).divideBy(2)._subtract(L.point(a));
                        var transform = '';
                        transform += ' translate(' + -a.x + 'px, ' + -a.y + 'px)';
@@ -15,9 +15,18 @@
                        transform += ' translate(' + a.x + 'px, ' + a.y + 'px)';
                        i.style[L.DomUtil.TRANSFORM] += transform;
                },
+               
+               _getShortestEndDegree: function (startDegrees, endDegrees) {
+                       var turnAngle = Math.abs(endDegrees - startDegrees);
+                       var turnAnglePositive = (endDegrees - startDegrees) >= 0;
+                       if (turnAngle <= 180) return endDegrees;
+                       var result = startDegrees + (360 - turnAngle) * (turnAnglePositive ? -1 : 1);
+                       return result;
+               },
 
                setIconAngle: function (iconAngle) {
-                       this.options.iconAngle = iconAngle;
+                       // find shortest angle to turn over
+                       this.options.iconAngle = this._getShortestEndDegree(this.options.iconAngle || 0, iconAngle);
                        if (this._map)
                                this.update();
                },
@@ -31,7 +40,7 @@
                        _old__setPos.apply(this,[pos]);
 
                        if (this.options.iconAngle) {
-                               var defaultIcon = new L.Icon.Default;
+                               var defaultIcon = new L.Icon.Default();
                                var a = this.options.icon.options.iconAnchor || defaultIcon.options.iconAnchor;
                                var s = this.options.icon.options.iconSize || defaultIcon.options.iconSize;
                                var i;