Skip to content

Commit 3327abe

Browse files
committed
Merge branch 'pr/71'
2 parents a2c4d5f + f53e3b7 commit 3327abe

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var velocityLayer = L.velocityLayer({
3939
// display cardinal direction alongside degrees
4040
showCardinal: false,
4141

42-
// one of: ['ms', 'k/h', 'kt']
42+
// one of: ['ms', 'k/h', 'mph', 'kt']
4343
speedUnit: "ms",
4444

4545
// direction label prefix

dist/leaflet-velocity.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ L.Control.Velocity = L.Control.extend({
152152
// and 'CW' (angle value increases clock-wise) or 'CCW' (angle value increases counter clock-wise)
153153
angleConvention: "bearingCCW",
154154
showCardinal: false,
155-
// Could be 'm/s' for meter per second, 'k/h' for kilometer per hour or 'kt' for knots
155+
// Could be 'm/s' for meter per second, 'k/h' for kilometer per hour, 'mph' for miles per hour or 'kt' for knots
156156
speedUnit: "m/s",
157157
directionString: "Direction",
158158
speedString: "Speed",
@@ -178,6 +178,8 @@ L.Control.Velocity = L.Control.extend({
178178
return this.meterSec2kilometerHour(velocityAbs);
179179
} else if (unit === "kt") {
180180
return this.meterSec2Knots(velocityAbs);
181+
} else if (unit === "mph") {
182+
return this.meterSec2milesHour(velocityAbs);
181183
} else {
182184
return velocityAbs;
183185
}
@@ -245,6 +247,9 @@ L.Control.Velocity = L.Control.extend({
245247
meterSec2kilometerHour: function meterSec2kilometerHour(meters) {
246248
return meters * 3.6;
247249
},
250+
meterSec2milesHour: function meterSec2milesHour(meters) {
251+
return meters * 2.23694;
252+
},
248253
_onMouseMove: function _onMouseMove(e) {
249254
var self = this;
250255

0 commit comments

Comments
 (0)