Better matching tag format for presets

js/id/presetdata.js

@@ -26,8 +26,8 @@ iD.presetData = function() {
             count = 0;
             tags = data[i].tags;
             if (!_.contains(data[i].type, entity.type)) continue;
-            for (var k = 0; k < tags.length; k++) {
-                if (entity.tags[tags[k].key] == tags[k].value) count++;
+            for (var k in tags) {
+                if (entity.tags[k] == tags[k]) count++;
             }
             if (count > maxcount) best = data[i], maxcount = count;
         }

presets/convert_josm.py

@@ -33,12 +33,9 @@ def isfav(x):
 
 for item in dom1.getElementsByTagName('item'):
 
-    tags = []
+    tags = {}
     for elem in item.getElementsByTagName('key'):
-        tags.append({
-            'key': elem.getAttribute('key'),
-            'value': elem.getAttribute('value')
-        })
+        tags[elem.getAttribute('key')] = elem.getAttribute('value')
 
     jitem = {
         "name": item.getAttribute('name'),