Merge branch 'unique-kinds'

gentooboontoo · Jul 9, 2015 · 6d72047 · 6d72047
2 parents 63dc430 + 97861ed
commit 6d72047
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/spec/quantitiesSpec.js b/spec/quantitiesSpec.js
@@ -1218,6 +1218,15 @@ describe("js-quantities", function() {
     it("should return an array of kind names", function() {
       expect(Qty.getKinds()).toContain("resistance");
     });
+
+    it("should not contain duplicate kind names", function() {
+      var kinds = Qty.getKinds();
+      var map = {};
+      kinds.forEach(function(kind) {
+        map[kind] = 1;
+      });
+      expect(kinds.length).toEqual(Object.keys(map).length);
+    });
   });
 
   describe("information", function() {

diff --git a/src/quantities.js b/src/quantities.js
@@ -483,10 +483,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
    * @returns {string[]} names of kinds of units
    */
   Qty.getKinds = function() {
-    var knownKinds = Object.keys(KINDS).map(function(knownSignature) {
+    return uniq(Object.keys(KINDS).map(function(knownSignature) {
       return KINDS[knownSignature];
-    }).sort();
-    return knownKinds;
+    }));
   };
 
   /**
@@ -1684,6 +1683,21 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     return value;
   }
 
+  /**
+   * Returns unique strings from list
+   *
+   * @param {string[]} array of strings
+   *
+   *
+   * @returns {string[]} a new array of strings without duplicates
+   */
+  function uniq(strings) {
+    var seen = {};
+    return strings.filter(function(item) {
+      return seen.hasOwnProperty(item) ? false : (seen[item] = true);
+    });
+  }
+
   /**
    * Tests if a value is a string
    *