From 58e3561ba5d6ac419ddefd915184826b38c8b0c4 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 26 Aug 2014 10:36:51 +0200
Subject: [PATCH 1/2] Take the 'us' and 'nautical' units into account

When converting pointResolution from degrees to meters
---
 src/ol/control/scalelinecontrol.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js
index 6d44010d9d..2e3eb4e39d 100644
--- a/src/ol/control/scalelinecontrol.js
+++ b/src/ol/control/scalelinecontrol.js
@@ -213,7 +213,9 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
   var units = this.getUnits();
   if (projectionUnits == ol.proj.Units.DEGREES &&
       (units == ol.control.ScaleLineUnits.METRIC ||
-       units == ol.control.ScaleLineUnits.IMPERIAL)) {
+       units == ol.control.ScaleLineUnits.IMPERIAL ||
+       units == ol.control.ScaleLineUnits.US ||
+       units == ol.control.ScaleLineUnits.NAUTICAL)) {
 
     // Convert pointResolution from degrees to meters
     this.toEPSG4326_ = null;
@@ -244,7 +246,9 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
 
   goog.asserts.assert(
       ((units == ol.control.ScaleLineUnits.METRIC ||
-        units == ol.control.ScaleLineUnits.IMPERIAL) &&
+        units == ol.control.ScaleLineUnits.IMPERIAL ||
+        units == ol.control.ScaleLineUnits.US ||
+        units == ol.control.ScaleLineUnits.NAUTICAL) &&
        projectionUnits == ol.proj.Units.METERS) ||
       (units == ol.control.ScaleLineUnits.DEGREES &&
        projectionUnits == ol.proj.Units.DEGREES));

From 8c8fd64ecb395c90985c8eed7f2c245c42cc7e6f Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 26 Aug 2014 10:37:52 +0200
Subject: [PATCH 2/2] Add 'us' and 'nautical' units in scale-line example

---
 examples/scale-line.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/scale-line.html b/examples/scale-line.html
index 41ff9734e1..0e26f9c569 100644
--- a/examples/scale-line.html
+++ b/examples/scale-line.html
@@ -27,7 +27,9 @@
           <div id="map" class="map"></div>
           <select id="units">
             <option value="degrees">degrees</option>
-            <option value="imperial">imperial</option>
+            <option value="imperial">imperial inch</option>
+            <option value="us">us inch</option>
+            <option value="nautical">nautical mile</option>
             <option value="metric">metric</option>
           </select>
         </div>