Make style code faster

js/iD/renderer/style.js

@@ -1,18 +1,18 @@
 iD.Style = {};
-iD.Style.highway_stack = [
-    'motorway',
-    'motorway_link',
-    'trunk',
-    'trunk_link',
-    'primary',
-    'primary_link',
-    'secondary',
-    'tertiary',
-    'unclassified',
-    'residential',
-    'service',
-    'footway'
-];
+iD.Style.highway_stack = {
+    motorway: 0,
+    motorway_link: 1,
+    trunk: 2,
+    trunk_link: 3,
+    primary: 4,
+    primary_link: 5,
+    secondary: 6,
+    tertiary: 7,
+    unclassified: 8,
+    residential: 9,
+    service: 10,
+    footway: 11
+};
 
 iD.Style.waystack = function(a, b) {
     if (!a || !b) return 0;
@@ -23,8 +23,8 @@ iD.Style.waystack = function(a, b) {
     if (b.tags.bridge) return -1;
     var as = 0, bs = 0;
     if (a.tags.highway && b.tags.highway) {
-        as -= iD.Style.highway_stack.indexOf(a.tags.highway);
-        bs -= iD.Style.highway_stack.indexOf(b.tags.highway);
+        as -= iD.Style.highway_stack[a.tags.highway];
+        bs -= iD.Style.highway_stack[b.tags.highway];
     }
     return as - bs;
 };
@@ -44,11 +44,8 @@ iD.Style.styleClasses = function(pre) {
     return function(d) {
         var tags = d.tags;
         var c = [pre];
-        function clean(x) {
-            return iD.Style.TAG_CLASSES[x];
-        }
         for (var k in tags) {
-            if (!clean(k)) continue;
+            if (!iD.Style.TAG_CLASSES[k]) continue;
             c.push(k + '-' + tags[k]);
             c.push(k);
         }