Update to iD v1.3.5
authorJohn Firebaugh <john.firebaugh@gmail.com>
Thu, 9 Jan 2014 02:06:33 +0000 (18:06 -0800)
committerTom Hughes <tom@compton.nu>
Fri, 10 Jan 2014 19:24:08 +0000 (19:24 +0000)
37 files changed:
Vendorfile
vendor/assets/iD/iD.css.erb
vendor/assets/iD/iD.js
vendor/assets/iD/iD/locales/bs.json
vendor/assets/iD/iD/locales/ca.json
vendor/assets/iD/iD/locales/cs.json
vendor/assets/iD/iD/locales/da.json
vendor/assets/iD/iD/locales/de.json
vendor/assets/iD/iD/locales/el.json
vendor/assets/iD/iD/locales/en.json
vendor/assets/iD/iD/locales/es.json
vendor/assets/iD/iD/locales/fa.json
vendor/assets/iD/iD/locales/fi.json
vendor/assets/iD/iD/locales/fr.json
vendor/assets/iD/iD/locales/hr.json
vendor/assets/iD/iD/locales/hu.json
vendor/assets/iD/iD/locales/id.json
vendor/assets/iD/iD/locales/it.json
vendor/assets/iD/iD/locales/ja.json
vendor/assets/iD/iD/locales/kn.json [new file with mode: 0644]
vendor/assets/iD/iD/locales/ko.json
vendor/assets/iD/iD/locales/lv.json
vendor/assets/iD/iD/locales/pl.json
vendor/assets/iD/iD/locales/pt-BR.json
vendor/assets/iD/iD/locales/pt.json
vendor/assets/iD/iD/locales/ro-RO.json [new file with mode: 0644]
vendor/assets/iD/iD/locales/ru.json
vendor/assets/iD/iD/locales/sk.json
vendor/assets/iD/iD/locales/sl.json
vendor/assets/iD/iD/locales/sr.json
vendor/assets/iD/iD/locales/te.json
vendor/assets/iD/iD/locales/tr.json
vendor/assets/iD/iD/locales/uk.json
vendor/assets/iD/iD/locales/vi.json
vendor/assets/iD/iD/locales/yue.json
vendor/assets/iD/iD/locales/zh-CN.json
vendor/assets/iD/iD/locales/zh-HK.json

index 483e46aa16a42104158b575cebae1f709fdfb430..7d7e7a66acaf4ffb2d2cbc133243f6921ee355a3 100644 (file)
@@ -42,7 +42,7 @@ folder 'vendor/assets' do
   end
 
   folder 'iD' do
-    from 'git://github.com/systemed/iD', :branch => 'release' do
+    from 'git://github.com/openstreetmap/iD', :branch => 'release' do
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       file 'iD.css.erb', 'dist/iD.css' do |path|
index f4a802698d3fed9fe5a428222066100833591dce..1927b00eb83687855cddeab4a69804ab4c2ffce5 100644 (file)
@@ -1585,7 +1585,7 @@ button {
     display: inline-block;
     height:40px;
     border-radius:4px;
-    /* Crashes Safari: https://github.com/systemed/iD/issues/1188 */
+    /* Crashes Safari: https://github.com/openstreetmap/iD/issues/1188 */
     /*-webkit-transition: all 100ms;*/
        -moz-transition: all 100ms;
          -o-transition: all 100ms;
index 3a53d31b401b2a6dbaab9cde49d85001c362df2a..fd19d32de8f0ebedb489e3278b22ab63a3d91efb 100644 (file)
@@ -5937,7 +5937,8 @@ d3.xml = d3_xhrType(function(request) {
 d3.combobox = function() {
     var event = d3.dispatch('accept'),
         data = [],
-        suggestions = [];
+        suggestions = [],
+        minItems = 2;
 
     var fetcher = function(val, cb) {
         cb(data.filter(function(d) {
@@ -6035,6 +6036,8 @@ d3.combobox = function() {
                    input.on('input.typeahead', function() {
                        idx = -1;
                        render();
+                       var start = input.property('selectionStart');
+                       input.node().setSelectionRange(start, start);
                        input.on('input.typeahead', change);
                    });
                    break;
@@ -6126,7 +6129,7 @@ d3.combobox = function() {
         }
 
         function render() {
-            if (suggestions.length > 1 && document.activeElement === input.node()) {
+            if (suggestions.length >= minItems && document.activeElement === input.node()) {
                 show();
             } else {
                 hide();
@@ -6192,6 +6195,12 @@ d3.combobox = function() {
         return combobox;
     };
 
+    combobox.minItems = function(_) {
+        if (!arguments.length) return minItems;
+        minItems = _;
+        return combobox;
+    };
+
     return d3.rebind(combobox, event, 'on');
 };
 d3.geo.tile = function() {
@@ -15837,7 +15846,7 @@ window.iD = function () {
     var context = {},
         storage;
 
-    // https://github.com/systemed/iD/issues/772
+    // https://github.com/openstreetmap/iD/issues/772
     // http://mathiasbynens.be/notes/localstorage-pattern#comment-9
     try { storage = localStorage; } catch (e) {}
     storage = storage || (function() {
@@ -16142,7 +16151,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.4';
+iD.version = '1.3.5';
 
 (function() {
     var detected = {};
@@ -16457,6 +16466,15 @@ iD.util.prefixCSSProperty = function(property) {
     return false;
 };
 
+
+iD.util.setTransform = function(el, x, y, scale) {
+    var prop = iD.util.transformProperty = iD.util.transformProperty || iD.util.prefixCSSProperty('Transform'),
+        translate = iD.detect().opera ?
+            'translate('   + x + 'px,' + y + 'px)' :
+            'translate3d(' + x + 'px,' + y + 'px,0)';
+    return el.style(prop, translate + (scale ? ' scale(' + scale + ')' : ''));
+};
+
 iD.util.getStyle = function(selector) {
     for (var i = 0; i < document.styleSheets.length; i++) {
         var rules = document.styleSheets[i].rules || document.styleSheets[i].cssRules || [];
@@ -16783,7 +16801,7 @@ _.extend(iD.geo.Extent.prototype, {
     }
 });
 // For fixing up rendering of multipolygons with tags on the outer member.
-// https://github.com/systemed/iD/issues/613
+// https://github.com/openstreetmap/iD/issues/613
 iD.geo.isSimpleMultipolygonOuterMember = function(entity, graph) {
     if (entity.type !== 'way')
         return false;
@@ -17402,8 +17420,13 @@ iD.actions.DiscardTags = function(difference) {
     return function(graph) {
         function discardTags(entity) {
             if (!_.isEmpty(entity.tags)) {
+                var tags = {};
+                _.each(entity.tags, function(v, k) {
+                    if (v) tags[k] = v;
+                });
+
                 graph = graph.replace(entity.update({
-                    tags: _.omit(entity.tags, iD.data.discarded)
+                    tags: _.omit(tags, iD.data.discarded)
                 }));
             }
         }
@@ -18692,7 +18715,7 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
         start = iD.Node({loc: context.graph().entity(way.nodes[startIndex]).loc}),
         end = iD.Node({loc: context.map().mouseCoordinates()}),
         segment = iD.Way({
-            nodes: [start.id, end.id],
+            nodes: typeof index === 'undefined' ? [start.id, end.id] : [end.id, start.id],
             tags: _.clone(way.tags)
         });
 
@@ -19224,8 +19247,7 @@ iD.behavior.Tail = function() {
         container,
         xmargin = 25,
         tooltipSize = [0, 0],
-        selectionSize = [0, 0],
-        transformProp = iD.util.prefixCSSProperty('Transform');
+        selectionSize = [0, 0];
 
     function tail(selection) {
         if (!text) return;
@@ -19243,18 +19265,16 @@ iD.behavior.Tail = function() {
             var xoffset = ((d3.event.clientX + tooltipSize[0] + xmargin) > selectionSize[0]) ?
                 -tooltipSize[0] - xmargin : xmargin;
             container.classed('left', xoffset > 0);
-            container.style(transformProp, 'translate(' +
-                (~~d3.event.clientX + xoffset) + 'px,' +
-                ~~d3.event.clientY + 'px)');
+            iD.util.setTransform(container, d3.event.clientX + xoffset, d3.event.clientY);
         }
 
-        function mouseout() {
+        function mouseleave() {
             if (d3.event.relatedTarget !== container.node()) {
                 container.style('display', 'none');
             }
         }
 
-        function mouseover() {
+        function mouseenter() {
             if (d3.event.relatedTarget !== container.node()) {
                 show();
             }
@@ -19270,8 +19290,8 @@ iD.behavior.Tail = function() {
 
         selection
             .on('mousemove.tail', mousemove)
-            .on('mouseover.tail', mouseover)
-            .on('mouseout.tail', mouseout);
+            .on('mouseenter.tail', mouseenter)
+            .on('mouseleave.tail', mouseleave);
 
         container
             .on('mousemove.tail', mousemove);
@@ -19289,8 +19309,8 @@ iD.behavior.Tail = function() {
 
         selection
             .on('mousemove.tail', null)
-            .on('mouseover.tail', null)
-            .on('mouseout.tail', null);
+            .on('mouseenter.tail', null)
+            .on('mouseleave.tail', null);
 
         d3.select(window)
             .on('resize.tail', null);
@@ -20774,6 +20794,7 @@ iD.areaKeys = {
     "amenity": {
         "atm": true,
         "bench": true,
+        "clock": true,
         "drinking_water": true,
         "post_box": true,
         "telephone": true,
@@ -20796,6 +20817,7 @@ iD.areaKeys = {
     "building": {
         "entrance": true
     },
+    "craft": {},
     "emergency": {
         "fire_hydrant": true,
         "phone": true
@@ -20825,6 +20847,7 @@ iD.areaKeys = {
         "tree": true
     },
     "office": {},
+    "piste:type": {},
     "place": {},
     "power": {
         "line": true,
@@ -20871,15 +20894,19 @@ iD.areaKeys = {
         off;
 
     connection.changesetURL = function(changesetId) {
-        return url + '/browse/changeset/' + changesetId;
+        return url + '/changeset/' + changesetId;
     };
 
-    connection.changesetsURL = function(extent) {
-        return url + '/browse/changesets?bbox=' + extent.toParam();
+    connection.changesetsURL = function(center, zoom) {
+        var precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+        return url + '/history#map=' +
+            Math.floor(zoom) + '/' +
+            center[1].toFixed(precision) + '/' +
+            center[0].toFixed(precision);
     };
 
     connection.entityURL = function(entity) {
-        return url + '/browse/' + entity.type + '/' + entity.osmId();
+        return url + '/' + entity.type + '/' + entity.osmId();
     };
 
     connection.userURL = function(username) {
@@ -21559,13 +21586,12 @@ iD.Graph = function(other, mutable) {
         this.entities = _.assign(Object.create(base.entities), other.entities);
         this._parentWays = _.assign(Object.create(base.parentWays), other._parentWays);
         this._parentRels = _.assign(Object.create(base.parentRels), other._parentRels);
-        this.inherited = true;
 
     } else {
         this.entities = Object.create({});
         this._parentWays = Object.create({});
         this._parentRels = Object.create({});
-        this.rebase(other || []);
+        this.rebase(other || [], [this]);
     }
 
     this.transients = {};
@@ -21648,22 +21674,44 @@ iD.Graph.prototype = {
     // is used only during the history operation that merges newly downloaded
     // data into each state. To external consumers, it should appear as if the
     // graph always contained the newly downloaded data.
-    rebase: function(entities) {
+    rebase: function(entities, stack) {
         var base = this.base(),
-            i, k, child, id, keys;
+            i, j, k, id;
 
-        // Merging of data only needed if graph is the base graph
-        if (!this.inherited) {
-            for (i = 0; i < entities.length; i++) {
-                var entity = entities[i];
-                if (!base.entities[entity.id]) {
-                    base.entities[entity.id] = entity;
-                    this._updateCalculated(undefined, entity,
-                        base.parentWays, base.parentRels);
+        for (i = 0; i < entities.length; i++) {
+            var entity = entities[i];
+
+            if (base.entities[entity.id])
+                continue;
+
+            // Merging data into the base graph
+            base.entities[entity.id] = entity;
+            this._updateCalculated(undefined, entity,
+                base.parentWays, base.parentRels);
+
+            // Restore provisionally-deleted nodes that are discovered to have an extant parent
+            if (entity.type === 'way') {
+                for (j = 0; j < entity.nodes.length; j++) {
+                    id = entity.nodes[j];
+                    for (k = 1; k < stack.length; k++) {
+                        var ents = stack[k].entities;
+                        if (ents.hasOwnProperty(id) && ents[id] === undefined) {
+                            delete ents[id];
+                        }
+                    }
                 }
             }
         }
 
+        for (i = 0; i < stack.length; i++) {
+            stack[i]._updateRebased();
+        }
+    },
+
+    _updateRebased: function() {
+        var base = this.base(),
+            i, k, child, id, keys;
+
         keys = Object.keys(this._parentWays);
         for (i = 0; i < keys.length; i++) {
             child = keys[i];
@@ -21782,9 +21830,7 @@ iD.Graph.prototype = {
     freeze: function() {
         this.frozen = true;
 
-        if (iD.debug) {
-            Object.freeze(this.entities);
-        }
+        // No longer freezing entities here due to in-place updates needed in rebase.
 
         return this;
     },
@@ -21846,10 +21892,7 @@ iD.History = function(context) {
         },
 
         merge: function(entities, extent) {
-            for (var i = 0; i < stack.length; i++) {
-                stack[i].graph.rebase(entities);
-            }
-
+            stack[0].graph.rebase(entities, _.pluck(stack, 'graph'));
             tree.rebase(entities);
 
             dispatch.change(undefined, extent);
@@ -22064,7 +22107,6 @@ iD.History = function(context) {
                 });
             }
 
-            stack[0].graph.inherited = false;
             dispatch.change();
 
             return history;
@@ -22184,16 +22226,27 @@ iD.Relation = iD.Entity.relation = function iD_Relation() {
 
 iD.Relation.prototype = Object.create(iD.Entity.prototype);
 
+iD.Relation.creationOrder = function(a, b) {
+    var aId = parseInt(iD.Entity.id.toOSM(a.id), 10);
+    var bId = parseInt(iD.Entity.id.toOSM(b.id), 10);
+
+    if (aId < 0 || bId < 0) return aId - bId;
+    return bId - aId;
+};
+
 _.extend(iD.Relation.prototype, {
     type: 'relation',
     members: [],
 
-    extent: function(resolver) {
+    extent: function(resolver, memo) {
         return resolver.transient(this, 'extent', function() {
+            if (memo && memo[this.id]) return iD.geo.Extent();
+            memo = memo || {};
+            memo[this.id] = true;
             return this.members.reduce(function(extent, member) {
                 member = resolver.hasEntity(member.id);
                 if (member) {
-                    return extent.extend(member.extent(resolver));
+                    return extent.extend(member.extent(resolver, memo));
                 } else {
                     return extent;
                 }
@@ -23199,7 +23252,6 @@ iD.Map = function(context) {
         transformStart,
         transformed = false,
         minzoom = 0,
-        transformProp = iD.util.prefixCSSProperty('Transform'),
         points = iD.svg.Points(roundedProjection, context),
         vertices = iD.svg.Vertices(roundedProjection, context),
         lines = iD.svg.Lines(projection),
@@ -23366,13 +23418,8 @@ iD.Map = function(context) {
             tX = Math.round((d3.event.translate[0] / scale - transformStart[1][0]) * scale),
             tY = Math.round((d3.event.translate[1] / scale - transformStart[1][1]) * scale);
 
-        var transform =
-            (iD.detect().opera ?
-                'translate(' + tX + 'px,' + tY + 'px)' :
-                'translate3d(' + tX + 'px,' + tY + 'px, 0)') + ' scale(' + scale + ')';
-
         transformed = true;
-        supersurface.style(transformProp, transform);
+        iD.util.setTransform(supersurface, tX, tY, scale);
         queueRedraw();
 
         dispatch.move(map);
@@ -23380,7 +23427,7 @@ iD.Map = function(context) {
 
     function resetTransform() {
         if (!transformed) return false;
-        supersurface.style(transformProp, iD.detect().opera ? '' : 'translate3d(0,0,0)');
+        iD.util.setTransform(supersurface, 0, 0);
         transformed = false;
         return true;
     }
@@ -23953,7 +24000,7 @@ iD.svg.Areas = function(projection) {
             .data(function(layer) { return data[layer]; }, iD.Entity.key);
 
         // Remove exiting areas first, so they aren't included in the `fills`
-        // array used for sorting below (https://github.com/systemed/iD/issues/1903).
+        // array used for sorting below (https://github.com/openstreetmap/iD/issues/1903).
         paths.exit()
             .remove();
 
@@ -24552,8 +24599,12 @@ iD.svg.Midpoints = function(projection, context) {
                     b = nodes[j + 1],
                     id = [a.id, b.id].sort().join('-');
 
-                // If neither of the nodes changed, no need to redraw midpoint
-                if (!midpoints[id] && (filter(a) || filter(b))) {
+                // Redraw midpoints in two cases:
+                //   1. One of the two endpoint nodes changed (e.g. was moved).
+                //   2. A node was deleted. The midpoint between the two new
+                //      endpoints needs to be redrawn. In this case only the
+                //      way will be in the diff.
+                if (!midpoints[id] && (filter(a) || filter(b) || filter(entity))) {
                     var loc = iD.geo.interp(a.loc, b.loc, 0.5);
                     if (extent.intersects(loc) && iD.geo.euclideanDistance(projection(a.loc), projection(b.loc)) > 40) {
                         midpoints[id] = {
@@ -25159,14 +25210,14 @@ iD.ui = function(context) {
             .append('a')
             .attr('target', '_blank')
             .attr('tabindex', -1)
-            .attr('href', 'http://github.com/systemed/iD')
+            .attr('href', 'http://github.com/openstreetmap/iD')
             .text(iD.version);
 
         var bugReport = linkList.append('li')
             .append('a')
             .attr('target', '_blank')
             .attr('tabindex', -1)
-            .attr('href', 'https://github.com/systemed/iD/issues');
+            .attr('href', 'https://github.com/openstreetmap/iD/issues');
 
         bugReport.append('span')
             .attr('class','icon bug light');
@@ -25396,11 +25447,15 @@ iD.ui.Background = function(context) {
     function background(selection) {
 
         function setOpacity(d) {
-            context.container().selectAll('.background-layer')
+            var bg = context.container().selectAll('.background-layer')
                 .transition()
                 .style('opacity', d)
                 .attr('data-opacity', d);
 
+            if (!iD.detect().opera) {
+                iD.util.setTransform(bg, 0, 0);
+            }
+
             opacityList.selectAll('li')
                 .classed('active', function(_) { return _ === d; });
 
@@ -25940,7 +25995,9 @@ iD.ui.Commit = function(context) {
         function warningClick(d) {
             if (d.entity) {
                 context.map().zoomTo(d.entity);
-                context.enter(iD.modes.Select(context, [d.entity.id]));
+                context.enter(
+                    iD.modes.Select(context, [d.entity.id])
+                        .suppressMenu(true));
             }
         }
     }
@@ -26009,7 +26066,7 @@ iD.ui.Contributors = function(context) {
                 .attr('target', '_blank')
                 .attr('tabindex', -1)
                 .attr('href', function() {
-                    return context.connection().changesetsURL(context.map().extent());
+                    return context.connection().changesetsURL(context.map().center(), context.map().zoom());
                 })
                 .text(u.length - limit + 1);
 
@@ -26286,7 +26343,7 @@ iD.ui.FeatureList = function(context) {
             var q = search.property('value'),
                 items = list.selectAll('.feature-list-item');
             if (d3.event.keyCode === 13 && q.length && items.size()) {
-                click(items.datum().entity);
+                click(items.datum());
             }
         }
 
@@ -26330,6 +26387,29 @@ iD.ui.FeatureList = function(context) {
 
             if (!q) return result;
 
+            var idMatch = q.match(/^([nwr])([0-9]+)$/);
+
+            if (idMatch) {
+                result.push({
+                    id: idMatch[0],
+                    geometry: idMatch[1] === 'n' ? 'point' : idMatch[1] === 'w' ? 'line' : 'relation',
+                    type: idMatch[1] === 'n' ? t('inspector.node') : idMatch[1] === 'w' ? t('inspector.way') : t('inspector.relation'),
+                    name: idMatch[2]
+                });
+            }
+
+            var locationMatch = q.match(/^(-?\d+\.?\d*)\s+(-?\d+\.?\d*)$/);
+
+            if (locationMatch) {
+                result.push({
+                    id: -1,
+                    geometry: 'point',
+                    type: t('inspector.location'),
+                    name: locationMatch[0],
+                    location: [parseFloat(locationMatch[1]), parseFloat(locationMatch[2])]
+                });
+            }
+
             function addEntity(entity) {
                 if (entity.id in entities || result.length > 200)
                     return;
@@ -26358,12 +26438,13 @@ iD.ui.FeatureList = function(context) {
             }
 
             (geocodeResults || []).forEach(function(d) {
-                // https://github.com/systemed/iD/issues/1890
+                // https://github.com/openstreetmap/iD/issues/1890
                 if (d.osm_type && d.osm_id) {
                     result.push({
                         id: iD.Entity.id.fromOSM(d.osm_type, d.osm_id),
                         geometry: d.osm_type === 'relation' ? 'relation' : d.osm_type === 'way' ? 'line' : 'point',
-                        type: (d.type.charAt(0).toUpperCase() + d.type.slice(1)).replace('_', ' '),
+                        type: d.type !== 'yes' ? (d.type.charAt(0).toUpperCase() + d.type.slice(1)).replace('_', ' ')
+                                               : (d.class.charAt(0).toUpperCase() + d.class.slice(1)).replace('_', ' '),
                         name: d.display_name,
                         extent: new iD.geo.Extent(
                             [parseFloat(d.boundingbox[3]), parseFloat(d.boundingbox[0])],
@@ -26415,6 +26496,10 @@ iD.ui.FeatureList = function(context) {
             list.selectAll('.geocode-item')
                 .style('display', (value && geocodeResults === undefined) ? 'block' : 'none');
 
+            list.selectAll('.feature-list-item')
+                .data([-1])
+                .remove();
+
             var items = list.selectAll('.feature-list-item')
                 .data(results, function(d) { return d.id; });
 
@@ -26449,6 +26534,8 @@ iD.ui.FeatureList = function(context) {
         }
 
         function mouseover(d) {
+            if (d.id === -1) return;
+
             context.surface().selectAll(iD.util.entityOrMemberSelector([d.id], context.graph()))
                 .classed('hover', true);
         }
@@ -26460,7 +26547,10 @@ iD.ui.FeatureList = function(context) {
 
         function click(d) {
             d3.event.preventDefault();
-            if (d.entity) {
+            if (d.location) {
+                context.map().centerZoom([d.location[1], d.location[0]], 20);
+            }
+            else if (d.entity) {
                 context.enter(iD.modes.Select(context, [d.entity.id]));
             } else {
                 context.loadEntity(d.id);
@@ -26737,10 +26827,8 @@ iD.ui.Inspector = function(context) {
                 .entityID(entityID));
 
         function showList(preset) {
-            var right = $wrap.style('right').indexOf('%') > 0 ? '-100%' : '-' + selection.style('width');
-
             $wrap.transition()
-                .style('right', right);
+                .styleTween('right', function() { return d3.interpolate('0%', '-100%'); });
 
             $presetPane.call(presetList
                 .preset(preset)
@@ -26748,10 +26836,8 @@ iD.ui.Inspector = function(context) {
         }
 
         function setPreset(preset) {
-            var right = $wrap.style('right').indexOf('%') > 0 ? '0%' : '0px';
-
             $wrap.transition()
-                .style('right', right);
+                .styleTween('right', function() { return d3.interpolate('-100%', '0%'); });
 
             $editorPane.call(entityEditor
                 .preset(preset));
@@ -27770,7 +27856,7 @@ iD.ui.RadialMenu = function(context, operations) {
             .attr('class', 'tooltip-inner radial-menu-tooltip');
 
         function mousedown() {
-            d3.event.stopPropagation(); // https://github.com/systemed/iD/issues/1869
+            d3.event.stopPropagation(); // https://github.com/openstreetmap/iD/issues/1869
         }
 
         function mouseover(d, i) {
@@ -27811,7 +27897,9 @@ iD.ui.RadialMenu = function(context, operations) {
 
     radialMenu.close = function() {
         if (menu) {
-            menu.transition()
+            menu
+                .style('pointer-events', 'none')
+                .transition()
                 .attr('opacity', 0)
                 .remove();
         }
@@ -27986,10 +28074,11 @@ iD.ui.RawMembershipEditor = function(context) {
     }
 
     function relations(q) {
-        var result = [{
+        var newRelation = {
                 relation: null,
                 value: t('inspector.new_relation')
-            }],
+            },
+            result = [],
             graph = context.graph();
 
         context.intersects(context.extent()).forEach(function(entity) {
@@ -28009,6 +28098,11 @@ iD.ui.RawMembershipEditor = function(context) {
             });
         });
 
+        result.sort(function(a, b) {
+            return iD.Relation.creationOrder(a.relation, b.relation);
+        });
+        result.unshift(newRelation);
+
         return result;
     }
 
@@ -28092,6 +28186,7 @@ iD.ui.RawMembershipEditor = function(context) {
                     .attr('type', 'text')
                     .attr('class', 'member-entity-input')
                     .call(d3.combobox()
+                        .minItems(1)
                         .fetcher(function(value, callback) {
                             callback(relations(value));
                         })
@@ -28579,6 +28674,8 @@ iD.ui.Sidebar = function(context) {
             }
         };
 
+        sidebar.hover = _.throttle(sidebar.hover, 200);
+
         sidebar.select = function(id, newFeature) {
             if (!current && id) {
                 featureListWrap.classed('inspector-hidden', true);
@@ -28707,7 +28804,7 @@ iD.ui.Splash = function(context) {
             .html(t('splash.text', {
                 version: iD.version,
                 website: '<a href="http://ideditor.com/">ideditor.com</a>',
-                github: '<a href="https://github.com/systemed/iD">github.com</a>'
+                github: '<a href="https://github.com/openstreetmap/iD">github.com</a>'
             }));
 
         var buttons = introModal.append('div').attr('class', 'modal-actions cf');
@@ -31135,9 +31232,11 @@ iD.presets.Preset = function(id, preset, fields) {
 
     var applyTags = preset.addTags || preset.tags;
     preset.applyTags = function(tags, geometry) {
+        var k;
+
         tags = _.clone(tags);
 
-        for (var k in applyTags) {
+        for (k in applyTags) {
             if (applyTags[k] === '*') {
                 tags[k] = 'yes';
             } else {
@@ -31145,6 +31244,13 @@ iD.presets.Preset = function(id, preset, fields) {
             }
         }
 
+        // Add area=yes if necessary
+        for (k in applyTags) {
+            if (geometry === 'area' && !(k in iD.areaKeys))
+                tags.area = 'yes';
+            break;
+        }
+
         for (var f in preset.fields) {
             var field = preset.fields[f];
             if (field.matchGeometry(geometry) && field.key && !tags[field.key] && field['default']) {
@@ -40584,7 +40690,101 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "overlay": true
         },
         {
-            "name": "Lithuania - ORT10LT",
+            "name": "Landsat 233055",
+            "type": "tms",
+            "description": "Recent Landsat imagery",
+            "template": "http://{switch:a,b,c,d}.tile.paulnorman.ca/landsat_233055/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                5,
+                14
+            ],
+            "polygon": [
+                [
+                    [
+                        -60.8550011,
+                        6.1765004
+                    ],
+                    [
+                        -60.4762612,
+                        7.9188291
+                    ],
+                    [
+                        -62.161689,
+                        8.2778675
+                    ],
+                    [
+                        -62.5322549,
+                        6.5375488
+                    ]
+                ]
+            ],
+            "id": "landsat_233055"
+        },
+        {
+            "name": "Latest southwest British Columbia Landsat",
+            "type": "tms",
+            "description": "Recent lower-resolution landwsat imagery for southwest British Columbia",
+            "template": "http://{switch:a,b,c,d}.tile.paulnorman.ca/landsat_047026/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                5,
+                13
+            ],
+            "polygon": [
+                [
+                    [
+                        -121.9355512,
+                        47.7820648
+                    ],
+                    [
+                        -121.5720582,
+                        48.6410125
+                    ],
+                    [
+                        -121.2015461,
+                        49.4846247
+                    ],
+                    [
+                        -121.8375516,
+                        49.6023246
+                    ],
+                    [
+                        -122.4767046,
+                        49.7161735
+                    ],
+                    [
+                        -123.118912,
+                        49.8268824
+                    ],
+                    [
+                        -123.760228,
+                        49.9335836
+                    ],
+                    [
+                        -124.0887706,
+                        49.0870469
+                    ],
+                    [
+                        -124.4128889,
+                        48.2252567
+                    ],
+                    [
+                        -123.792772,
+                        48.1197334
+                    ],
+                    [
+                        -123.1727942,
+                        48.0109592
+                    ],
+                    [
+                        -122.553553,
+                        47.8982299
+                    ]
+                ]
+            ],
+            "id": "landsat_047026"
+        },
+        {
+            "name": "Lithuania - NŽT ORT10LT",
             "type": "tms",
             "template": "http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg",
             "scaleExtent": [
@@ -40594,27 +40794,165 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "polygon": [
                 [
                     [
-                        21,
-                        53.88
+                        21.4926054,
+                        56.3592046
+                    ],
+                    [
+                        21.8134688,
+                        56.4097144
+                    ],
+                    [
+                        21.9728753,
+                        56.4567587
+                    ],
+                    [
+                        22.2158294,
+                        56.4604404
+                    ],
+                    [
+                        22.2183922,
+                        56.4162361
+                    ],
+                    [
+                        23.3511527,
+                        56.4267251
+                    ],
+                    [
+                        23.3521778,
+                        56.3824815
+                    ],
+                    [
+                        23.9179035,
+                        56.383305
+                    ],
+                    [
+                        23.9176231,
+                        56.3392908
+                    ],
+                    [
+                        24.5649817,
+                        56.3382169
+                    ],
+                    [
+                        24.564933,
+                        56.3828587
+                    ],
+                    [
+                        24.6475683,
+                        56.4277798
+                    ],
+                    [
+                        24.8099394,
+                        56.470646
+                    ],
+                    [
+                        24.9733979,
+                        56.4698452
+                    ],
+                    [
+                        25.1299701,
+                        56.2890356
+                    ],
+                    [
+                        25.127433,
+                        56.1990144
+                    ],
+                    [
+                        25.6921076,
+                        56.1933684
+                    ],
+                    [
+                        26.0839005,
+                        56.0067879
+                    ],
+                    [
+                        26.4673573,
+                        55.7304232
+                    ],
+                    [
+                        26.5463565,
+                        55.7132705
+                    ],
+                    [
+                        26.5154447,
+                        55.2345969
                     ],
                     [
-                        21,
-                        56.45
+                        25.7874641,
+                        54.8425656
                     ],
                     [
-                        26.85,
-                        56.45
+                        25.7675259,
+                        54.6350898
                     ],
                     [
-                        26.85,
-                        53.88
+                        25.6165253,
+                        54.4404007
                     ],
                     [
-                        21,
-                        53.88
+                        24.4566043,
+                        53.9577649
+                    ],
+                    [
+                        23.6164786,
+                        53.9575517
+                    ],
+                    [
+                        23.5632006,
+                        54.048085
+                    ],
+                    [
+                        22.8462074,
+                        54.3563682
+                    ],
+                    [
+                        22.831944,
+                        54.9414849
+                    ],
+                    [
+                        22.4306085,
+                        55.1159913
+                    ],
+                    [
+                        21.9605898,
+                        55.1107144
+                    ],
+                    [
+                        21.7253241,
+                        55.1496885
+                    ],
+                    [
+                        21.5628422,
+                        55.2362913
+                    ],
+                    [
+                        21.2209638,
+                        55.2742668
+                    ],
+                    [
+                        21.1630444,
+                        55.2803979
+                    ],
+                    [
+                        20.9277788,
+                        55.3101641
+                    ],
+                    [
+                        20.9257285,
+                        55.3588507
+                    ],
+                    [
+                        20.9980451,
+                        55.4514157
+                    ],
+                    [
+                        21.0282249,
+                        56.0796297
                     ]
                 ]
-            ]
+            ],
+            "terms_url": "http://www.geoportal.lt",
+            "terms_text": "NŽT ORT10LT"
         },
         {
             "name": "Locator Overlay",
@@ -51745,27 +52083,483 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "name": "Surrey Air Survey",
             "type": "tms",
             "template": "http://gravitystorm.dev.openstreetmap.org/surrey/{zoom}/{x}/{y}.png",
+            "scaleExtent": [
+                8,
+                19
+            ],
             "polygon": [
                 [
                     [
-                        -0.856,
-                        51.071
+                        -0.752478,
+                        51.0821941
+                    ],
+                    [
+                        -0.7595183,
+                        51.0856254
+                    ],
+                    [
+                        -0.8014342,
+                        51.1457917
+                    ],
+                    [
+                        -0.8398864,
+                        51.1440686
+                    ],
+                    [
+                        -0.8357665,
+                        51.1802397
+                    ],
+                    [
+                        -0.8529549,
+                        51.2011266
+                    ],
+                    [
+                        -0.8522683,
+                        51.2096231
+                    ],
+                    [
+                        -0.8495217,
+                        51.217903
+                    ],
+                    [
+                        -0.8266907,
+                        51.2403696
+                    ],
+                    [
+                        -0.8120995,
+                        51.2469248
+                    ],
+                    [
+                        -0.7736474,
+                        51.2459577
+                    ],
+                    [
+                        -0.7544213,
+                        51.2381127
+                    ],
+                    [
+                        -0.754078,
+                        51.233921
+                    ],
+                    [
+                        -0.7446366,
+                        51.2333836
+                    ],
+                    [
+                        -0.7430693,
+                        51.2847178
+                    ],
+                    [
+                        -0.751503,
+                        51.3069524
+                    ],
+                    [
+                        -0.7664376,
+                        51.3121032
+                    ],
+                    [
+                        -0.7820588,
+                        51.3270157
+                    ],
+                    [
+                        -0.7815438,
+                        51.3388135
+                    ],
+                    [
+                        -0.7374268,
+                        51.3720456
+                    ],
+                    [
+                        -0.7192307,
+                        51.3769748
+                    ],
+                    [
+                        -0.6795769,
+                        51.3847961
+                    ],
+                    [
+                        -0.6807786,
+                        51.3901523
+                    ],
+                    [
+                        -0.6531411,
+                        51.3917591
+                    ],
+                    [
+                        -0.6301385,
+                        51.3905808
+                    ],
+                    [
+                        -0.6291085,
+                        51.3970074
+                    ],
+                    [
+                        -0.6234437,
+                        51.3977572
+                    ],
+                    [
+                        -0.613144,
+                        51.4295552
+                    ],
+                    [
+                        -0.6002471,
+                        51.4459121
+                    ],
+                    [
+                        -0.5867081,
+                        51.4445365
+                    ],
+                    [
+                        -0.5762368,
+                        51.453202
+                    ],
+                    [
+                        -0.5626755,
+                        51.4523462
+                    ],
+                    [
+                        -0.547741,
+                        51.4469972
+                    ],
+                    [
+                        -0.5372697,
+                        51.4448575
+                    ],
+                    [
+                        -0.537098,
+                        51.4526671
+                    ],
+                    [
+                        -0.5439644,
+                        51.4545926
+                    ],
+                    [
+                        -0.5405312,
+                        51.4698865
+                    ],
+                    [
+                        -0.5309182,
+                        51.4760881
+                    ],
+                    [
+                        -0.5091172,
+                        51.4744843
+                    ],
+                    [
+                        -0.5086022,
+                        51.4695657
+                    ],
+                    [
+                        -0.4900628,
+                        51.4682825
+                    ],
+                    [
+                        -0.4526406,
+                        51.4606894
+                    ],
+                    [
+                        -0.4486924,
+                        51.4429316
+                    ],
+                    [
+                        -0.4414826,
+                        51.4418616
+                    ],
+                    [
+                        -0.4418259,
+                        51.4369394
+                    ],
+                    [
+                        -0.4112702,
+                        51.4380095
+                    ],
+                    [
+                        -0.4014855,
+                        51.4279498
+                    ],
+                    [
+                        -0.3807145,
+                        51.4262372
+                    ],
+                    [
+                        -0.3805428,
+                        51.4161749
+                    ],
+                    [
+                        -0.3491288,
+                        51.4138195
+                    ],
+                    [
+                        -0.3274994,
+                        51.4037544
+                    ],
+                    [
+                        -0.3039818,
+                        51.3990424
+                    ],
+                    [
+                        -0.3019219,
+                        51.3754747
+                    ],
+                    [
+                        -0.309475,
+                        51.369688
+                    ],
+                    [
+                        -0.3111916,
+                        51.3529669
+                    ],
+                    [
+                        -0.2955704,
+                        51.3541462
+                    ],
+                    [
+                        -0.2923089,
+                        51.3673303
+                    ],
+                    [
+                        -0.2850991,
+                        51.3680805
+                    ],
+                    [
+                        -0.2787476,
+                        51.3771891
+                    ],
+                    [
+                        -0.2655297,
+                        51.3837247
+                    ],
+                    [
+                        -0.2411538,
+                        51.3847961
+                    ],
+                    [
+                        -0.2123147,
+                        51.3628288
+                    ],
+                    [
+                        -0.2107697,
+                        51.3498578
+                    ],
+                    [
+                        -0.190857,
+                        51.3502867
+                    ],
+                    [
+                        -0.1542931,
+                        51.3338802
+                    ],
+                    [
+                        -0.1496583,
+                        51.3057719
+                    ],
+                    [
+                        -0.1074296,
+                        51.2966491
+                    ],
+                    [
+                        -0.0887185,
+                        51.3099571
+                    ],
+                    [
+                        -0.0878602,
+                        51.3220811
+                    ],
+                    [
+                        -0.0652009,
+                        51.3215448
+                    ],
+                    [
+                        -0.0641709,
+                        51.3264793
+                    ],
+                    [
+                        -0.0519829,
+                        51.3263721
+                    ],
+                    [
+                        -0.0528412,
+                        51.334631
+                    ],
+                    [
+                        -0.0330779,
+                        51.3430876
+                    ],
+                    [
+                        0.0019187,
+                        51.3376339
+                    ],
+                    [
+                        0.0118751,
+                        51.3281956
+                    ],
+                    [
+                        0.013935,
+                        51.2994398
+                    ],
+                    [
+                        0.0202865,
+                        51.2994398
+                    ],
+                    [
+                        0.0240631,
+                        51.3072743
+                    ],
+                    [
+                        0.0331611,
+                        51.3086694
+                    ],
+                    [
+                        0.0455207,
+                        51.30545
+                    ],
+                    [
+                        0.0523872,
+                        51.2877392
+                    ],
+                    [
+                        0.0616569,
+                        51.2577764
+                    ],
+                    [
+                        0.0640602,
+                        51.2415518
+                    ],
+                    [
+                        0.0462074,
+                        51.2126342
+                    ],
+                    [
+                        0.0407142,
+                        51.2109136
+                    ],
+                    [
+                        0.0448341,
+                        51.1989753
+                    ],
+                    [
+                        0.0494689,
+                        51.1997283
+                    ],
+                    [
+                        0.0558204,
+                        51.1944573
+                    ],
+                    [
+                        0.0611419,
+                        51.1790713
+                    ],
+                    [
+                        0.0623435,
+                        51.1542061
+                    ],
+                    [
+                        0.0577087,
+                        51.1417146
+                    ],
+                    [
+                        0.0204582,
+                        51.1365447
+                    ],
+                    [
+                        -0.0446015,
+                        51.1336364
+                    ],
+                    [
+                        -0.1566964,
+                        51.1352522
+                    ],
+                    [
+                        -0.1572114,
+                        51.1290043
+                    ],
+                    [
+                        -0.2287942,
+                        51.1183379
+                    ],
+                    [
+                        -0.2473336,
+                        51.1183379
+                    ],
+                    [
+                        -0.2500802,
+                        51.1211394
+                    ],
+                    [
+                        -0.299347,
+                        51.1137042
+                    ],
+                    [
+                        -0.3221779,
+                        51.1119799
+                    ],
+                    [
+                        -0.3223496,
+                        51.1058367
+                    ],
+                    [
+                        -0.3596001,
+                        51.1019563
+                    ],
+                    [
+                        -0.3589135,
+                        51.1113333
+                    ],
+                    [
+                        -0.3863793,
+                        51.1117644
+                    ],
+                    [
+                        -0.3869014,
+                        51.1062516
+                    ],
+                    [
+                        -0.4281001,
+                        51.0947174
+                    ],
+                    [
+                        -0.4856784,
+                        51.0951554
+                    ],
+                    [
+                        -0.487135,
+                        51.0872266
+                    ],
+                    [
+                        -0.5297404,
+                        51.0865404
+                    ],
+                    [
+                        -0.5302259,
+                        51.0789914
+                    ],
+                    [
+                        -0.61046,
+                        51.076551
+                    ],
+                    [
+                        -0.6099745,
+                        51.080669
+                    ],
+                    [
+                        -0.6577994,
+                        51.0792202
                     ],
                     [
-                        -0.856,
-                        51.473
+                        -0.6582849,
+                        51.0743394
                     ],
                     [
-                        0.062,
-                        51.473
+                        -0.6836539,
+                        51.0707547
                     ],
                     [
-                        0.062,
-                        51.071
+                        -0.6997979,
+                        51.070831
                     ],
                     [
-                        -0.856,
-                        51.071
+                        -0.7296581,
+                        51.0744919
                     ]
                 ]
             ]
@@ -61191,9 +61985,169 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "addr:housenumber": "*"
                 },
                 "addTags": {},
+                "removeTags": {},
                 "matchScore": 0.2,
                 "name": "Address"
             },
+            "aerialway": {
+                "fields": [
+                    "aerialway"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "line"
+                ],
+                "tags": {
+                    "aerialway": "*"
+                },
+                "terms": [
+                    "ski lift",
+                    "funifor",
+                    "funitel"
+                ],
+                "name": "Aerialway"
+            },
+            "aerialway/cable_car": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "tramway",
+                    "ropeway"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "cable_car"
+                },
+                "name": "Cable Car"
+            },
+            "aerialway/chair_lift": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/bubble",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "chair_lift"
+                },
+                "name": "Chair Lift"
+            },
+            "aerialway/gondola": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/occupancy",
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/bubble",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "gondola"
+                },
+                "name": "Gondola"
+            },
+            "aerialway/magic_carpet": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration",
+                    "aerialway/heating"
+                ],
+                "tags": {
+                    "aerialway": "magic_carpet"
+                },
+                "name": "Magic Carpet Lift"
+            },
+            "aerialway/platter": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "button lift",
+                    "poma lift"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "platter"
+                },
+                "name": "Platter Lift"
+            },
+            "aerialway/pylon": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "fields": [
+                    "ref"
+                ],
+                "tags": {
+                    "aerialway": "pylon"
+                },
+                "name": "Aerialway Pylon"
+            },
+            "aerialway/rope_tow": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "handle tow",
+                    "bugel lift"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "rope_tow"
+                },
+                "name": "Rope Tow Lift"
+            },
+            "aerialway/station": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "fields": [
+                    "aerialway/access",
+                    "aerialway/summer/access",
+                    "elevation"
+                ],
+                "tags": {
+                    "aerialway": "station"
+                },
+                "name": "Aerialway Station"
+            },
+            "aerialway/t-bar": {
+                "geometry": [
+                    "line"
+                ],
+                "fields": [
+                    "aerialway/capacity",
+                    "aerialway/duration"
+                ],
+                "tags": {
+                    "aerialway": "t-bar"
+                },
+                "name": "T-bar Lift"
+            },
             "aeroway": {
                 "icon": "airport",
                 "fields": [
@@ -61390,7 +62344,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "atm",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
@@ -61429,7 +62384,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "bar",
                 "fields": [
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
@@ -61511,7 +62467,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "cuisine",
                     "internet_access",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
@@ -61626,6 +62583,37 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Cinema"
             },
+            "amenity/clinic": {
+                "name": "Clinic",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "clinic",
+                    "medical clinic"
+                ],
+                "tags": {
+                    "amenity": "clinic"
+                },
+                "icon": "hospital",
+                "fields": [
+                    "building_area",
+                    "social_facility",
+                    "address",
+                    "opening_hours"
+                ]
+            },
+            "amenity/clock": {
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "amenity": "clock"
+                },
+                "name": "Clock"
+            },
             "amenity/college": {
                 "icon": "college",
                 "fields": [
@@ -61658,6 +62646,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Courthouse"
             },
+            "amenity/dentist": {
+                "name": "Dentist",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "dentist",
+                    "dentist's office"
+                ],
+                "tags": {
+                    "amenity": "doctors"
+                },
+                "icon": "hospital",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ]
+            },
+            "amenity/doctor": {
+                "name": "Doctor",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "doctor",
+                    "doctor's office"
+                ],
+                "tags": {
+                    "amenity": "doctors"
+                },
+                "icon": "hospital",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ]
+            },
             "amenity/drinking_water": {
                 "icon": "water",
                 "geometry": [
@@ -61692,7 +62720,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "cuisine",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
@@ -61885,7 +62914,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "fields": [
                     "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
@@ -62145,7 +63175,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "icon": "beer",
                 "fields": [
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
                 "geometry": [
                     "point",
@@ -62208,6 +63239,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "cuisine",
                     "building_area",
                     "address",
+                    "opening_hours",
                     "capacity"
                 ],
                 "geometry": [
@@ -62306,6 +63338,30 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "name": "Shelter"
             },
+            "amenity/studio": {
+                "name": "Studio",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "recording studio",
+                    "studio",
+                    "radio",
+                    "radio studio",
+                    "television",
+                    "television studio"
+                ],
+                "tags": {
+                    "amenity": "studio"
+                },
+                "icon": "music",
+                "fields": [
+                    "building_area",
+                    "studio_type",
+                    "address"
+                ]
+            },
             "amenity/swimming_pool": {
                 "geometry": [
                     "point",
@@ -62461,6 +63517,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Vending Machine"
             },
+            "amenity/veterinary": {
+                "fields": [],
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "pet clinic",
+                    "veterinarian",
+                    "animal hospital",
+                    "pet doctor"
+                ],
+                "tags": {
+                    "amenity": "veterinary"
+                },
+                "name": "Veterinary"
+            },
             "amenity/waste_basket": {
                 "icon": "waste-basket",
                 "geometry": [
@@ -62826,270 +63899,1212 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Residential Building"
             },
-            "embankment": {
+            "craft/basket_maker": {
+                "name": "Basket Maker",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "basket",
+                    "basketry",
+                    "basket maker",
+                    "basket weaver"
                 ],
                 "tags": {
-                    "embankment": "yes"
+                    "craft": "basket_maker"
                 },
-                "name": "Embankment",
-                "matchScore": 0.2
-            },
-            "emergency/ambulance_station": {
+                "icon": "art-gallery",
                 "fields": [
-                    "operator"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/beekeeper": {
+                "name": "Beekeeper",
                 "geometry": [
-                    "area",
                     "point",
-                    "vertex"
+                    "area"
+                ],
+                "terms": [
+                    "bees",
+                    "beekeeper",
+                    "bee box"
                 ],
                 "tags": {
-                    "emergency": "ambulance_station"
+                    "craft": "beekeeper"
                 },
-                "name": "Ambulance Station"
-            },
-            "emergency/fire_hydrant": {
+                "icon": "farm",
                 "fields": [
-                    "fire_hydrant/type"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/blacksmith": {
+                "name": "Blacksmith",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
+                ],
+                "terms": [
+                    "blacksmith"
                 ],
                 "tags": {
-                    "emergency": "fire_hydrant"
+                    "craft": "blacksmith"
                 },
-                "name": "Fire Hydrant"
-            },
-            "emergency/phone": {
-                "icon": "emergency-telephone",
+                "icon": "farm",
                 "fields": [
-                    "operator"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/boatbuilder": {
+                "name": "Boat Builder",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
+                ],
+                "terms": [
+                    "boat builder"
                 ],
                 "tags": {
-                    "emergency": "phone"
+                    "craft": "boatbuilder"
                 },
-                "name": "Emergency Phone"
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "entrance": {
-                "icon": "entrance",
+            "craft/bookbinder": {
+                "name": "Bookbinder",
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "bookbinder",
+                    "book repair"
                 ],
                 "tags": {
-                    "entrance": "*"
+                    "craft": "bookbinder"
                 },
+                "icon": "library",
                 "fields": [
-                    "entrance",
-                    "access_simple",
-                    "address"
-                ],
-                "name": "Entrance"
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "footway/crossing": {
-                "fields": [
-                    "crossing",
-                    "access",
-                    "surface"
-                ],
+            "craft/brewery": {
+                "name": "Brewery",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
-                "tags": {
-                    "highway": "footway",
-                    "footway": "crossing"
-                },
                 "terms": [
-                    "crosswalk",
-                    "zebra crossing"
-                ],
-                "name": "Crossing"
-            },
-            "footway/sidewalk": {
-                "fields": [
-                    "surface",
-                    "lit",
-                    "access"
-                ],
-                "geometry": [
-                    "line"
+                    "brewery"
                 ],
                 "tags": {
-                    "highway": "footway",
-                    "footway": "sidewalk"
+                    "craft": "brewery"
                 },
-                "terms": [],
-                "name": "Sidewalk"
+                "icon": "beer",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "golf/bunker": {
-                "icon": "golf",
+            "craft/carpenter": {
+                "name": "Carpenter",
                 "geometry": [
+                    "point",
                     "area"
                 ],
-                "tags": {
-                    "golf": "bunker",
-                    "natural": "sand"
-                },
                 "terms": [
-                    "hazard",
-                    "bunker"
+                    "carpenter",
+                    "woodworker"
                 ],
-                "name": "Sand Trap"
+                "tags": {
+                    "craft": "carpenter"
+                },
+                "icon": "logging",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "golf/fairway": {
-                "icon": "golf",
+            "craft/carpet_layer": {
+                "name": "Carpet Layer",
                 "geometry": [
+                    "point",
                     "area"
                 ],
+                "terms": [
+                    "carpet layer"
+                ],
                 "tags": {
-                    "golf": "fairway",
-                    "landuse": "grass"
+                    "craft": "carpet_layer"
                 },
-                "name": "Fairway"
+                "icon": "square",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "golf/green": {
-                "icon": "golf",
+            "craft/caterer": {
+                "name": "Caterer",
                 "geometry": [
+                    "point",
                     "area"
                 ],
-                "tags": {
-                    "golf": "green",
-                    "landuse": "grass",
-                    "leisure": "pitch",
-                    "sport": "golf"
-                },
                 "terms": [
-                    "putting green"
+                    "Caterer",
+                    "Catering"
                 ],
-                "name": "Putting Green"
-            },
-            "golf/hole": {
-                "icon": "golf",
+                "tags": {
+                    "craft": "caterer"
+                },
+                "icon": "bakery",
                 "fields": [
-                    "golf_hole",
-                    "par",
-                    "handicap"
-                ],
+                    "cuisine",
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/clockmaker": {
+                "name": "Clockmaker",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "clock",
+                    "clockmaker",
+                    "clock repair"
                 ],
                 "tags": {
-                    "golf": "hole"
+                    "craft": "clockmaker"
                 },
-                "name": "Golf Hole"
+                "icon": "circle-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "golf/lateral_water_hazard": {
-                "icon": "golf",
+            "craft/confectionary": {
+                "name": "Confectionary",
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
+                "terms": [
+                    "confectionary",
+                    "sweets",
+                    "candy"
+                ],
                 "tags": {
-                    "golf": "lateral_water_hazard",
-                    "natural": "water"
+                    "craft": "confectionary"
                 },
-                "name": "Lateral Water Hazard"
+                "icon": "bakery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "golf/rough": {
-                "icon": "golf",
+            "craft/dressmaker": {
+                "name": "Dressmaker",
                 "geometry": [
+                    "point",
                     "area"
                 ],
+                "terms": [
+                    "dress",
+                    "dressmaker"
+                ],
                 "tags": {
-                    "golf": "rough",
-                    "landuse": "grass"
+                    "craft": "dressmaker"
                 },
-                "name": "Rough"
+                "icon": "clothing-store",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "golf/tee": {
-                "icon": "golf",
+            "craft/electrician": {
+                "name": "Electrician",
                 "geometry": [
+                    "point",
                     "area"
                 ],
-                "tags": {
-                    "golf": "tee",
-                    "landuse": "grass"
-                },
                 "terms": [
-                    "teeing ground"
+                    "electrician"
                 ],
-                "name": "Tee Box"
+                "tags": {
+                    "craft": "electrician"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
             },
-            "golf/water_hazard": {
-                "icon": "golf",
+            "craft/gardener": {
+                "name": "Gardener",
                 "geometry": [
-                    "line",
+                    "point",
                     "area"
                 ],
+                "terms": [
+                    "gardener",
+                    "landscaper",
+                    "grounds keeper"
+                ],
                 "tags": {
-                    "golf": "water_hazard",
-                    "natural": "water"
+                    "craft": "gardener"
                 },
-                "name": "Water Hazard"
-            },
-            "highway": {
+                "icon": "garden",
                 "fields": [
-                    "highway"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/glaziery": {
+                "name": "Glaziery",
                 "geometry": [
                     "point",
-                    "vertex",
-                    "line",
                     "area"
                 ],
+                "terms": [
+                    "glass",
+                    "glass foundry",
+                    "stained-glass",
+                    "window"
+                ],
                 "tags": {
-                    "highway": "*"
+                    "craft": "glaziery"
                 },
-                "name": "Highway"
-            },
-            "highway/bridleway": {
+                "icon": "fire-station",
                 "fields": [
-                    "access",
-                    "surface",
-                    "structure"
-                ],
-                "icon": "highway-bridleway",
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/handicraft": {
+                "name": "Handicraft",
                 "geometry": [
-                    "line"
+                    "point",
+                    "area"
                 ],
-                "tags": {
-                    "highway": "bridleway"
-                },
                 "terms": [
-                    "bridleway",
-                    "equestrian trail",
-                    "horse riding path",
-                    "bridle road",
-                    "horse trail"
+                    "handicraft"
                 ],
-                "name": "Bridle Path"
-            },
-            "highway/bus_stop": {
-                "icon": "bus",
+                "tags": {
+                    "craft": "handicraft"
+                },
+                "icon": "art-gallery",
                 "fields": [
+                    "building_area",
+                    "address",
                     "operator",
-                    "shelter"
-                ],
+                    "opening_hours"
+                ]
+            },
+            "craft/hvac": {
+                "name": "HVAC",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "area"
+                ],
+                "terms": [
+                    "heating",
+                    "ventilating",
+                    "air-conditioning",
+                    "air conditioning"
                 ],
                 "tags": {
-                    "highway": "bus_stop"
+                    "craft": "hvac"
                 },
-                "terms": [],
-                "name": "Bus Stop"
-            },
-            "highway/crossing": {
+                "icon": "marker-stroked",
                 "fields": [
-                    "crossing"
-                ],
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/insulator": {
+                "name": "Insulator",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "insulation",
+                    "insulator"
+                ],
+                "tags": {
+                    "craft": "insulation"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/jeweler": {
+                "name": "Jeweler",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "jeweler",
+                    "gem",
+                    "diamond"
+                ],
+                "tags": {
+                    "craft": "jeweler"
+                },
+                "icon": "marker-stroked",
+                "searchable": false,
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/key_cutter": {
+                "name": "Key Cutter",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "key",
+                    "key cutter"
+                ],
+                "tags": {
+                    "craft": "key_cutter"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/locksmith": {
+                "name": "Locksmith",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "locksmith",
+                    "lock"
+                ],
+                "tags": {
+                    "craft": "locksmith"
+                },
+                "icon": "marker-stroked",
+                "searchable": false,
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/metal_construction": {
+                "name": "Metal Construction",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "metal construction"
+                ],
+                "tags": {
+                    "craft": "metal_construction"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/optician": {
+                "name": "Optician",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "glasses",
+                    "optician"
+                ],
+                "tags": {
+                    "craft": "optician"
+                },
+                "icon": "marker-stroked",
+                "searchable": false,
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/painter": {
+                "name": "painter",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "painter"
+                ],
+                "tags": {
+                    "craft": "painter"
+                },
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/photographer": {
+                "name": "Photographer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "photographer"
+                ],
+                "tags": {
+                    "craft": "photographer"
+                },
+                "icon": "camera",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/photographic_labratory": {
+                "name": "Photographic Labratory",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "photographic labratory",
+                    "film developer"
+                ],
+                "tags": {
+                    "craft": "photographic_labratory"
+                },
+                "icon": "camera",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/plasterer": {
+                "name": "Plasterer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "plasterer"
+                ],
+                "tags": {
+                    "craft": "plasterer"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/plumber": {
+                "name": "Plumber",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "pumber"
+                ],
+                "tags": {
+                    "craft": "plumber"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/pottery": {
+                "name": "Pottery",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "pottery",
+                    "potter"
+                ],
+                "tags": {
+                    "craft": "pottery"
+                },
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/rigger": {
+                "name": "Rigger",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "rigger"
+                ],
+                "tags": {
+                    "craft": "rigger"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/roofer": {
+                "name": "Roofer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "roofer"
+                ],
+                "tags": {
+                    "craft": "roofer"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/saddler": {
+                "name": "Saddler",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "saddler"
+                ],
+                "tags": {
+                    "craft": "saddler"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sailmaker": {
+                "name": "Sailmaker",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sailmaker"
+                ],
+                "tags": {
+                    "craft": "sailmaker"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sawmill": {
+                "name": "Sawmill",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sawmill",
+                    "lumber"
+                ],
+                "tags": {
+                    "craft": "sawmill"
+                },
+                "icon": "park",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/scaffolder": {
+                "name": "Scaffolder",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "scaffolder"
+                ],
+                "tags": {
+                    "craft": "scaffolder"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sculpter": {
+                "name": "Sculpter",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sculpter"
+                ],
+                "tags": {
+                    "craft": "sculpter"
+                },
+                "icon": "art-gallery",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/shoemaker": {
+                "name": "Shoemaker",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "shoe repair",
+                    "shoemaker"
+                ],
+                "tags": {
+                    "craft": "shoemaker"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/stonemason": {
+                "name": "Stonemason",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "stonemason",
+                    "masonry"
+                ],
+                "tags": {
+                    "craft": "stonemason"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/sweep": {
+                "name": "Chimney Sweep",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "sweep",
+                    "chimney sweep"
+                ],
+                "tags": {
+                    "craft": "sweep"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/tailor": {
+                "name": "Tailor",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "tailor",
+                    "clothes"
+                ],
+                "tags": {
+                    "craft": "tailor"
+                },
+                "icon": "clothing-store",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/tiler": {
+                "name": "Tiler",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "tiler"
+                ],
+                "tags": {
+                    "craft": "tiler"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/tinsmith": {
+                "name": "Tinsmith",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "tinsmith"
+                ],
+                "tags": {
+                    "craft": "tinsmith"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/upholsterer": {
+                "name": "Upholsterer",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "upholsterer"
+                ],
+                "tags": {
+                    "craft": "upholsterer"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/watchmaker": {
+                "name": "Watchmaker",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "watch",
+                    "watchmaker",
+                    "watch repair"
+                ],
+                "tags": {
+                    "craft": "watchmaker"
+                },
+                "icon": "circle-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "craft/window_construction": {
+                "name": "Window Construction",
+                "geometry": [
+                    "point",
+                    "area"
+                ],
+                "terms": [
+                    "window",
+                    "window maker",
+                    "window construction"
+                ],
+                "tags": {
+                    "craft": "window_construction"
+                },
+                "icon": "marker-stroked",
+                "fields": [
+                    "building_area",
+                    "address",
+                    "operator",
+                    "opening_hours"
+                ]
+            },
+            "embankment": {
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "embankment": "yes"
+                },
+                "name": "Embankment",
+                "matchScore": 0.2
+            },
+            "emergency/ambulance_station": {
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "area",
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "emergency": "ambulance_station"
+                },
+                "name": "Ambulance Station"
+            },
+            "emergency/fire_hydrant": {
+                "fields": [
+                    "fire_hydrant/type"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "emergency": "fire_hydrant"
+                },
+                "name": "Fire Hydrant"
+            },
+            "emergency/phone": {
+                "icon": "emergency-telephone",
+                "fields": [
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "emergency": "phone"
+                },
+                "name": "Emergency Phone"
+            },
+            "entrance": {
+                "icon": "entrance",
+                "geometry": [
+                    "vertex"
+                ],
+                "tags": {
+                    "entrance": "*"
+                },
+                "fields": [
+                    "entrance",
+                    "access_simple",
+                    "address"
+                ],
+                "name": "Entrance"
+            },
+            "footway/crossing": {
+                "fields": [
+                    "crossing",
+                    "access",
+                    "surface"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "footway",
+                    "footway": "crossing"
+                },
+                "terms": [
+                    "crosswalk",
+                    "zebra crossing"
+                ],
+                "name": "Crossing"
+            },
+            "footway/sidewalk": {
+                "fields": [
+                    "surface",
+                    "lit",
+                    "access"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "footway",
+                    "footway": "sidewalk"
+                },
+                "terms": [],
+                "name": "Sidewalk"
+            },
+            "golf/bunker": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "bunker",
+                    "natural": "sand"
+                },
+                "terms": [
+                    "hazard",
+                    "bunker"
+                ],
+                "name": "Sand Trap"
+            },
+            "golf/fairway": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "fairway",
+                    "landuse": "grass"
+                },
+                "name": "Fairway"
+            },
+            "golf/green": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "green",
+                    "landuse": "grass",
+                    "leisure": "pitch",
+                    "sport": "golf"
+                },
+                "terms": [
+                    "putting green"
+                ],
+                "name": "Putting Green"
+            },
+            "golf/hole": {
+                "icon": "golf",
+                "fields": [
+                    "golf_hole",
+                    "par",
+                    "handicap"
+                ],
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "golf": "hole"
+                },
+                "name": "Golf Hole"
+            },
+            "golf/lateral_water_hazard": {
+                "icon": "golf",
+                "geometry": [
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "golf": "lateral_water_hazard",
+                    "natural": "water"
+                },
+                "name": "Lateral Water Hazard"
+            },
+            "golf/rough": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "rough",
+                    "landuse": "grass"
+                },
+                "name": "Rough"
+            },
+            "golf/tee": {
+                "icon": "golf",
+                "geometry": [
+                    "area"
+                ],
+                "tags": {
+                    "golf": "tee",
+                    "landuse": "grass"
+                },
+                "terms": [
+                    "teeing ground"
+                ],
+                "name": "Tee Box"
+            },
+            "golf/water_hazard": {
+                "icon": "golf",
+                "geometry": [
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "golf": "water_hazard",
+                    "natural": "water"
+                },
+                "name": "Water Hazard"
+            },
+            "highway": {
+                "fields": [
+                    "highway"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "line",
+                    "area"
+                ],
+                "tags": {
+                    "highway": "*"
+                },
+                "name": "Highway"
+            },
+            "highway/bridleway": {
+                "fields": [
+                    "access",
+                    "surface",
+                    "structure"
+                ],
+                "icon": "highway-bridleway",
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "highway": "bridleway"
+                },
+                "terms": [
+                    "bridleway",
+                    "equestrian trail",
+                    "horse riding path",
+                    "bridle road",
+                    "horse trail"
+                ],
+                "name": "Bridle Path"
+            },
+            "highway/bus_stop": {
+                "icon": "bus",
+                "fields": [
+                    "operator",
+                    "shelter"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex"
+                ],
+                "tags": {
+                    "highway": "bus_stop"
+                },
+                "terms": [],
+                "name": "Bus Stop"
+            },
+            "highway/crossing": {
+                "fields": [
+                    "crossing"
+                ],
                 "geometry": [
                     "vertex"
                 ],
@@ -63343,6 +65358,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Residential Road"
             },
+            "highway/rest_area": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "highway": "rest_area"
+                },
+                "terms": [
+                    "rest stop",
+                    "turnout",
+                    "lay-by"
+                ],
+                "name": "Rest Area"
+            },
             "highway/road": {
                 "icon": "highway-road",
                 "fields": [
@@ -63503,6 +65534,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Parking Aisle"
             },
+            "highway/services": {
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "highway": "services"
+                },
+                "terms": [
+                    "services",
+                    "travel plaza",
+                    "service station"
+                ],
+                "name": "Service Area"
+            },
             "highway/steps": {
                 "fields": [
                     "access",
@@ -65188,6 +67235,34 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Travel Agency",
                 "searchable": false
             },
+            "piste": {
+                "icon": "skiing",
+                "fields": [
+                    "piste/type",
+                    "piste/difficulty",
+                    "piste/grooming",
+                    "oneway",
+                    "lit"
+                ],
+                "geometry": [
+                    "point",
+                    "line",
+                    "area"
+                ],
+                "terms": [
+                    "ski",
+                    "sled",
+                    "sleigh",
+                    "snowboard",
+                    "nordic",
+                    "downhill",
+                    "snowmobile"
+                ],
+                "tags": {
+                    "piste:type": "*"
+                },
+                "name": "Piste/Ski Trail"
+            },
             "place": {
                 "fields": [
                     "place"
@@ -65464,6 +67539,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "terms": [],
                 "name": "Disused Railway"
             },
+            "railway/funicular": {
+                "geometry": [
+                    "line"
+                ],
+                "terms": [
+                    "venicular",
+                    "cliff railway",
+                    "cable car",
+                    "cable railway",
+                    "funicular railway"
+                ],
+                "fields": [
+                    "structure",
+                    "gauge"
+                ],
+                "tags": {
+                    "railway": "funicular"
+                },
+                "icon": "railway-rail",
+                "name": "Funicular"
+            },
             "railway/halt": {
                 "icon": "rail",
                 "geometry": [
@@ -65509,11 +67605,31 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "railway": "monorail"
                 },
                 "fields": [
-                    "structure"
+                    "structure",
+                    "electrified"
                 ],
                 "terms": [],
                 "name": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "icon": "railway-rail",
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "railway": "narrow_gauge"
+                },
+                "fields": [
+                    "structure",
+                    "gauge",
+                    "electrified"
+                ],
+                "terms": [
+                    "narrow gauge railway",
+                    "narrow gauge railroad"
+                ],
+                "name": "Narrow Gauge Rail"
+            },
             "railway/platform": {
                 "geometry": [
                     "point",
@@ -65535,7 +67651,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "railway": "rail"
                 },
                 "fields": [
-                    "structure"
+                    "structure",
+                    "gauge",
+                    "electrified"
                 ],
                 "terms": [],
                 "name": "Rail"
@@ -65559,7 +67677,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "railway/subway": {
                 "icon": "railway-subway",
                 "fields": [
-                    "structure"
+                    "structure",
+                    "gauge",
+                    "electrified"
                 ],
                 "geometry": [
                     "line"
@@ -65590,7 +67710,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "railway": "tram"
                 },
                 "fields": [
-                    "structure"
+                    "structure",
+                    "gauge",
+                    "electrified"
                 ],
                 "terms": [
                     "streetcar"
@@ -65604,25 +67726,391 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "geometry": [
                     "relation"
                 ],
-                "fields": [
-                    "relation"
-                ]
-            },
-            "route/ferry": {
-                "icon": "ferry",
+                "fields": [
+                    "relation"
+                ]
+            },
+            "route/ferry": {
+                "icon": "ferry",
+                "geometry": [
+                    "line"
+                ],
+                "tags": {
+                    "route": "ferry"
+                },
+                "name": "Ferry Route"
+            },
+            "shop": {
+                "icon": "shop",
+                "fields": [
+                    "shop",
+                    "address",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "*"
+                },
+                "terms": [],
+                "name": "Shop"
+            },
+            "shop/alcohol": {
+                "icon": "alcohol-shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "alcohol"
+                },
+                "terms": [
+                    "alcohol"
+                ],
+                "name": "Liquor Store"
+            },
+            "shop/bakery": {
+                "icon": "bakery",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "bakery"
+                },
+                "name": "Bakery"
+            },
+            "shop/beauty": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [
+                    "nail spa",
+                    "spa",
+                    "salon",
+                    "tanning"
+                ],
+                "tags": {
+                    "shop": "beauty"
+                },
+                "name": "Beauty Shop"
+            },
+            "shop/beverages": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "beverages"
+                },
+                "name": "Beverage Store"
+            },
+            "shop/bicycle": {
+                "icon": "bicycle",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "bicycle"
+                },
+                "name": "Bicycle Shop"
+            },
+            "shop/books": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "books"
+                },
+                "name": "Bookstore"
+            },
+            "shop/boutique": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "boutique"
+                },
+                "name": "Boutique"
+            },
+            "shop/butcher": {
+                "icon": "slaughterhouse",
+                "fields": [
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [],
+                "tags": {
+                    "shop": "butcher"
+                },
+                "name": "Butcher"
+            },
+            "shop/car": {
+                "icon": "car",
+                "fields": [
+                    "address",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "car"
+                },
+                "name": "Car Dealership"
+            },
+            "shop/car_parts": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "car_parts"
+                },
+                "name": "Car Parts Store"
+            },
+            "shop/car_repair": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "car_repair"
+                },
+                "name": "Car Repair Shop"
+            },
+            "shop/chemist": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "chemist"
+                },
+                "name": "Chemist"
+            },
+            "shop/clothes": {
+                "icon": "clothing-store",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "clothes"
+                },
+                "name": "Clothing Store"
+            },
+            "shop/computer": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "computer"
+                },
+                "name": "Computer Store"
+            },
+            "shop/confectionery": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "confectionery"
+                },
+                "name": "Confectionery"
+            },
+            "shop/convenience": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "convenience"
+                },
+                "name": "Convenience Store"
+            },
+            "shop/deli": {
+                "icon": "restaurant",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "deli"
+                },
+                "name": "Deli"
+            },
+            "shop/department_store": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "department_store"
+                },
+                "name": "Department Store"
+            },
+            "shop/doityourself": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "doityourself"
+                },
+                "name": "DIY Store"
+            },
+            "shop/dry_cleaning": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
-                    "route": "ferry"
+                    "shop": "dry_cleaning"
                 },
-                "name": "Ferry Route"
+                "name": "Dry Cleaners"
             },
-            "shop": {
+            "shop/electronics": {
                 "icon": "shop",
                 "fields": [
-                    "shop",
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65631,13 +68119,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "*"
+                    "shop": "electronics"
                 },
-                "terms": [],
-                "name": "Shop"
+                "name": "Electronics Store"
             },
-            "shop/alcohol": {
-                "icon": "alcohol-shop",
+            "shop/farm": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
@@ -65649,15 +68136,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "alcohol"
+                    "shop": "farm"
                 },
                 "terms": [
-                    "alcohol"
+                    "farm shop",
+                    "farm stand"
                 ],
-                "name": "Liquor Store"
+                "name": "Produce Stand"
             },
-            "shop/bakery": {
-                "icon": "bakery",
+            "shop/fishmonger": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
@@ -65669,11 +68157,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "bakery"
+                    "shop": "fishmonger"
                 },
-                "name": "Bakery"
+                "name": "Fishmonger"
             },
-            "shop/beauty": {
+            "shop/florist": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65685,18 +68173,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "nail spa",
-                    "spa",
-                    "salon",
-                    "tanning"
-                ],
                 "tags": {
-                    "shop": "beauty"
+                    "shop": "florist"
                 },
-                "name": "Beauty Shop"
+                "name": "Florist"
             },
-            "shop/beverages": {
+            "shop/furniture": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65709,12 +68191,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "beverages"
+                    "shop": "furniture"
                 },
-                "name": "Beverage Store"
+                "name": "Furniture Store"
             },
-            "shop/bicycle": {
-                "icon": "bicycle",
+            "shop/garden_centre": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
@@ -65725,12 +68207,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
+                "terms": [
+                    "garden centre"
+                ],
                 "tags": {
-                    "shop": "bicycle"
+                    "shop": "garden_centre"
                 },
-                "name": "Bicycle Shop"
+                "name": "Garden Center"
             },
-            "shop/books": {
+            "shop/gift": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65743,11 +68228,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "books"
+                    "shop": "gift"
                 },
-                "name": "Bookstore"
+                "name": "Gift Shop"
             },
-            "shop/boutique": {
+            "shop/greengrocer": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65760,13 +68245,14 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "boutique"
+                    "shop": "greengrocer"
                 },
-                "name": "Boutique"
+                "name": "Greengrocer"
             },
-            "shop/butcher": {
-                "icon": "slaughterhouse",
+            "shop/hairdresser": {
+                "icon": "shop",
                 "fields": [
+                    "address",
                     "building_area",
                     "opening_hours"
                 ],
@@ -65775,16 +68261,16 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
-                "terms": [],
                 "tags": {
-                    "shop": "butcher"
+                    "shop": "hairdresser"
                 },
-                "name": "Butcher"
+                "name": "Hairdresser"
             },
-            "shop/car": {
-                "icon": "car",
+            "shop/hardware": {
+                "icon": "shop",
                 "fields": [
                     "address",
+                    "building_area",
                     "opening_hours"
                 ],
                 "geometry": [
@@ -65793,11 +68279,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "car"
+                    "shop": "hardware"
                 },
-                "name": "Car Dealership"
+                "name": "Hardware Store"
             },
-            "shop/car_parts": {
+            "shop/hifi": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65810,11 +68296,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "car_parts"
+                    "shop": "hifi"
                 },
-                "name": "Car Parts Store"
+                "name": "Hifi Store"
             },
-            "shop/car_repair": {
+            "shop/jewelry": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65827,11 +68313,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "car_repair"
+                    "shop": "jewelry"
                 },
-                "name": "Car Repair Shop"
+                "name": "Jeweler"
             },
-            "shop/chemist": {
+            "shop/kiosk": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65844,12 +68330,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "chemist"
+                    "shop": "kiosk"
                 },
-                "name": "Chemist"
+                "name": "Kiosk"
             },
-            "shop/clothes": {
-                "icon": "clothing-store",
+            "shop/laundry": {
+                "icon": "laundry",
                 "fields": [
                     "address",
                     "building_area",
@@ -65861,11 +68347,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "clothes"
+                    "shop": "laundry"
                 },
-                "name": "Clothing Store"
+                "name": "Laundry"
             },
-            "shop/computer": {
+            "shop/locksmith": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65877,12 +68363,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
+                "terms": [
+                    "keys"
+                ],
                 "tags": {
-                    "shop": "computer"
+                    "shop": "locksmith"
                 },
-                "name": "Computer Store"
+                "name": "Locksmith"
             },
-            "shop/confectionery": {
+            "shop/mall": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65895,11 +68384,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "confectionery"
+                    "shop": "mall"
                 },
-                "name": "Confectionery"
+                "name": "Mall"
             },
-            "shop/convenience": {
+            "shop/mobile_phone": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65912,12 +68401,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "convenience"
+                    "shop": "mobile_phone"
                 },
-                "name": "Convenience Store"
+                "name": "Mobile Phone Store"
             },
-            "shop/deli": {
-                "icon": "restaurant",
+            "shop/motorcycle": {
+                "icon": "shop",
                 "fields": [
                     "address",
                     "building_area",
@@ -65929,12 +68418,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "deli"
+                    "shop": "motorcycle"
                 },
-                "name": "Deli"
+                "name": "Motorcycle Dealership"
             },
-            "shop/department_store": {
-                "icon": "shop",
+            "shop/music": {
+                "icon": "music",
                 "fields": [
                     "address",
                     "building_area",
@@ -65946,11 +68435,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "department_store"
+                    "shop": "music"
                 },
-                "name": "Department Store"
+                "name": "Music Store"
             },
-            "shop/doityourself": {
+            "shop/newsagent": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65963,11 +68452,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "doityourself"
+                    "shop": "newsagent"
                 },
-                "name": "DIY Store"
+                "name": "Newsagent"
             },
-            "shop/dry_cleaning": {
+            "shop/optician": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65980,11 +68469,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "dry_cleaning"
+                    "shop": "optician"
                 },
-                "name": "Dry Cleaners"
+                "name": "Optician"
             },
-            "shop/electronics": {
+            "shop/outdoor": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -65997,12 +68486,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "electronics"
+                    "shop": "outdoor"
                 },
-                "name": "Electronics Store"
+                "name": "Outdoor Store"
             },
-            "shop/farm": {
-                "icon": "shop",
+            "shop/pet": {
+                "icon": "dog-park",
                 "fields": [
                     "address",
                     "building_area",
@@ -66014,16 +68503,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "farm"
+                    "shop": "pet"
                 },
-                "terms": [
-                    "farm shop",
-                    "farm stand"
-                ],
-                "name": "Produce Stand"
+                "name": "Pet Store"
             },
-            "shop/fishmonger": {
-                "icon": "shop",
+            "shop/photo": {
+                "icon": "camera",
                 "fields": [
                     "address",
                     "building_area",
@@ -66035,11 +68520,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "fishmonger"
+                    "shop": "photo"
                 },
-                "name": "Fishmonger"
+                "name": "Photography Store"
             },
-            "shop/florist": {
+            "shop/shoes": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66052,11 +68537,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "florist"
+                    "shop": "shoes"
                 },
-                "name": "Florist"
+                "name": "Shoe Store"
             },
-            "shop/furniture": {
+            "shop/sports": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66069,11 +68554,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "furniture"
+                    "shop": "sports"
                 },
-                "name": "Furniture Store"
+                "name": "Sporting Goods Store"
             },
-            "shop/garden_centre": {
+            "shop/stationery": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66085,15 +68570,53 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "vertex",
                     "area"
                 ],
+                "tags": {
+                    "shop": "stationery"
+                },
+                "name": "Stationery Store"
+            },
+            "shop/supermarket": {
+                "icon": "grocery",
+                "fields": [
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
                 "terms": [
-                    "garden centre"
+                    "bazaar",
+                    "boutique",
+                    "chain",
+                    "co-op",
+                    "cut-rate store",
+                    "discount store",
+                    "five-and-dime",
+                    "flea market",
+                    "galleria",
+                    "grocery store",
+                    "mall",
+                    "mart",
+                    "outlet",
+                    "outlet store",
+                    "shop",
+                    "shopping center",
+                    "shopping centre",
+                    "shopping plaza",
+                    "stand",
+                    "store",
+                    "supermarket",
+                    "thrift shop"
                 ],
                 "tags": {
-                    "shop": "garden_centre"
+                    "shop": "supermarket"
                 },
-                "name": "Garden Center"
+                "name": "Supermarket"
             },
-            "shop/gift": {
+            "shop/toys": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66106,12 +68629,12 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "gift"
+                    "shop": "toys"
                 },
-                "name": "Gift Shop"
+                "name": "Toy Store"
             },
-            "shop/greengrocer": {
-                "icon": "shop",
+            "shop/travel_agency": {
+                "icon": "suitcase",
                 "fields": [
                     "address",
                     "building_area",
@@ -66123,11 +68646,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "greengrocer"
+                    "shop": "travel_agency"
                 },
-                "name": "Greengrocer"
+                "name": "Travel Agency"
             },
-            "shop/hairdresser": {
+            "shop/tyres": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66140,11 +68663,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "hairdresser"
+                    "shop": "tyres"
                 },
-                "name": "Hairdresser"
+                "name": "Tire Store"
             },
-            "shop/hardware": {
+            "shop/vacant": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66157,11 +68680,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "hardware"
+                    "shop": "vacant"
                 },
-                "name": "Hardware Store"
+                "name": "Vacant Shop"
             },
-            "shop/hifi": {
+            "shop/variety_store": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66174,11 +68697,11 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "hifi"
+                    "shop": "variety_store"
                 },
-                "name": "Hifi Store"
+                "name": "Variety Store"
             },
-            "shop/jewelry": {
+            "shop/video": {
                 "icon": "shop",
                 "fields": [
                     "address",
@@ -66191,16 +68714,13 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "jewelry"
+                    "shop": "video"
                 },
-                "name": "Jeweler"
+                "name": "Video Store"
             },
-            "shop/kiosk": {
-                "icon": "shop",
+            "tourism": {
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "tourism"
                 ],
                 "geometry": [
                     "point",
@@ -66208,16 +68728,15 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "kiosk"
+                    "tourism": "*"
                 },
-                "name": "Kiosk"
+                "name": "Tourism"
             },
-            "shop/laundry": {
-                "icon": "laundry",
+            "tourism/alpine_hut": {
+                "icon": "lodging",
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
@@ -66225,36 +68744,87 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "laundry"
+                    "tourism": "alpine_hut"
                 },
-                "name": "Laundry"
+                "name": "Alpine Hut"
             },
-            "shop/locksmith": {
-                "icon": "shop",
+            "tourism/artwork": {
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "artwork_type",
+                    "artist"
                 ],
+                "icon": "art-gallery",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "tags": {
+                    "tourism": "artwork"
+                },
                 "terms": [
-                    "keys"
+                    "mural",
+                    "sculpture",
+                    "statue"
+                ],
+                "name": "Artwork"
+            },
+            "tourism/attraction": {
+                "icon": "monument",
+                "fields": [
+                    "operator",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
                 ],
                 "tags": {
-                    "shop": "locksmith"
+                    "tourism": "attraction"
                 },
-                "name": "Locksmith"
+                "name": "Tourist Attraction"
             },
-            "shop/mall": {
-                "icon": "shop",
+            "tourism/camp_site": {
+                "icon": "campsite",
                 "fields": [
-                    "address",
+                    "operator",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [
+                    "camping"
+                ],
+                "tags": {
+                    "tourism": "camp_site"
+                },
+                "name": "Camp Site"
+            },
+            "tourism/caravan_site": {
+                "fields": [
+                    "operator",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "tourism": "caravan_site"
+                },
+                "name": "RV Park"
+            },
+            "tourism/chalet": {
+                "icon": "lodging",
+                "fields": [
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
@@ -66262,16 +68832,37 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "mall"
+                    "tourism": "chalet"
                 },
-                "name": "Mall"
+                "name": "Chalet"
             },
-            "shop/mobile_phone": {
-                "icon": "shop",
+            "tourism/guest_house": {
+                "icon": "lodging",
                 "fields": [
-                    "address",
+                    "operator",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "tourism": "guest_house"
+                },
+                "terms": [
+                    "B&B",
+                    "Bed & Breakfast",
+                    "Bed and Breakfast"
+                ],
+                "name": "Guest House"
+            },
+            "tourism/hostel": {
+                "icon": "lodging",
+                "fields": [
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
@@ -66279,33 +68870,51 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "mobile_phone"
+                    "tourism": "hostel"
                 },
-                "name": "Mobile Phone Store"
+                "name": "Hostel"
             },
-            "shop/motorcycle": {
-                "icon": "shop",
+            "tourism/hotel": {
+                "icon": "lodging",
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "shop": "motorcycle"
+                    "tourism": "hotel"
                 },
-                "name": "Motorcycle Dealership"
+                "name": "Hotel"
             },
-            "shop/music": {
-                "icon": "music",
+            "tourism/information": {
                 "fields": [
+                    "information",
+                    "building_area",
                     "address",
+                    "operator"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "tourism": "information"
+                },
+                "name": "Information"
+            },
+            "tourism/motel": {
+                "icon": "lodging",
+                "fields": [
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
@@ -66313,33 +68922,64 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "music"
+                    "tourism": "motel"
                 },
-                "name": "Music Store"
+                "name": "Motel"
             },
-            "shop/newsagent": {
-                "icon": "shop",
+            "tourism/museum": {
+                "icon": "museum",
                 "fields": [
-                    "address",
+                    "operator",
+                    "building_area",
+                    "address"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [
+                    "exhibition",
+                    "exhibits archive",
+                    "foundation",
+                    "gallery",
+                    "hall",
+                    "institution",
+                    "library",
+                    "menagerie",
+                    "repository",
+                    "salon",
+                    "storehouse",
+                    "treasury",
+                    "vault"
+                ],
+                "tags": {
+                    "tourism": "museum"
+                },
+                "name": "Museum"
+            },
+            "tourism/picnic_site": {
+                "fields": [
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "terms": [],
                 "tags": {
-                    "shop": "newsagent"
+                    "tourism": "picnic_site"
                 },
-                "name": "Newsagent"
+                "name": "Picnic Site"
             },
-            "shop/optician": {
-                "icon": "shop",
+            "tourism/theme_park": {
                 "fields": [
-                    "address",
+                    "operator",
                     "building_area",
-                    "opening_hours"
+                    "address"
                 ],
                 "geometry": [
                     "point",
@@ -66347,33 +68987,25 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "optician"
+                    "tourism": "theme_park"
                 },
-                "name": "Optician"
+                "name": "Theme Park"
             },
-            "shop/outdoor": {
-                "icon": "shop",
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+            "tourism/viewpoint": {
                 "geometry": [
                     "point",
-                    "vertex",
-                    "area"
+                    "vertex"
                 ],
                 "tags": {
-                    "shop": "outdoor"
+                    "tourism": "viewpoint"
                 },
-                "name": "Outdoor Store"
+                "name": "Viewpoint"
             },
-            "shop/pet": {
-                "icon": "dog-park",
+            "tourism/zoo": {
+                "icon": "zoo",
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "operator",
+                    "address"
                 ],
                 "geometry": [
                     "point",
@@ -66381,5573 +69013,5843 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "area"
                 ],
                 "tags": {
-                    "shop": "pet"
+                    "tourism": "zoo"
                 },
-                "name": "Pet Store"
+                "name": "Zoo"
             },
-            "shop/photo": {
-                "icon": "camera",
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
-                ],
+            "type/boundary": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
-                    "shop": "photo"
+                    "type": "boundary"
                 },
-                "name": "Photography Store"
+                "name": "Boundary",
+                "icon": "boundary",
+                "fields": [
+                    "boundary"
+                ]
             },
-            "shop/shoes": {
-                "icon": "shop",
+            "type/boundary/administrative": {
+                "name": "Administrative Boundary",
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "boundary",
+                    "boundary": "administrative"
+                },
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "admin_level"
                 ],
+                "icon": "boundary"
+            },
+            "type/multipolygon": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "area",
+                    "relation"
                 ],
                 "tags": {
-                    "shop": "shoes"
+                    "type": "multipolygon"
                 },
-                "name": "Shoe Store"
+                "removeTags": {},
+                "name": "Multipolygon",
+                "icon": "multipolygon",
+                "searchable": false,
+                "matchScore": 0.1
             },
-            "shop/sports": {
-                "icon": "shop",
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+            "type/restriction": {
+                "geometry": [
+                    "relation"
                 ],
+                "tags": {
+                    "type": "restriction"
+                },
+                "name": "Restriction",
+                "icon": "restriction",
+                "fields": [
+                    "restriction"
+                ]
+            },
+            "type/route": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
-                    "shop": "sports"
+                    "type": "route"
                 },
-                "name": "Sporting Goods Store"
+                "name": "Route",
+                "icon": "route",
+                "fields": [
+                    "route",
+                    "ref"
+                ]
             },
-            "shop/stationery": {
-                "icon": "shop",
+            "type/route/bicycle": {
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "route",
+                    "route": "bicycle"
+                },
+                "name": "Cycle Route",
+                "icon": "route-bicycle",
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "ref",
+                    "network"
+                ]
+            },
+            "type/route/bus": {
+                "geometry": [
+                    "relation"
                 ],
+                "tags": {
+                    "type": "route",
+                    "route": "bus"
+                },
+                "name": "Bus Route",
+                "icon": "route-bus",
+                "fields": [
+                    "ref",
+                    "operator",
+                    "network"
+                ]
+            },
+            "type/route/detour": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
-                    "shop": "stationery"
+                    "type": "route",
+                    "route": "detour"
                 },
-                "name": "Stationery Store"
+                "name": "Detour Route",
+                "icon": "route-detour",
+                "fields": [
+                    "ref"
+                ]
             },
-            "shop/supermarket": {
-                "icon": "grocery",
+            "type/route/ferry": {
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "route",
+                    "route": "ferry"
+                },
+                "name": "Ferry Route",
+                "icon": "route-ferry",
                 "fields": [
+                    "ref",
                     "operator",
-                    "building_area",
-                    "address"
-                ],
+                    "network"
+                ]
+            },
+            "type/route/foot": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
-                "terms": [
-                    "bazaar",
-                    "boutique",
-                    "chain",
-                    "co-op",
-                    "cut-rate store",
-                    "discount store",
-                    "five-and-dime",
-                    "flea market",
-                    "galleria",
-                    "grocery store",
-                    "mall",
-                    "mart",
-                    "outlet",
-                    "outlet store",
-                    "shop",
-                    "shopping center",
-                    "shopping centre",
-                    "shopping plaza",
-                    "stand",
-                    "store",
-                    "supermarket",
-                    "thrift shop"
+                "tags": {
+                    "type": "route",
+                    "route": "foot"
+                },
+                "name": "Foot Route",
+                "icon": "route-foot",
+                "fields": [
+                    "ref",
+                    "operator",
+                    "network"
+                ]
+            },
+            "type/route/hiking": {
+                "geometry": [
+                    "relation"
                 ],
                 "tags": {
-                    "shop": "supermarket"
+                    "type": "route",
+                    "route": "hiking"
                 },
-                "name": "Supermarket"
+                "name": "Hiking Route",
+                "icon": "route-foot",
+                "fields": [
+                    "ref",
+                    "operator",
+                    "network"
+                ]
             },
-            "shop/toys": {
-                "icon": "shop",
+            "type/route/pipeline": {
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "route",
+                    "route": "pipeline"
+                },
+                "name": "Pipeline Route",
+                "icon": "route-pipeline",
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route/power": {
+                "geometry": [
+                    "relation"
                 ],
+                "tags": {
+                    "type": "route",
+                    "route": "power"
+                },
+                "name": "Power Route",
+                "icon": "route-power",
+                "fields": [
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route/road": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
-                    "shop": "toys"
+                    "type": "route",
+                    "route": "road"
                 },
-                "name": "Toy Store"
+                "name": "Road Route",
+                "icon": "route-road",
+                "fields": [
+                    "ref"
+                ]
             },
-            "shop/travel_agency": {
-                "icon": "suitcase",
+            "type/route/train": {
+                "geometry": [
+                    "relation"
+                ],
+                "tags": {
+                    "type": "route",
+                    "route": "train"
+                },
+                "name": "Train Route",
+                "icon": "route-train",
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route/tram": {
+                "geometry": [
+                    "relation"
                 ],
+                "tags": {
+                    "type": "route",
+                    "route": "tram"
+                },
+                "name": "Tram Route",
+                "icon": "route-tram",
+                "fields": [
+                    "ref",
+                    "operator"
+                ]
+            },
+            "type/route_master": {
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "relation"
                 ],
                 "tags": {
-                    "shop": "travel_agency"
+                    "type": "route_master"
                 },
-                "name": "Travel Agency"
+                "name": "Route Master",
+                "icon": "route-master",
+                "fields": [
+                    "route_master",
+                    "ref",
+                    "operator",
+                    "network"
+                ]
             },
-            "shop/tyres": {
-                "icon": "shop",
+            "vertex": {
+                "name": "Other",
+                "tags": {},
+                "geometry": [
+                    "vertex"
+                ],
+                "matchScore": 0.1
+            },
+            "waterway": {
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "waterway"
                 ],
                 "geometry": [
                     "point",
                     "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "shop": "tyres"
+                    "waterway": "*"
                 },
-                "name": "Tire Store"
+                "name": "Waterway"
             },
-            "shop/vacant": {
-                "icon": "shop",
-                "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+            "waterway/canal": {
+                "icon": "waterway-canal",
+                "geometry": [
+                    "line"
                 ],
+                "tags": {
+                    "waterway": "canal"
+                },
+                "name": "Canal"
+            },
+            "waterway/dam": {
+                "icon": "dam",
                 "geometry": [
                     "point",
                     "vertex",
+                    "line",
                     "area"
                 ],
                 "tags": {
-                    "shop": "vacant"
+                    "waterway": "dam"
                 },
-                "name": "Vacant Shop"
+                "name": "Dam"
             },
-            "shop/variety_store": {
-                "icon": "shop",
+            "waterway/ditch": {
+                "icon": "waterway-ditch",
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "tunnel"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "shop": "variety_store"
+                    "waterway": "ditch"
                 },
-                "name": "Variety Store"
+                "name": "Ditch"
             },
-            "shop/video": {
-                "icon": "shop",
+            "waterway/drain": {
+                "icon": "waterway-stream",
                 "fields": [
-                    "address",
-                    "building_area",
-                    "opening_hours"
+                    "tunnel"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
                 ],
                 "tags": {
-                    "shop": "video"
+                    "waterway": "drain"
                 },
-                "name": "Video Store"
+                "name": "Drain"
             },
-            "tourism": {
+            "waterway/river": {
+                "icon": "waterway-river",
                 "fields": [
-                    "tourism"
+                    "tunnel"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
+                    "line"
+                ],
+                "terms": [
+                    "beck",
+                    "branch",
+                    "brook",
+                    "course",
+                    "creek",
+                    "estuary",
+                    "rill",
+                    "rivulet",
+                    "run",
+                    "runnel",
+                    "stream",
+                    "tributary",
+                    "watercourse"
+                ],
+                "tags": {
+                    "waterway": "river"
+                },
+                "name": "River"
+            },
+            "waterway/riverbank": {
+                "icon": "water",
+                "geometry": [
                     "area"
                 ],
                 "tags": {
-                    "tourism": "*"
+                    "waterway": "riverbank"
                 },
-                "name": "Tourism"
+                "name": "Riverbank"
             },
-            "tourism/alpine_hut": {
-                "icon": "lodging",
+            "waterway/stream": {
+                "icon": "waterway-stream",
                 "fields": [
-                    "operator",
-                    "address"
+                    "layer",
+                    "tunnel"
                 ],
                 "geometry": [
-                    "point",
-                    "vertex",
-                    "area"
+                    "line"
+                ],
+                "terms": [
+                    "beck",
+                    "branch",
+                    "brook",
+                    "burn",
+                    "course",
+                    "creek",
+                    "current",
+                    "drift",
+                    "flood",
+                    "flow",
+                    "freshet",
+                    "race",
+                    "rill",
+                    "rindle",
+                    "rivulet",
+                    "run",
+                    "runnel",
+                    "rush",
+                    "spate",
+                    "spritz",
+                    "surge",
+                    "tide",
+                    "torrent",
+                    "tributary",
+                    "watercourse"
                 ],
                 "tags": {
-                    "tourism": "alpine_hut"
+                    "waterway": "stream"
                 },
-                "name": "Alpine Hut"
+                "name": "Stream"
             },
-            "tourism/artwork": {
-                "fields": [
-                    "artwork_type",
-                    "artist"
+            "waterway/weir": {
+                "icon": "dam",
+                "geometry": [
+                    "vertex",
+                    "line"
                 ],
-                "icon": "art-gallery",
+                "tags": {
+                    "waterway": "weir"
+                },
+                "name": "Weir"
+            },
+            "amenity/pub/The Green Man": {
+                "tags": {
+                    "name": "The Green Man",
+                    "amenity": "pub"
+                },
+                "name": "The Green Man",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "artwork"
-                },
-                "terms": [
-                    "mural",
-                    "sculpture",
-                    "statue"
-                ],
-                "name": "Artwork"
-            },
-            "tourism/attraction": {
-                "icon": "monument",
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Kings Arms": {
+                "tags": {
+                    "name": "Kings Arms",
+                    "amenity": "pub"
+                },
+                "name": "Kings Arms",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "attraction"
-                },
-                "name": "Tourist Attraction"
-            },
-            "tourism/camp_site": {
-                "icon": "campsite",
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Red Lion": {
+                "tags": {
+                    "name": "Red Lion",
+                    "amenity": "pub"
+                },
+                "name": "Red Lion",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "camping"
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Ship": {
                 "tags": {
-                    "tourism": "camp_site"
+                    "name": "The Ship",
+                    "amenity": "pub"
                 },
-                "name": "Camp Site"
-            },
-            "tourism/caravan_site": {
-                "fields": [
-                    "operator",
-                    "address"
-                ],
+                "name": "The Ship",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "caravan_site"
-                },
-                "name": "RV Park"
-            },
-            "tourism/chalet": {
-                "icon": "lodging",
                 "fields": [
-                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The White Horse": {
+                "tags": {
+                    "name": "The White Horse",
+                    "amenity": "pub"
+                },
+                "name": "The White Horse",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "chalet"
-                },
-                "name": "Chalet"
-            },
-            "tourism/guest_house": {
-                "icon": "lodging",
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The White Hart": {
+                "tags": {
+                    "name": "The White Hart",
+                    "amenity": "pub"
+                },
+                "name": "The White Hart",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "guest_house"
-                },
-                "terms": [
-                    "B&B",
-                    "Bed & Breakfast",
-                    "Bed and Breakfast"
-                ],
-                "name": "Guest House"
-            },
-            "tourism/hostel": {
-                "icon": "lodging",
                 "fields": [
-                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Royal Oak": {
+                "tags": {
+                    "name": "Royal Oak",
+                    "amenity": "pub"
+                },
+                "name": "Royal Oak",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "hostel"
-                },
-                "name": "Hostel"
-            },
-            "tourism/hotel": {
-                "icon": "lodging",
                 "fields": [
-                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Red Lion": {
+                "tags": {
+                    "name": "The Red Lion",
+                    "amenity": "pub"
+                },
+                "name": "The Red Lion",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [],
-                "tags": {
-                    "tourism": "hotel"
-                },
-                "name": "Hotel"
-            },
-            "tourism/information": {
                 "fields": [
-                    "infomation",
                     "building_area",
                     "address",
-                    "operator"
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Kings Arms": {
+                "tags": {
+                    "name": "The Kings Arms",
+                    "amenity": "pub"
+                },
+                "name": "The Kings Arms",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "information"
-                },
-                "name": "Information"
-            },
-            "tourism/motel": {
-                "icon": "lodging",
                 "fields": [
-                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Star": {
+                "tags": {
+                    "name": "The Star",
+                    "amenity": "pub"
+                },
+                "name": "The Star",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "tags": {
-                    "tourism": "motel"
-                },
-                "name": "Motel"
-            },
-            "tourism/museum": {
-                "icon": "museum",
                 "fields": [
-                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Anchor": {
+                "tags": {
+                    "name": "The Anchor",
+                    "amenity": "pub"
+                },
+                "name": "The Anchor",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [
-                    "exhibition",
-                    "exhibits archive",
-                    "foundation",
-                    "gallery",
-                    "hall",
-                    "institution",
-                    "library",
-                    "menagerie",
-                    "repository",
-                    "salon",
-                    "storehouse",
-                    "treasury",
-                    "vault"
-                ],
-                "tags": {
-                    "tourism": "museum"
-                },
-                "name": "Museum"
-            },
-            "tourism/picnic_site": {
                 "fields": [
-                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Cross Keys": {
+                "tags": {
+                    "name": "The Cross Keys",
+                    "amenity": "pub"
+                },
+                "name": "The Cross Keys",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
-                "terms": [],
-                "tags": {
-                    "tourism": "picnic_site"
-                },
-                "name": "Picnic Site"
-            },
-            "tourism/theme_park": {
                 "fields": [
-                    "operator",
                     "building_area",
-                    "address"
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Wheatsheaf": {
+                "tags": {
+                    "name": "The Wheatsheaf",
+                    "amenity": "pub"
+                },
+                "name": "The Wheatsheaf",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/pub/The Crown Inn": {
                 "tags": {
-                    "tourism": "theme_park"
+                    "name": "The Crown Inn",
+                    "amenity": "pub"
                 },
-                "name": "Theme Park"
-            },
-            "tourism/viewpoint": {
+                "name": "The Crown Inn",
+                "icon": "beer",
                 "geometry": [
                     "point",
-                    "vertex"
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "tourism": "viewpoint"
-                },
-                "name": "Viewpoint"
-            },
-            "tourism/zoo": {
-                "icon": "zoo",
                 "fields": [
-                    "operator",
-                    "address"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Kings Head": {
+                "tags": {
+                    "name": "The Kings Head",
+                    "amenity": "pub"
+                },
+                "name": "The Kings Head",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
                     "area"
                 ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/pub/The Castle": {
                 "tags": {
-                    "tourism": "zoo"
+                    "name": "The Castle",
+                    "amenity": "pub"
                 },
-                "name": "Zoo"
-            },
-            "type/boundary": {
+                "name": "The Castle",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "boundary"
-                },
-                "name": "Boundary",
-                "icon": "boundary",
                 "fields": [
-                    "boundary"
-                ]
-            },
-            "type/boundary/administrative": {
-                "name": "Administrative Boundary",
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Railway": {
                 "tags": {
-                    "type": "boundary",
-                    "boundary": "administrative"
+                    "name": "The Railway",
+                    "amenity": "pub"
                 },
+                "name": "The Railway",
+                "icon": "beer",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
                 "fields": [
-                    "admin_level"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
-                "icon": "boundary"
+                "suggestion": true
             },
-            "type/multipolygon": {
-                "geometry": [
-                    "area",
-                    "relation"
-                ],
+            "amenity/pub/The White Lion": {
                 "tags": {
-                    "type": "multipolygon"
+                    "name": "The White Lion",
+                    "amenity": "pub"
                 },
-                "removeTags": {},
-                "name": "Multipolygon",
-                "icon": "multipolygon",
-                "searchable": false,
-                "matchScore": 0.1
-            },
-            "type/restriction": {
+                "name": "The White Lion",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "restriction"
-                },
-                "name": "Restriction",
-                "icon": "restriction",
                 "fields": [
-                    "restriction"
-                ]
-            },
-            "type/route": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Bell": {
                 "tags": {
-                    "type": "route"
+                    "name": "The Bell",
+                    "amenity": "pub"
                 },
-                "name": "Route",
-                "icon": "route",
-                "fields": [
-                    "route",
-                    "ref"
-                ]
-            },
-            "type/route/bicycle": {
+                "name": "The Bell",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "bicycle"
-                },
-                "name": "Cycle Route",
-                "icon": "route-bicycle",
                 "fields": [
-                    "ref",
-                    "network"
-                ]
-            },
-            "type/route/bus": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Bull": {
                 "tags": {
-                    "type": "route",
-                    "route": "bus"
+                    "name": "The Bull",
+                    "amenity": "pub"
                 },
-                "name": "Bus Route",
-                "icon": "route-bus",
-                "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/detour": {
+                "name": "The Bull",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "detour"
-                },
-                "name": "Detour Route",
-                "icon": "route-detour",
                 "fields": [
-                    "ref"
-                ]
-            },
-            "type/route/ferry": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Plough": {
                 "tags": {
-                    "type": "route",
-                    "route": "ferry"
+                    "name": "The Plough",
+                    "amenity": "pub"
                 },
-                "name": "Ferry Route",
-                "icon": "route-ferry",
-                "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/foot": {
+                "name": "The Plough",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "foot"
-                },
-                "name": "Foot Route",
-                "icon": "route-foot",
                 "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/hiking": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The George": {
                 "tags": {
-                    "type": "route",
-                    "route": "hiking"
+                    "name": "The George",
+                    "amenity": "pub"
                 },
-                "name": "Hiking Route",
-                "icon": "route-foot",
-                "fields": [
-                    "ref",
-                    "operator",
-                    "network"
-                ]
-            },
-            "type/route/pipeline": {
+                "name": "The George",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "pipeline"
-                },
-                "name": "Pipeline Route",
-                "icon": "route-pipeline",
                 "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route/power": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Royal Oak": {
                 "tags": {
-                    "type": "route",
-                    "route": "power"
+                    "name": "The Royal Oak",
+                    "amenity": "pub"
                 },
-                "name": "Power Route",
-                "icon": "route-power",
-                "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route/road": {
+                "name": "The Royal Oak",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "road"
-                },
-                "name": "Road Route",
-                "icon": "route-road",
                 "fields": [
-                    "ref"
-                ]
-            },
-            "type/route/train": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Fox": {
                 "tags": {
-                    "type": "route",
-                    "route": "train"
+                    "name": "The Fox",
+                    "amenity": "pub"
                 },
-                "name": "Train Route",
-                "icon": "route-train",
-                "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route/tram": {
+                "name": "The Fox",
+                "icon": "beer",
                 "geometry": [
-                    "relation"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "tags": {
-                    "type": "route",
-                    "route": "tram"
-                },
-                "name": "Tram Route",
-                "icon": "route-tram",
                 "fields": [
-                    "ref",
-                    "operator"
-                ]
-            },
-            "type/route_master": {
-                "geometry": [
-                    "relation"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/Prince of Wales": {
                 "tags": {
-                    "type": "route_master"
+                    "name": "Prince of Wales",
+                    "amenity": "pub"
                 },
-                "name": "Route Master",
-                "icon": "route-master",
+                "name": "Prince of Wales",
+                "icon": "beer",
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
                 "fields": [
-                    "route_master",
-                    "ref",
-                    "operator",
-                    "network"
-                ]
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
             },
-            "vertex": {
-                "name": "Other",
-                "tags": {},
+            "amenity/pub/The Rising Sun": {
+                "tags": {
+                    "name": "The Rising Sun",
+                    "amenity": "pub"
+                },
+                "name": "The Rising Sun",
+                "icon": "beer",
                 "geometry": [
-                    "vertex"
+                    "point",
+                    "vertex",
+                    "area"
                 ],
-                "matchScore": 0.1
-            },
-            "waterway": {
                 "fields": [
-                    "waterway"
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Prince of Wales": {
+                "tags": {
+                    "name": "The Prince of Wales",
+                    "amenity": "pub"
+                },
+                "name": "The Prince of Wales",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/pub/The Crown": {
                 "tags": {
-                    "waterway": "*"
+                    "name": "The Crown",
+                    "amenity": "pub"
                 },
-                "name": "Waterway"
-            },
-            "waterway/canal": {
-                "icon": "waterway-canal",
+                "name": "The Crown",
+                "icon": "beer",
                 "geometry": [
-                    "line"
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
                 ],
+                "suggestion": true
+            },
+            "amenity/pub/The Chequers": {
                 "tags": {
-                    "waterway": "canal"
+                    "name": "The Chequers",
+                    "amenity": "pub"
                 },
-                "name": "Canal"
-            },
-            "waterway/dam": {
-                "icon": "dam",
+                "name": "The Chequers",
+                "icon": "beer",
                 "geometry": [
                     "point",
                     "vertex",
-                    "line",
                     "area"
                 ],
+                "fields": [
+                    "building_area",
+                    "address",
+                    "opening_hours"
+                ],
+                "suggestion": true
+            },
+            "amenity/pub/The Swan": {
                 "tags": {
-                    "waterway": "dam"
+                    "name": "The Swan",
+                    "amenity": "pub"